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

pyfpdb/Configuration.py

@@ -481,12 +481,19 @@ class Config:
         print "\nReading configuration file %s\n" % file
         try:
             doc = xml.dom.minidom.parse(file)
+            self.file_error = None
         except:
             log.error("Error parsing %s.  See error log file." % (file))
             traceback.print_exc(file=sys.stderr)
-            print "press enter to continue"
+            self.file_error = sys.exc_info()[1]
-            sys.stdin.readline()
+            # we could add a parameter to decide whether to return or read a line and exit?
-            sys.exit()
+            return
+            #print "press enter to continue"
+            #sys.stdin.readline()
+            #sys.exit()
+#ExpatError: not well-formed (invalid token): line 511, column 4
+#sys.exc_info = (<class 'xml.parsers.expat.ExpatError'>, ExpatError('not well-formed (invalid token): line 511,
+# column 4',), <traceback object at 0x024503A0>)
 
         self.doc = doc
         self.supported_sites = {}
@@ -688,18 +695,8 @@ class Config:
         try:    db['db-server'] = self.supported_databases[name].db_server
         except: pass
 
-        if self.supported_databases[name].db_server== DATABASE_TYPE_MYSQL:
+        db['db-backend'] = self.get_backend(self.supported_databases[name].db_server)
-            db['db-backend'] = 2
+
-        elif self.supported_databases[name].db_server== DATABASE_TYPE_POSTGRESQL:
-            db['db-backend'] = 3
-        elif self.supported_databases[name].db_server== DATABASE_TYPE_SQLITE:
-            db['db-backend'] = 4
-            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
-            #           feel free to remove or improve this if you understand the problems
-            #           better than me (not hard!)
-            Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
-        else:
-            raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
         return db
 
     def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None,
@@ -719,6 +716,23 @@ class Config:
             if db_type   is not None: self.supported_databases[db_name].dp_type   = db_type
         return
     
+    def get_backend(self, name):
+        """Returns the number of the currently used backend"""
+        if name == DATABASE_TYPE_MYSQL:
+            ret = 2
+        elif name == DATABASE_TYPE_POSTGRESQL:
+            ret = 3
+        elif name == DATABASE_TYPE_SQLITE:
+            ret = 4
+            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
+            #           feel free to remove or improve this if you understand the problems
+            #           better than me (not hard!)
+            Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
+        else:
+            raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
+
+        return ret
+
     def getDefaultSite(self):
         "Returns first enabled site or None"
         for site_name,site in self.supported_sites.iteritems():

pyfpdb/Database.py

@@ -142,14 +142,18 @@ class Database:
                 , {'tab':'TourneyTypes',    'col':'siteId',            'drop':0}
                 ]
               , [ # indexes for sqlite (list index 4)
-                #  {'tab':'Players',         'col':'name',              'drop':0}  unique indexes not dropped
-                #  {'tab':'Hands',           'col':'siteHandNo',        'drop':0}  unique indexes not dropped
                   {'tab':'Hands',           'col':'gametypeId',        'drop':0}
                 , {'tab':'HandsPlayers',    'col':'handId',            'drop':0} 
                 , {'tab':'HandsPlayers',    'col':'playerId',          'drop':0}
                 , {'tab':'HandsPlayers',    'col':'tourneyTypeId',     'drop':0}
                 , {'tab':'HandsPlayers',    'col':'tourneysPlayersId', 'drop':0}
-                #, {'tab':'Tourneys',        'col':'siteTourneyNo',     'drop':0}  unique indexes not dropped
+                , {'tab':'HudCache',        'col':'gametypeId',        'drop':1}
+                , {'tab':'HudCache',        'col':'playerId',          'drop':0}
+                , {'tab':'HudCache',        'col':'tourneyTypeId',     'drop':0}
+                , {'tab':'Players',         'col':'siteId',            'drop':1}
+                , {'tab':'Tourneys',        'col':'tourneyTypeId',     'drop':1}
+                , {'tab':'TourneysPlayers', 'col':'playerId',          'drop':0}
+                , {'tab':'TourneyTypes',    'col':'siteId',            'drop':0}
                 ]
               ]
 
@@ -226,7 +230,7 @@ class Database:
     # create index indexname on tablename (col);
 
 
-    def __init__(self, c, sql = None): 
+    def __init__(self, c, sql = None, autoconnect = True): 
         #log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
         log.debug("Creating Database instance, sql = %s" % sql)
         self.config = c
