evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdb.git

Browse Source
This commit is contained in:
Eric Blade 2010-12-26 23:24:49 -05:00
commit 565d1397fa
4 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packaging/gentoo/current_testing.ebuild
View File

@ -28,7 +28,8 @@ RDEPEND="
graph? ( dev-python/numpy graph? ( dev-python/numpy
dev-python/matplotlib[gtk] ) dev-python/matplotlib[gtk] )
dev-python/python-xlib dev-python/python-xlib
dev-python/pytz" dev-python/pytz
x11-apps/xwininfo"
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
src_install() { src_install() {

12
pyfpdb/Database.py
View File

@ -60,14 +60,11 @@ import Configuration
# Other library modules # Other library modules
try: try:
import sqlalchemy.pool as pool import sqlalchemy.pool as pool
#use_pool = True use_pool = True
# Forcing to False so we can use connection.row_factory
use_pool = False
except ImportError: except ImportError:
log.info(_("Not using sqlalchemy connection pool.")) log.info(_("Not using sqlalchemy connection pool."))
use_pool = False use_pool = False
try: try:
from numpy import var from numpy import var
use_numpy = True use_numpy = True
@ -308,7 +305,8 @@ class Database:
self.saveActions = False if self.import_options['saveActions'] == False else True self.saveActions = False if self.import_options['saveActions'] == False else True
if self.is_connected(): if self.is_connected():
self.get_sites() if not self.wrongDbVersion:
self.get_sites()
self.connection.rollback() # make sure any locks taken so far are released self.connection.rollback() # make sure any locks taken so far are released
#end def __init__ #end def __init__
@ -449,8 +447,7 @@ class Database:
self.db_path = database self.db_path = database
log.info(_("Connecting to SQLite: %(database)s") % {'database':self.db_path}) log.info(_("Connecting to SQLite: %(database)s") % {'database':self.db_path})
if os.path.exists(database) or create: if os.path.exists(database) or create:
self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES) self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES )
self.connection.row_factory = sqlite3.Row
self.__connected = True self.__connected = True
sqlite3.register_converter("bool", lambda x: bool(int(x))) sqlite3.register_converter("bool", lambda x: bool(int(x)))
sqlite3.register_adapter(bool, lambda x: "1" if x else "0") sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
@ -1209,6 +1206,7 @@ class Database:
self.create_tables() self.create_tables()
self.createAllIndexes() self.createAllIndexes()
self.commit() self.commit()
self.get_sites()
print _("Finished recreating tables") print _("Finished recreating tables")
log.info(_("Finished recreating tables")) log.info(_("Finished recreating tables"))
#end def recreate_tables #end def recreate_tables

6
pyfpdb/SQL.py
View File

@ -1796,7 +1796,7 @@ class Sql:
cast(hp2.street4Raises as <signed>integer) AS raise_4 cast(hp2.street4Raises as <signed>integer) AS raise_4
FROM FROM
Hands h Hands h
INNER JOIN Hands h2 ON (h2.id > %s AND h2.tableName = h.tableName) INNER JOIN Hands h2 ON (h2.id >= %s AND h2.tableName = h.tableName)
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */ INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
INNER JOIN HandsPlayers hp2 ON (hp2.playerId+0 = hp.playerId+0 AND (hp2.handId = h2.id+0)) /* other hands by these players */ INNER JOIN HandsPlayers hp2 ON (hp2.playerId+0 = hp.playerId+0 AND (hp2.handId = h2.id+0)) /* other hands by these players */
INNER JOIN Players p ON (p.id = hp2.PlayerId+0) INNER JOIN Players p ON (p.id = hp2.PlayerId+0)
@ -1899,7 +1899,7 @@ class Sql:
cast(hp2.street3Raises as <signed>integer) AS raise_3, cast(hp2.street3Raises as <signed>integer) AS raise_3,
cast(hp2.street4Raises as <signed>integer) AS raise_4 cast(hp2.street4Raises as <signed>integer) AS raise_4
FROM Hands h /* this hand */ FROM Hands h /* this hand */
INNER JOIN Hands h2 ON ( h2.id > %s /* other hands */ INNER JOIN Hands h2 ON ( h2.id >= %s /* other hands */
AND h2.tableName = h.tableName) AND h2.tableName = h.tableName)
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */ INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0 INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0
@ -2004,7 +2004,7 @@ class Sql:
cast(hp2.street3Raises as <signed>integer) AS raise_3, cast(hp2.street3Raises as <signed>integer) AS raise_3,
cast(hp2.street4Raises as <signed>integer) AS raise_4 cast(hp2.street4Raises as <signed>integer) AS raise_4
FROM Hands h /* this hand */ FROM Hands h /* this hand */
INNER JOIN Hands h2 ON ( h2.id > %s /* other hands */ INNER JOIN Hands h2 ON ( h2.id >= %s /* other hands */
AND h2.tableName = h.tableName) AND h2.tableName = h.tableName)
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */ INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0 INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0

