diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 365f7c4a..e350b49b 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -163,8 +163,8 @@ def get_logger(file_name, config = "config", fallback = False, log_dir=None, log log = logging.basicConfig(filename=file, level=logging.INFO) log = logging.getLogger() # but it looks like default is no output :-( maybe because all the calls name a module? - log.debug(_("Default logger initialised for ")+file) - print _("Default logger intialised for ")+file + log.debug(_("Default logger initialised for %s") % file) + print(_("Default logger initialised for %s") % file) return log def check_dir(path, create = True): @@ -834,7 +834,7 @@ class Config: try: example_doc = xml.dom.minidom.parse(example_file) except: - log.error(_("Error parsing example file %s. See error log file.") % (example_file)) + log.error(_("Error parsing example configuration file %s. See error log file.") % (example_file)) return nodes_added for cnode in doc.getElementsByTagName("FreePokerToolsConfig"): diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 6694b562..9812300b 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -464,6 +464,7 @@ class Database: log.warning(_("Some database functions will not work without NumPy support")) self.cursor = self.connection.cursor() self.cursor.execute('PRAGMA temp_store=2') # use memory for temp tables/indexes + self.cursor.execute('PRAGMA journal_mode=WAL') # use memory for temp tables/indexes self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish else: raise FpdbError("sqlite database "+database+" does not exist") @@ -1168,7 +1169,7 @@ class Database: for idx in self.indexes[self.backend]: if idx['drop'] == 1: if self.backend == self.MYSQL_INNODB: - print _("Creating mysql index %s %s") % (idx['tab'], idx['col']) + print _("Creating MySQL index %s %s") % (idx['tab'], idx['col']) try: s = "alter table %s add index %s(%s)" % (idx['tab'],idx['col'],idx['col']) c.execute(s) @@ -1177,7 +1178,7 @@ class Database: elif self.backend == self.PGSQL: # pass # mod to use tab_col for index name? - print _("Creating pg index "), idx['tab'], idx['col'] + print _("Creating PostgreSQL index "), idx['tab'], idx['col'] try: s = "create index %s_%s_idx on %s(%s)" % (idx['tab'], idx['col'], idx['tab'], idx['col']) c.execute(s) @@ -1422,22 +1423,22 @@ class Database: if cons: pass else: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) elif self.backend == self.PGSQL: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add constraint " + fk['fktab'] + '_' + fk['fkcol'] + '_fkey' + " foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) else: print _("Only MySQL and Postgres supported so far") diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index 0a0937a2..b8816dcc 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -160,7 +160,6 @@ class Filters(threading.Thread): self.types = {} # list of all ring/tour values self.num_limit_types = 0 - self.num_limit_types = 0 self.fillLimitsFrame(vbox, self.display) limitsFrame.add(vbox) diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw index 04476dae..e4d86670 100755 --- a/pyfpdb/HUD_main.pyw +++ b/pyfpdb/HUD_main.pyw @@ -266,7 +266,7 @@ class HUD_main(object): cards = self.get_cards(new_hand_id) table_kwargs = dict(table_name=table_name, tournament=tour_number, table_number=tab_number) tablewindow = Tables.Table(self.config, site_name, **table_kwargs) - if tablewindow is None: + if tablewindow.number is None: # If no client window is found on the screen, complain and continue if type == "tour": table_name = "%s %s" % (tour_number, tab_number) diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index a7423c00..15bb1a35 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -73,7 +73,7 @@ class OnGame(HandHistoryConverter): re_HandInfo = re.compile(u""" \*\*\*\*\*\sHistory\sfor\shand\s(?P[-A-Z\d]+).* Start\shand:\s(?P.*) - Table:\s(\[SPEED\]\s)?(?P[-\'\w\s]+)\s\[\d+\]\s\( + Table:\s(\[SPEED\]\s)?(?P
[-\'\w\s\.]+)\s\[\d+\]\s\( ( (?PNO_LIMIT|Limit|LIMIT|Pot\sLimit|POT_LIMIT)\s (?PTEXAS_HOLDEM|OMAHA_HI|SEVEN_CARD_STUD|SEVEN_CARD_STUD_HI_LO|RAZZ|FIVE_CARD_DRAW)\s diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index 65b6f0aa..2abd744c 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -330,6 +330,12 @@ class PartyPoker(HandHistoryConverter): # FIXME: there is no such property in Hand class self.isSNG = True if key == 'BUYIN': + if info[key] == None: + # Freeroll tourney + hand.buyin = 0 + hand.fee = 0 + hand.buyinCurrency = "FREE" + hand.isKO = False if hand.tourNo != None: hand.buyin = 0 hand.fee = 0 diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 72151d13..c09ad40f 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -34,9 +34,13 @@ import gtk import gobject # FreePokerTools modules +import Configuration from HandHistoryConverter import getTableTitleRe from HandHistoryConverter import getTableNoRe +c = Configuration.Config() +log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt') + # Global used for figuring out the current game being played from the title. # The dict key is a tuple of (limit type, category) for the game. # The list is the names for those games used by the supported poker sites diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py index 10278a05..93664856 100644 --- a/pyfpdb/XTables.py +++ b/pyfpdb/XTables.py @@ -128,7 +128,7 @@ class Table(Table_Window): des_re = 'No such window with id' listing = os.popen("xwininfo -id %d -stats" % (self.number)).read() - + if listing == "": return mo = re.search(des_re, listing) if mo is not None: return None # table has been destroyed diff --git a/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo index 7f555b33..aef2f472 100644 Binary files a/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo and b/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo differ diff --git a/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo index ea182cca..3effe130 100644 Binary files a/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo and b/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo differ diff --git a/pyfpdb/locale/fpdb-de_DE.po b/pyfpdb/locale/fpdb-de_DE.po index ad00171c..0f005f9c 100644 --- a/pyfpdb/locale/fpdb-de_DE.po +++ b/pyfpdb/locale/fpdb-de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-08-30 00:57+0200\n" "Last-Translator: Steffen Schaumburg \n" "Language-Team: Fpdb\n" @@ -3099,7 +3099,7 @@ msgstr "" #: fpdb.pyw:38 msgid " - press return to continue\n" -msgstr " - drücken Sie Enter um fortzufahren" +msgstr " - drücken Sie Enter um fortzufahren\n" #: fpdb.pyw:45 msgid "" @@ -3133,8 +3133,9 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fpdb-en_GB.pot b/pyfpdb/locale/fpdb-en_GB.pot index 38892076..6b69504c 100644 --- a/pyfpdb/locale/fpdb-en_GB.pot +++ b/pyfpdb/locale/fpdb-en_GB.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2990,7 +2990,7 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 -msgid "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" +msgid "Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" msgstr "" #: fpdb.pyw:245 diff --git a/pyfpdb/locale/fpdb-es_ES.po b/pyfpdb/locale/fpdb-es_ES.po index 3a83424a..23f94404 100644 --- a/pyfpdb/locale/fpdb-es_ES.po +++ b/pyfpdb/locale/fpdb-es_ES.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: fpdb\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: \n" "Last-Translator: Javier Sánchez \n" "Language-Team: \n" @@ -3042,7 +3042,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-fr_FR.po b/pyfpdb/locale/fpdb-fr_FR.po index b6b808c2..5ba22736 100644 --- a/pyfpdb/locale/fpdb-fr_FR.po +++ b/pyfpdb/locale/fpdb-fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-09-09 13:33+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -3195,7 +3195,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-hu_HU.po b/pyfpdb/locale/fpdb-hu_HU.po index 5487262f..2d3f3aea 100644 --- a/pyfpdb/locale/fpdb-hu_HU.po +++ b/pyfpdb/locale/fpdb-hu_HU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2011-02-27 18:23+0100\n" "Last-Translator: Ferenc Erki \n" "Language-Team: Hungarian \n" @@ -3183,8 +3183,9 @@ msgstr "" "eval-t." #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo index 2ca10d4f..e75ed7d5 100644 Binary files a/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo and b/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo differ diff --git a/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo index f60e6655..80056f12 100644 Binary files a/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo and b/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo differ