@@ -247,6 +251,7 @@ class Database:
         else:
             self.sql = sql
 
+        if autoconnect:
             # connect to db
             self.do_connect(c)
             
@@ -313,7 +318,7 @@ class Database:
         self.__connected = True
 
     def connect(self, backend=None, host=None, database=None,
-                user=None, password=None):
+                user=None, password=None, create=False):
         """Connects a database with the given parameters"""
         if backend is None:
             raise FpdbError('Database backend not defined')
@@ -384,13 +389,14 @@ class Database:
             #    log.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
             if database != ":memory:":
-                if not os.path.isdir(self.config.dir_database):
+                if not os.path.isdir(self.config.dir_database) and create:
                     print "Creating directory: '%s'" % (self.config.dir_database)
                     log.info("Creating directory: '%s'" % (self.config.dir_database))
                     os.mkdir(self.config.dir_database)
                 database = os.path.join(self.config.dir_database, database)
             self.db_path = database
             log.info("Connecting to SQLite: %(database)s" % {'database':self.db_path})
+            if os.path.exists(database) or create:
                 self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES )
                 sqlite3.register_converter("bool", lambda x: bool(int(x)))
                 sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
@@ -405,11 +411,13 @@ class Database:
                 self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
                 self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
             else:
-            raise FpdbError("unrecognised database backend:"+backend)
+                raise FpdbError("sqlite database "+database+" does not exist")
+        else:
+            raise FpdbError("unrecognised database backend:"+str(backend))
 
         self.cursor = self.connection.cursor()
         self.cursor.execute(self.sql.query['set tx level'])
-        self.check_version(database=database, create=True)
+        self.check_version(database=database, create=create)
 
 
     def check_version(self, database, create):
@@ -721,6 +729,8 @@ class Database:
 
 #       now get the stats
         c.execute(self.sql.query[query], subs)
+        #for row in c.fetchall():   # needs "explain query plan" in sql statement
+        #    print "query plan: ", row
         colnames = [desc[0] for desc in c.description]
         for row in c.fetchall():
             playerid = row[0]
@@ -2096,6 +2106,7 @@ class HandToWrite:
 
 if __name__=="__main__":
     c = Configuration.Config()
+    sql = SQL.Sql(db_server = 'sqlite')
 
     db_connection = Database(c) # mysql fpdb holdem
 #    db_connection = Database(c, 'fpdb-p', 'test') # mysql fpdb holdem
@@ -2113,13 +2124,26 @@ if __name__=="__main__":
     if hero:
         print "nutOmatic is id_player = %d" % hero
     
+    # example of displaying query plan in sqlite:
+    if db_connection.backend == 4:
+        print
+        c = db_connection.get_cursor()
+        c.execute('explain query plan '+sql.query['get_table_name'], (h, ))
+        for row in c.fetchall():
+            print "query plan: ", row
+        print
+    
+    t0 = time()
     stat_dict = db_connection.get_stats_from_hand(h, "ring")
+    t1 = time()
     for p in stat_dict.keys():
         print p, "  ", stat_dict[p]
         
     print "cards =", db_connection.get_cards(u'1')
     db_connection.close_connection
     
+    print "get_stats took:  %4.3f seconds" % (t1-t0)
+
     print "press enter to continue"
     sys.stdin.readline()
 

pyfpdb/DerivedStats.py

@@ -227,7 +227,7 @@ class DerivedStats():
 
             #print "bb =", bb, "sb =", sb, "players =", players
             for i,player in enumerate(reversed(players)):
-                self.handsplayers[player]['position'] = str(i)
+                self.handsplayers[player]['position'] = i
 
     def assembleHudCache(self, hand):
         # No real work to be done - HandsPlayers data already contains the correct info
@@ -305,12 +305,13 @@ class DerivedStats():
         """Fills stealAttempt(Chance|ed, fold(Bb|Sb)ToSteal(Chance|)
 
         Steal attempt - open raise on positions 1 0 S - i.e. MP3, CO, BU, SB
+                        (note: I don't think PT2 counts SB steals in HU hands, maybe we shouldn't?)
         Fold to steal - folding blind after steal attemp wo any other callers or raisers
         """
         steal_attempt = False
-        steal_positions = ('1', '0', 'S')
+        steal_positions = (1, 0, 'S')
         if hand.gametype['base'] == 'stud':