50
pyfpdb/locale/fpdb-hu_HU.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.20.905 plus git\n" "Project-Id-Version: 0.20.905 plus git\n"
"POT-Creation-Date: 2010-11-29 21:40+CET\n" "POT-Creation-Date: 2010-11-29 21:40+CET\n"
"PO-Revision-Date: 2010-11-10 10:26+0100\n" "PO-Revision-Date: 2010-12-01 19:54+0100\n"
"Last-Translator: Ferenc Erki <erkiferenc@gmail.com>\n" "Last-Translator: Ferenc Erki <erkiferenc@gmail.com>\n"
"Language-Team: Hungarian <erkiferenc@gmail.com>\n" "Language-Team: Hungarian <erkiferenc@gmail.com>\n"
"Language: hu\n" "Language: hu\n"
@ -40,26 +40,23 @@ msgstr "Nem sikerült felismerni a játéktípust innen: '%s'"
#: AbsoluteToFpdb.py:204 #: AbsoluteToFpdb.py:204
msgid "readHandInfo: Didn't match: '%s'" msgid "readHandInfo: Didn't match: '%s'"
msgstr "" msgstr "readHandInfo: Nem illeszkedik: '%s'"
#: AbsoluteToFpdb.py:205 #: AbsoluteToFpdb.py:205
#, fuzzy
msgid "Absolute: Didn't match re_HandInfo: '%s'" msgid "Absolute: Didn't match re_HandInfo: '%s'"
msgstr "re_HandInfo nem illeszkedik" msgstr "Absolute: re_HandInfo nem illeszkedik: '%s'"
#: AbsoluteToFpdb.py:207 #: AbsoluteToFpdb.py:207
#, fuzzy
msgid "readHandInfo: File name didn't match re_*InfoFromFilename" msgid "readHandInfo: File name didn't match re_*InfoFromFilename"
msgstr "A fájlnév nem illeszkedik re_*InfoFromFilename-re" msgstr "readHandInfo: A fájlnév nem illeszkedik re_*InfoFromFilename-re"
#: AbsoluteToFpdb.py:208 #: AbsoluteToFpdb.py:208
msgid "File name: %s" msgid "File name: %s"
msgstr "Fájlnév: %s" msgstr "Fájlnév: %s"
#: AbsoluteToFpdb.py:209 #: AbsoluteToFpdb.py:209
#, fuzzy
msgid "Absolute: Didn't match re_*InfoFromFilename: '%s'" msgid "Absolute: Didn't match re_*InfoFromFilename: '%s'"
msgstr "A fájlnév nem illeszkedik re_*InfoFromFilename-re" msgstr "Absolute: nem illeszkedik re_*InfoFromFilename-re: '%s'"
#: AbsoluteToFpdb.py:278 EverleafToFpdb.py:215 FulltiltToFpdb.py:346 #: AbsoluteToFpdb.py:278 EverleafToFpdb.py:215 FulltiltToFpdb.py:346
#: OnGameToFpdb.py:303 PokerStarsToFpdb.py:352 Win2dayToFpdb.py:203 #: OnGameToFpdb.py:303 PokerStarsToFpdb.py:352 Win2dayToFpdb.py:203
@ -1651,41 +1648,37 @@ msgid "Tournament Results"
msgstr "Versenyeredmények" msgstr "Versenyeredmények"
#: GuiTourneyImport.py:72 GuiTourneyImport.py:290 #: GuiTourneyImport.py:72 GuiTourneyImport.py:290
#, fuzzy
msgid "" msgid ""
"GuiTourneyImport.load done: Stored: %d\tErrors: %d in %s seconds - %.0f/sec" "GuiTourneyImport.load done: Stored: %d\tErrors: %d in %s seconds - %.0f/sec"
msgstr "" msgstr ""
"GuiBulkImport.load kész: Tárolt: %d \tDuplikáció: %d \tRészleges: %d " "GuiTourneyImport.load kész: Tárolva: %d\tHibák: %d; %s másodperc alatt - "
"\tHibák: %d %s másodperc alatt - %.0f/mp" "%.0f/mp"
#: GuiTourneyImport.py:175 fpdb_import.py:223 #: GuiTourneyImport.py:175 fpdb_import.py:223
msgid "Attempted to add non-directory '%s' as an import directory" msgid "Attempted to add non-directory '%s' as an import directory"
msgstr "Nem könyvtár ('%s') megadása importálási könyvtárként" msgstr "Nem könyvtár ('%s') megadása importálási könyvtárként"
#: GuiTourneyImport.py:191 #: GuiTourneyImport.py:191
#, fuzzy
msgid "Tourney Summary Import started at %s - %d files to import." msgid "Tourney Summary Import started at %s - %d files to import."
msgstr "Elindítva: %s -- %d fájl importálása. Indexek: %s" msgstr "Verseny összegzés import elindítva ekkor: %s - %d fájl importálása."
#: GuiTourneyImport.py:217 #: GuiTourneyImport.py:217
#, fuzzy
msgid "TourneyImport: Removing text < 100 characters from end of file" msgid "TourneyImport: Removing text < 100 characters from end of file"
msgstr "50 karakternél rövidebb szöveg eltávolítása" msgstr ""
"TourneyImport: 100 karakternél rövidebb szöveg eltávolítása a fájl végéről"
#: GuiTourneyImport.py:221 #: GuiTourneyImport.py:221
#, fuzzy
msgid "TourneyImport: Removing text < 100 characters from start of file" msgid "TourneyImport: Removing text < 100 characters from start of file"
msgstr "50 karakternél rövidebb szöveg eltávolítása" msgstr ""
"TourneyImport: 100 karakternél rövidebb szöveg eltávolítása a fájl elejéről"
#: GuiTourneyImport.py:231 #: GuiTourneyImport.py:231
#, fuzzy
msgid "Finished importing %s/%s tournament summaries" msgid "Finished importing %s/%s tournament summaries"
msgstr "%s/%s PS összefoglaló importálása kész" msgstr "%s/%s verseny összegzés importálása befejezve"
#: GuiTourneyImport.py:252 #: GuiTourneyImport.py:252
#, fuzzy
msgid "GTI.readFile: '%s'" msgid "GTI.readFile: '%s'"
msgstr "'%s' követése" msgstr "GTI.readFile: '%s'"
#: GuiTourneyImport.py:271 ImapFetcher.py:176 #: GuiTourneyImport.py:271 ImapFetcher.py:176
msgid "Need to define a converter" msgid "Need to define a converter"
@ -1693,7 +1686,7 @@ msgstr "Meg kell adni egy konvertert"
#: GuiTourneyImport.py:278 #: GuiTourneyImport.py:278
msgid "Need a filename to import" msgid "Need a filename to import"
msgstr "" msgstr "Importálandó fájlnév megadása szükséges"
#: GuiTourneyPlayerStats.py:75 #: GuiTourneyPlayerStats.py:75
msgid "_Refresh Stats" msgid "_Refresh Stats"
@ -3306,14 +3299,12 @@ msgid "<control>B"
msgstr "<control>I" msgstr "<control>I"
#: fpdb.pyw:810 #: fpdb.pyw:810
#, fuzzy
msgid "<control>R" msgid "<control>R"
msgstr "<control>L" msgstr "<control>R"
#: fpdb.pyw:810 #: fpdb.pyw:810
#, fuzzy
msgid "Tournament _Results Import" msgid "Tournament _Results Import"
msgstr "Versenyeredmények" msgstr "Ve_rsenyeredmények importálása"
#: fpdb.pyw:811 #: fpdb.pyw:811
msgid "<control>I" msgid "<control>I"
@ -3368,9 +3359,8 @@ msgid "<control>T"
msgstr "<control>T" msgstr "<control>T"
#: fpdb.pyw:818 #: fpdb.pyw:818
#, fuzzy
msgid "_Tourney Stats (tabulated view, not on pgsql)" msgid "_Tourney Stats (tabulated view, not on pgsql)"
msgstr "Versenyjá_tékos statisztikák (táblázat; Postgre-vel nem)" msgstr "Versenystatisztikák (táblázat; Postgre-vel nem)"
#: fpdb.pyw:819 #: fpdb.pyw:819
msgid "Tourney _Viewer" msgid "Tourney _Viewer"
@ -3539,9 +3529,8 @@ msgid "Bulk Import"
msgstr "Importálás" msgstr "Importálás"
#: fpdb.pyw:1007 #: fpdb.pyw:1007
#, fuzzy
msgid "Tournament Results Import" msgid "Tournament Results Import"
msgstr "Versenyeredmények" msgstr "Versenyeredmények importálása"
#: fpdb.pyw:1013 #: fpdb.pyw:1013
msgid "eMail Import" msgid "eMail Import"
@ -3552,7 +3541,6 @@ msgid "Ring Player Stats"
msgstr "Készpénzes statisztikák" msgstr "Készpénzes statisztikák"
#: fpdb.pyw:1026 #: fpdb.pyw:1026
#, fuzzy
msgid "Tourney Stats" msgid "Tourney Stats"
msgstr "Versenystatisztikák" msgstr "Versenystatisztikák"