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

pyfpdb/Database.py

@@ -182,6 +182,9 @@ class Database:
         else:
             self.sql = sql
 
+        self.pcache      = None     # PlayerId cache
+        self.cachemiss   = 0        # Delete me later - using to count player cache misses
+
         # config while trying out new hudcache mechanism
         self.use_date_in_hudcache = True
 
@@ -969,6 +972,30 @@ class Database:
             print "Error during fdb.lock_for_insert:", str(sys.exc_value)
     #end def lock_for_insert
 
+    def getSqlPlayerIDs(self, pnames, siteid):
+        result = {}
+        if(self.pcache == None):
+            self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
+ 
+        for player in pnames:
+            result[player] = self.pcache[player]
+
+        return result
+
+    def insertPlayer(self, name, site_id):
+        self.cachemiss += 1
+        result = None
+        c = self.get_cursor()
+        c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
+        tmp=c.fetchall()
+        if (len(tmp)==0): #new player
+            c.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)", (name, site_id))
+            c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
+            tmp=c.fetchall()
+            #print "recognisePlayerIDs, names[i]:",names[i],"tmp:",tmp
+        print "DEBUG: cache misses: %s" %self.cachemiss
+        return tmp[0][0]
+
 
     def store_the_hand(self, h):
         """Take a HandToWrite object and store it in the db"""
@@ -1785,3 +1812,17 @@ if __name__=="__main__":
 
     print "press enter to continue"
     sys.stdin.readline()
+
+
+#Code borrowed from http://push.cx/2008/caching-dictionaries-in-python-vs-ruby
+class LambdaDict(dict):
+    def __init__(self, l):
+        super(LambdaDict, self).__init__()
+        self.l = l
+
+    def __getitem__(self, key):
+        if key in self:
+            return self.get(key)
+        else:
+            self.__setitem__(key, self.l(key))
+            return self.get(key)

pyfpdb/HUD_config.xml.example

@@ -210,7 +210,7 @@
     	<game cols="3" db="fpdb" game_name="holdem" rows="2" aux="mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -219,7 +219,7 @@
     	<game cols="3" db="fpdb" game_name="razz" rows="2" aux="stud_mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -228,7 +228,7 @@
     	<game cols="3" db="fpdb" game_name="omahahi" rows="2" aux="mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -237,7 +237,7 @@
     	<game cols="3" db="fpdb" game_name="omahahilo" rows="2" aux="mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -246,7 +246,7 @@
     	<game cols="3" db="fpdb" game_name="studhi" rows="2" aux="stud_mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -255,7 +255,7 @@
     	<game cols="3" db="fpdb" game_name="studhilo" rows="2" aux="stud_mucked">
     		<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
     		<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
@@ -274,18 +274,18 @@
             <pu_stat pu_stat_name="wmsd"> </pu_stat>
             <pu_stat pu_stat_name="wtsd"> </pu_stat>
             <pu_stat pu_stat_name="WMsF"> </pu_stat>
-            <pu_stat pu_stat_name="a_freq_1"> </pu_stat>
+            <pu_stat pu_stat_name="a_freq1"> </pu_stat>
-            <pu_stat pu_stat_name="a_freq_2"> </pu_stat>
+            <pu_stat pu_stat_name="a_freq2"> </pu_stat>
-            <pu_stat pu_stat_name="a_freq_3"> </pu_stat>
+            <pu_stat pu_stat_name="a_freq3"> </pu_stat>
-            <pu_stat pu_stat_name="a_freq_4"> </pu_stat>
+            <pu_stat pu_stat_name="a_freq4"> </pu_stat>
-            <pu_stat pu_stat_name="cb_1"> </pu_stat>
+            <pu_stat pu_stat_name="cb1"> </pu_stat>
-            <pu_stat pu_stat_name="cb_2"> </pu_stat>
+            <pu_stat pu_stat_name="cb2"> </pu_stat>
-            <pu_stat pu_stat_name="cb_3"> </pu_stat>
+            <pu_stat pu_stat_name="cb3"> </pu_stat>
-            <pu_stat pu_stat_name="cb_4"> </pu_stat>
+            <pu_stat pu_stat_name="cb4"> </pu_stat>
-            <pu_stat pu_stat_name="ffreq_1"> </pu_stat>
+            <pu_stat pu_stat_name="ffreq1"> </pu_stat>
-            <pu_stat pu_stat_name="ffreq_2"> </pu_stat>
+            <pu_stat pu_stat_name="ffreq2"> </pu_stat>
-            <pu_stat pu_stat_name="ffreq_3"> </pu_stat>
+            <pu_stat pu_stat_name="ffreq3"> </pu_stat>
-            <pu_stat pu_stat_name="ffreq_4"> </pu_stat>
+            <pu_stat pu_stat_name="ffreq4"> </pu_stat>
     	</pu>
     </popup_windows>
 

pyfpdb/Hand.py

@@ -40,10 +40,12 @@ class Hand(object):
     LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
     SYMBOL = {'USD': '$', 'EUR': u'$', 'T$': '', 'play': ''}
     MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE', 'ha': 'HA'}
+    SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7}
 
 
     def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
         self.sitename = sitename
+        self.siteId = self.SITEIDS[sitename]
         self.stats = DerivedStats.DerivedStats(self)
         self.gametype = gametype
         self.starttime = 0

pyfpdb/fpdb_import.py

@@ -392,17 +392,17 @@ class Importer:
         mod = __import__(filter)
         obj = getattr(mod, filter_name, None)
         if callable(obj):
-            conv = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
+            hhc = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
-            if(conv.getStatus() and self.NEWIMPORT == False):
+            if(hhc.getStatus() and self.NEWIMPORT == False):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
-            elif (conv.getStatus() and self.NEWIMPORT == True):
+            elif (hhc.getStatus() and self.NEWIMPORT == True):
                 #This code doesn't do anything yet
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
 
                 for hand in handlist:
-                    hand.prepInsert()
+                    #hand.prepInsert()
-                    hand.insert()
+                    hand.insert(self.database)
             else:
                 # conversion didn't work
                 # TODO: appropriate response?