-            steal_positions = ('2', '1', '0')
+            steal_positions = (2, 1, 0)
         for action in hand.actions[hand.actionStreets[1]]:
             pname, act = action[0], action[1]
             posn = self.handsplayers[pname]['position']

pyfpdb/Filters.py

@@ -211,6 +211,9 @@ class Filters(threading.Thread):
             self.Button2.connect("clicked", self.callback['button2'], "clicked")
             self.Button2.set_sensitive(True)
 
+        # make sure any locks on db are released:
+        self.db.rollback()
+
     def get_vbox(self):
         """returns the vbox of this thread"""
         return self.mainVBox

pyfpdb/GuiPlayerStats.py

@@ -81,7 +81,7 @@ class GuiPlayerStats (threading.Thread):
         self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display)
         self.filters.registerButton1Name("_Filters")
         self.filters.registerButton1Callback(self.showDetailFilter)
-        self.filters.registerButton2Name("_Refresh")
+        self.filters.registerButton2Name("_Refresh Stats")
         self.filters.registerButton2Callback(self.refreshStats)
 
         # ToDo: store in config
@@ -520,7 +520,7 @@ class GuiPlayerStats (threading.Thread):
             blindtest = str(tuple(nolims))
             blindtest = blindtest.replace("L", "")
             blindtest = blindtest.replace(",)",")")
-            bbtest = bbtest + blindtest + ' ) ) )'
+            bbtest = bbtest + blindtest + ' ) )'
         else:
             bbtest = bbtest + '(-1) ) )'
         if type == 'ring':

pyfpdb/Hand.py

@@ -125,6 +125,7 @@ class Hand(object):
         # currency symbol for this hand
         self.sym = self.SYMBOL[self.gametype['currency']] # save typing! delete this attr when done
         self.pot.setSym(self.sym)
