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

pyfpdb/BetfairToFpdb.py

@@ -34,12 +34,12 @@ class Betfair(HandHistoryConverter):
     re_PlayerInfo    = re.compile("Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*)\s\(\s(\$(?P<CASH>[.0-9]+)) \)")
     re_Board         = re.compile(ur"\[ (?P<CARDS>.+) \]")
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Betfair", follow=follow) # Call super class init.
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Betfair", follow=follow, index) # Call super class init.
         logging.info("Initialising Betfair converter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/EverleafToFpdb.py

@@ -37,7 +37,7 @@ class Everleaf(HandHistoryConverter):
     re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
     
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, debugging=False):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, debugging=False, index=0):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
@@ -45,7 +45,7 @@ follow :  whether to tail -f the input
 autostart: whether to run the thread (or you can call start() yourself)
 debugging: if False, pass on partially supported game types. If true, have a go and error..."""
         print "DEBUG: XXXXXXXXXXXXXXX"
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Everleaf", follow=follow)
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Everleaf", follow=follow, index=index)
         logging.info("Initialising Everleaf converter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/FulltiltToFpdb.py

@@ -52,12 +52,12 @@ class Fulltilt(HandHistoryConverter):
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports.
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Fulltilt", follow=follow)
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Fulltilt", follow=follow, index=index)
         logging.info("Initialising Fulltilt converter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/Hand.py

@@ -172,6 +172,9 @@ dealt   whether they were seen in a 'dealt to' line
 
         self.holecards[street][player] = [open, closed]
 
+    def prepInsert(self, db):
+        pass
+
     def insert(self, db):
         """ Function to insert Hand into database
 Should not commit, and do minimal selects. Callers may want to cache commits

pyfpdb/HandHistoryConverter.py

@@ -37,12 +37,13 @@ gettext.install('fpdb')
 class HandHistoryConverter():
 
     READ_CHUNK_SIZE = 10000 # bytes to read at a time from file (in tail mode)
-    def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False):
+    def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False, index=0):
         logging.info("HandHistory init")
         
         # default filetype and codepage. Subclasses should set these properly.
         self.filetype  = "text"
         self.codepage  = "utf8"
+        self.index     = 0
 
         self.in_path = in_path
         self.out_path = out_path
@@ -330,7 +331,9 @@ or None if we fail to get the info """
             else:
                 logging.debug("Opening %s with %s" % (self.in_path, self.codepage))
                 in_fh = codecs.open(self.in_path, 'r', self.codepage)
+                in_fh.seek(self.index)
             self.obs = in_fh.read()
+            self.index = in_fh.tell()
             in_fh.close()
         elif(self.filetype == "xml"):
             try:
@@ -346,3 +349,6 @@ or None if we fail to get the info """
 
     def getProcessedFile(self):
         return self.out_path
+
+    def getLastCharacterRead(self):
+        return self.index

pyfpdb/PokerStarsToFpdb.py

@@ -55,12 +55,12 @@ class PokerStars(HandHistoryConverter):
 
     mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="PokerStars", follow=follow)
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="PokerStars", follow=follow, index=index)
         logging.info("Initialising PokerStars converter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/UltimateBetToFpdb.py

@@ -33,12 +33,12 @@ class UltimateBet(HandHistoryConverter):
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 #        self.re_setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[ a-zA-Z]+) - \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>.*) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+) ET - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+)Table (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')    
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="UltimateBet", follow=follow)
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="UltimateBet", follow=follow, index=index)
         logging.info("Initialising UltimateBetconverter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/Win2dayToFpdb.py

@@ -39,8 +39,8 @@ class Win2day(HandHistoryConverter):
     re_Card        = re.compile('^<CARD LINK="(?P<CARD>[0-9]+)"></CARD>', re.MULTILINE)
     re_BoardLast    = re.compile('^<CARD LINK="(?P<CARD>[0-9]+)"></CARD></ACTION>', re.MULTILINE)
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Win2day", follow=follow)
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Win2day", follow=follow, index=index)
         logging.info("Initialising Win2day converter class")
         self.filetype = "text"
         self.codepage = "cp1252"

pyfpdb/fpdb_import.py

@@ -83,6 +83,8 @@ class Importer:
         self.fdb.do_connect(self.config)
         self.fdb.db.rollback()
 
+        self.NEWIMPORT = False
+
     #Set functions
     def setCallHud(self, value):
         self.callHud = value
@@ -310,9 +312,17 @@ class Importer:
         mod = __import__(filter)
         obj = getattr(mod, filter_name, None)
         if callable(obj):
-            conv = obj(in_path = file, out_path = out_path)
+            conv = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
-            if(conv.getStatus()):
+            if(conv.getStatus() and self.NEWIMPORT == False):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
+            elif (conv.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.insert()
             else:
                 # conversion didn't work
                 # TODO: appropriate response?