+        self.is_duplicate = False  # i.e. don't update hudcache if true
 
     def __str__(self):
         vars = ( ("BB", self.bb),
@@ -236,6 +237,7 @@ db: a connected Database object"""
             # TourneysPlayers
         else:
             log.info("Hand.insert(): hid #: %s is a duplicate" % hh['siteHandNo'])
+            self.is_duplicate = True  # i.e. don't update hudcache
             raise FpdbHandDuplicate(hh['siteHandNo'])
 
     def updateHudCache(self, db):
@@ -674,6 +676,7 @@ class HoldemOmahaHand(Hand):
             if self.maxseats is None:
                 self.maxseats = hhc.guessMaxSeats(self)
             hhc.readOther(self)
+            #print "\nHand:\n"+str(self)
         elif builtFrom == "DB":
             if handid is not None:
                 self.select(handid) # Will need a handId

pyfpdb/SQL.py

@@ -1346,6 +1346,7 @@ class Sql:
 
 #    same as above except stats are aggregated for all blind/limit levels
         self.query['get_stats_from_hand_aggregated'] = """
+                /* explain query plan */
                 SELECT hc.playerId                         AS player_id,
                        max(case when hc.gametypeId = h.gametypeId
                                 then hp.seatNo

pyfpdb/fpdb.py

@@ -97,6 +97,7 @@ except:
 
 import GuiPrefs
 import GuiLogView
+import GuiDatabase
 import GuiBulkImport
 import GuiPlayerStats
 import GuiPositionalStats
@@ -288,11 +289,32 @@ class fpdb:
 
         dia.destroy()
 
-    def dia_create_del_database(self, widget, data=None):
+    def dia_maintain_dbs(self, widget, data=None):
-        self.warning_box("Unimplemented: Create/Delete Database")
+        self.warning_box("Unimplemented: Maintain Databases")
-        self.obtain_global_lock()
+        return
+        if len(self.tab_names) == 1:
+            if self.obtain_global_lock():  # returns true if successful
+                # only main tab has been opened, open dialog
+                dia = gtk.Dialog("Maintain Databases",
+                                 self.window,
+                                 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                                 (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                                  gtk.STOCK_SAVE, gtk.RESPONSE_ACCEPT))
+                dia.set_default_size(700, 320)
+
+                prefs = GuiDatabase.GuiDatabase(self.config, self.window, dia)
+                response = dia.run()
+                if response == gtk.RESPONSE_ACCEPT:
+                    # save updated config
+                    self.config.save()
+
                 self.release_global_lock()
 
+            dia.destroy()
+        else:
+            self.warning_box("Cannot open Database Maintenance window because "
+                             + "other windows have been opened. Re-start fpdb to use this option.")
+
     def dia_create_del_user(self, widget, data=None):
         self.warning_box("Unimplemented: Create/Delete user")
         self.obtain_global_lock()
@@ -620,7 +642,7 @@ class fpdb:
                   <menuitem action="tableviewer"/>
                 </menu>
                 <menu action="database">
-                  <menuitem action="createdb"/>
+                  <menuitem action="maintaindbs"/>
                   <menuitem action="createuser"/>
                   <menuitem action="createtabs"/>
                   <menuitem action="rebuildhudcache"/>
@@ -663,7 +685,7 @@ class fpdb:
                                  ('sessionreplay', None, '_Session Replayer (todo)', None, 'Session Replayer (todo)', self.not_implemented),
                                  ('tableviewer', None, 'Poker_table Viewer (mostly obselete)', None, 'Poker_table Viewer (mostly obselete)', self.tab_table_viewer),
                                  ('database', None, '_Database'),
-                                 ('createdb', None, 'Create or Delete _Database (todo)', None, 'Create or Delete Database', self.dia_create_del_database),
+                                 ('maintaindbs', None, '_Maintain Databases (todo)', None, 'Maintain Databases', self.dia_maintain_dbs),
                                  ('createuser', None, 'Create or Delete _User (todo)', None, 'Create or Delete User', self.dia_create_del_user),
                                  ('createtabs', None, 'Create or Recreate _Tables', None, 'Create or Recreate Tables ', self.dia_recreate_tables),
                                  ('rebuildhudcache', None, 'Rebuild HUD Cache', None, 'Rebuild HUD Cache', self.dia_recreate_hudcache),
@@ -685,9 +707,15 @@ class fpdb:
         window.add_accel_group(accel_group)
         return menubar
 
-    def load_profile(self):
+    def load_profile(self, create_db = False):
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
+        if self.config.file_error:
+            self.warning_box( "There is an error in your config file\n" + self.config.file
+                              + "\n\nError is:  " + str(self.config.file_error)
+                            , diatitle="CONFIG FILE ERROR" )
+            exit()
+
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
         print "Logfile is " + os.path.join(self.config.dir_log, self.config.log_file) + "\n"
         if self.config.example_copy:
@@ -905,7 +933,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         self.tab_main_help(None, None)
 
         self.window.show()
-        self.load_profile()
+        self.load_profile(create_db = True)
 
         if not options.errorsToConsole:
             fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')

pyfpdb/fpdb_import.py

@@ -456,7 +456,7 @@ class Importer:
                 # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
                     for hand in handlist:
-                        if hand is not None:
+                        if hand is not None and not hand.is_duplicate:
                             hand.updateHudCache(self.database)
                 self.database.commit()
 

pyfpdb/py2exe_setup.py

@@ -73,6 +73,7 @@ from distutils.core import setup
 import py2exe
 import glob
 import matplotlib
+import shutil
 from datetime import date
 
 
@@ -111,7 +112,7 @@ def test_and_remove(top):
 # remove build and dist dirs if they exist
 test_and_remove('dist')
 test_and_remove('build')
-test_and_remove('gfx')
+#test_and_remove('gfx')
 
 
 today = date.today().strftime('%Y%m%d')
@@ -174,3 +175,36 @@ dest = dest.replace('\\', '\\\\')
 os.rename( 'pyfpdb', dest )
 
 
+print "Enter directory name for GTK 2.14 (e.g. c:\code\gtk_2.14.7-20090119)\n: ",     # the comma means no newline
+gtk_dir = sys.stdin.readline().rstrip()
+
+
+print "\ncopying files and dirs from ", gtk_dir, "to", dest.replace('\\\\', '\\'), "..."
+src = os.path.join(gtk_dir, 'bin', 'libgdk-win32-2.0-0.dll')
+src = src.replace('\\', '\\\\')
+shutil.copy( src, dest )
+
+src = os.path.join(gtk_dir, 'bin', 'libgobject-2.0-0.dll')
+src = src.replace('\\', '\\\\')
+shutil.copy( src, dest )
+
+
+src_dir = os.path.join(gtk_dir, 'etc')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'etc')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+src_dir = os.path.join(gtk_dir, 'lib')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'lib')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+src_dir = os.path.join(gtk_dir, 'share')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'share')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+