From b023a9404cc80335022d33c0d9a10178a40c5088 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 30 Jan 2009 02:18:19 +0900
Subject: [PATCH 01/66] Quick commit to add the failing Full Tilt HH Header

Only as a comment for now. Need to pull together all the valid Full Tilt
HH lines so we can write a decent regex to match
---
 pyfpdb/fpdb_simple.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index e97102dd..6d018f45 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -1158,6 +1158,8 @@ def parseHandStartTime(topline, site):
     
     isUTC=False
     if site=="ftp":
+        # Full Tilt Sit'n'Go
+        # Full Tilt Poker Game #10311865543: $1 + $0.25 Sit & Go (78057629), Table 1 - 25/50 - No Limit Hold'em - 0:07:45 ET - 2009/01/29
         pos = topline.find(" ", len(topline)-26)+1
         tmp = topline[pos:]
         #print "year:", tmp[14:18], "month", tmp[19:21], "day", tmp[22:24], "hour", tmp[0:2], "minute", tmp[3:5], "second", tmp[6:8]

From 9cd88c0399d591942aef1372414176b1207b2218 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 30 Jan 2009 13:23:09 +0900
Subject: [PATCH 02/66] Comment patch: FTP HH headers

---
 pyfpdb/fpdb_simple.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 6d018f45..76c07187 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -1158,8 +1158,12 @@ def parseHandStartTime(topline, site):
     
     isUTC=False
     if site=="ftp":
+        # TODO: Turn this into a regex that matches the following
         # Full Tilt Sit'n'Go
         # Full Tilt Poker Game #10311865543: $1 + $0.25 Sit & Go (78057629), Table 1 - 25/50 - No Limit Hold'em - 0:07:45 ET - 2009/01/29
+        # Cash Game:
+        # Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09
+        # Full Tilt Poker Game #9468383505: Table Bike (deep 6) - $0.05/$0.10 - No Limit Hold'em - 5:09:36 ET - 2008/12/13
         pos = topline.find(" ", len(topline)-26)+1
         tmp = topline[pos:]
         #print "year:", tmp[14:18], "month", tmp[19:21], "day", tmp[22:24], "hour", tmp[0:2], "minute", tmp[3:5], "second", tmp[6:8]

From 315d01031132faae4fb7b165054a17d7e4a3c3e7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 5 Feb 2009 18:28:18 +0900
Subject: [PATCH 03/66] Make Everleaf converter actually function.

Makes HandHistoryConverter actually write out a file to
$hhArchiveBase/sitename/

Adds code in importer call the functions in EverleafToFpdb
---
 pyfpdb/HandHistoryConverter.py | 13 +++++++++++--
 pyfpdb/fpdb_import.py          | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 7dea7731..8d7df813 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -88,7 +88,7 @@ class HandHistoryConverter:
         self.hhbase    = os.path.expanduser(self.hhbase)
         self.hhdir     = os.path.join(self.hhbase,sitename)
         self.gametype  = []
-#		self.ofile     = os.path.join(self.hhdir,file)
+        self.ofile     = os.path.join(self.hhdir,file)
         self.rexx      = FpdbRegex.FpdbRegex()
 
     def __str__(self):
@@ -110,6 +110,7 @@ class HandHistoryConverter:
             print "Cowardly refusing to continue after failed sanity check"
             return
         self.readFile(self.file)
+        outfile = open(self.ofile, 'w')
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
         for hand in self.hands:
@@ -137,13 +138,14 @@ class HandHistoryConverter:
             hand.totalPot()
             self.getRake(hand)
 
-            hand.writeHand(sys.stderr)
+            hand.writeHand(outfile)
             #if(hand.involved == True):
                 #self.writeHand("output file", hand)
                 #hand.printHand()
             #else:
                 #pass #Don't write out observed hands
 
+        outfile.close()
         endtime = time.time()
         print "Processed %d hands in %d seconds" % (len(self.hands), endtime-starttime)
 
@@ -259,3 +261,10 @@ class HandHistoryConverter:
             result*=100
         return result
 #end def float2int
+
+    def getStatus(self):
+        #TODO: Return a status of true if file processed ok
+        return True
+
+    def getProcessedFile(self):
+        return self.ofile
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aa68c94f..09a26665 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -39,6 +39,7 @@ import re
 import fpdb_db
 import fpdb_simple
 import fpdb_parse_logic
+import EverleafToFpdb
 from time import time
 
 class Importer:
@@ -156,8 +157,18 @@ class Importer:
         if(filter == "passthrough"):
             (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(file, site)
         else:
-            # TODO: Load filter, and run filtered file though main importer
-            (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(file, site)
+            conv = None
+            # Load filter, process file, pass returned filename to import_fpdb_file
+            if(filter == "EverleafToFpdb"):
+                conv = EverleafToFpdb(self.config, file)
+
+            conv.readSupportedGames() # Should this be done by HHC on init?
+            conv.determineGameType()
+            conv.processFile()
+            if(conv.getStatus()):
+                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(ofile), site)
+
+        #This will barf if conv.getStatus != True
         return (stored, duplicates, partial, errors, ttime)
 
 

From 6214131713a1be1cba5724baab5be0c9641d3701 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 5 Feb 2009 18:50:50 +0900
Subject: [PATCH 04/66] Small change - note we should error check

---
 pyfpdb/EverleafToFpdb.py       | 2 +-
 pyfpdb/HandHistoryConverter.py | 4 +++-
 pyfpdb/fpdb_import.py          | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 4e51213f..6d409bda 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -86,7 +86,7 @@ class Everleaf(HandHistoryConverter):
         self.rexx.compileRegexes()
 
     def readSupportedGames(self):
-        pass
+        return [["ring", "hold", "nl"]]
 
     def determineGameType(self):
         # Cheating with this regex, only support nlhe at the moment
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 8d7df813..a698c390 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -151,7 +151,9 @@ class HandHistoryConverter:
 
     #####
     # These functions are parse actions that may be overridden by the inheriting class
-    #
+    # This function should return a list of lists looking like:
+    # return [["ring", "hold", "nl"], ["tour", "hold", "nl"]]
+    # Showing all supported games limits and types
     
     def readSupportedGames(self): abstract
 
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 09a26665..b9a8f0bf 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -162,8 +162,9 @@ class Importer:
             if(filter == "EverleafToFpdb"):
                 conv = EverleafToFpdb(self.config, file)
 
-            conv.readSupportedGames() # Should this be done by HHC on init?
-            conv.determineGameType()
+            supp = conv.readSupportedGames() # Should this be done by HHC on init?
+            gt = conv.determineGameType()
+            # TODO: Check that gt is in supp - error appropriately if not
             conv.processFile()
             if(conv.getStatus()):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(ofile), site)

From d2159b6430d6ccbf864d81975c1fdc044b317313 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Thu, 19 Feb 2009 05:38:51 -0500
Subject: [PATCH 05/66] changes to make auto-import recursive, and to get the
 converter thingee kind of working

---
 pyfpdb/HandHistoryConverter.py |  4 ++--
 pyfpdb/fpdb_import.py          | 24 ++++++++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index a698c390..9b22f42b 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -28,7 +28,7 @@ import codecs
 from decimal import Decimal
 import operator
 from xml.dom.minidom import Node
-from pokereval import PokerEval
+# from pokereval import PokerEval
 import time
 import datetime
 import gettext
@@ -74,7 +74,7 @@ gettext.install('myapplication')
 
 
 class HandHistoryConverter:
-    eval = PokerEval()
+#    eval = PokerEval()
     def __init__(self, config, file, sitename):
         print "HandHistory init called"
         self.c         = config
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 1d46430a..304402ad 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -59,6 +59,7 @@ class Importer:
         self.cursor = None
         self.filelist = {}
         self.dirlist = {}
+        self.addToDirList = {}
         self.monitor = False
         self.updated = {}       #Time last import was run {file:mtime}
         self.lines = None
@@ -180,18 +181,33 @@ class Importer:
                 self.updated[file] = time()
                 # This codepath only runs first time the file is found, if modified in the last
                 # minute run an immediate import.
-                if (time() - stat_info.st_mtime) < 60: # TODO: figure out a way to dispatch this to the seperate thread so our main window doesn't lock up on initial import
+                if (time() - stat_info.st_mtime) < 60 or os.path.isdir(file): # TODO: figure out a way to dispatch this to the seperate thread so our main window doesn't lock up on initial import
                     self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
+                    
+        for dir in self.addToDirList:
+            self.addImportDirectory(dir, True, self.addToDirList[dir][0], self.addToDirList[dir][1])
+        
+        self.addToDirList = {}
 
     # This is now an internal function that should not be called directly.
     def import_file_dict(self, file, site, filter):
-        if(filter == "passthrough"):
+        if os.path.isdir(file):
+            self.addToDirList[file] = [site] + [filter]
+            return
+        if filter == "passthrough" or filter == "":
             (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(file, site)
         else:
             conv = None
             # Load filter, process file, pass returned filename to import_fpdb_file
-            if(filter == "EverleafToFpdb"):
-                conv = EverleafToFpdb(self.config, file)
+            
+            # TODO: Shouldn't we be able to use some sort of lambda or something to just call a Python object by whatever name we specify? then we don't have to hardcode them,
+            # someone can just create their own python module for it
+            if filter == "EverleafToFpdb":
+                print "converting ", file
+                conv = EverleafToFpdb.Everleaf(self.config, file)
+            else:
+                print "Unknown filter ", filter
+                return
 
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
             gt = conv.determineGameType()

From 2a90c798a245cec901af39b73fa5a8824f1f7407 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 19 Feb 2009 20:35:05 +0900
Subject: [PATCH 06/66] Make executable

---
 pyfpdb/GuiBulkImport.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pyfpdb/GuiBulkImport.py

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
old mode 100644
new mode 100755

From 50ca5d54574d3ce1ae7c1d833487e412159972ce Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 19 Feb 2009 21:15:12 +0900
Subject: [PATCH 07/66] Fix tab/spacing

---
 pyfpdb/Configuration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 9b8f4f08..a9a884a7 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -189,7 +189,7 @@ class Import:
     def __init__(self, node):
         self.interval      = node.getAttribute("interval")
         self.callFpdbHud   = node.getAttribute("callFpdbHud")
-	self.hhArchiveBase = node.getAttribute("hhArchiveBase")
+        self.hhArchiveBase = node.getAttribute("hhArchiveBase")
 
     def __str__(self):
         return "    interval = %s\n    callFpdbHud = %s\n    hhArchiveBase = %s" % (self.interval, self.callFpdbHud, self.hhArchiveBase)
@@ -665,4 +665,4 @@ if __name__== "__main__":
     for game in c.get_supported_games():
         print c.get_game_parameters(game)
 
-    print "start up path = ", c.execution_path("")
\ No newline at end of file
+    print "start up path = ", c.execution_path("")

From 98ea23cd49eaffa293c6e100b2de5f2dad627050 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 19 Feb 2009 22:10:31 +0900
Subject: [PATCH 08/66] Couple of additional fixes for import

---
 pyfpdb/fpdb_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 304402ad..e2e5302e 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -210,11 +210,11 @@ class Importer:
                 return
 
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
-            gt = conv.determineGameType()
+            #gt = conv.determineGameType()
             # TODO: Check that gt is in supp - error appropriately if not
             conv.processFile()
             if(conv.getStatus()):
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(ofile), site)
+                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
 
         #This will barf if conv.getStatus != True
         return (stored, duplicates, partial, errors, ttime)

From bc8f1b56b69987dc40fb28ae98fe266568b33de1 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 19 Feb 2009 22:58:29 +0900
Subject: [PATCH 09/66] Remove Unicode mode from file read.

Hope this fixes the issue with Erics source file getting nuked
---
 pyfpdb/HandHistoryConverter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 9b22f42b..9af87d62 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -237,7 +237,7 @@ class HandHistoryConverter:
         """Read file"""
         print "Reading file: '%s'" %(filename)
         if(self.filetype == "text"):
-            infile=codecs.open(filename, "rU", self.codepage)
+            infile=codecs.open(filename, "r", self.codepage)
             self.obs = infile.read()
             infile.close()
         elif(self.filetype == "xml"):

From d9656b25f604bb3da1f9a7e449ac70f2fc53a632 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 01:37:48 +0900
Subject: [PATCH 10/66] Oversight in Hand.py (?)

Bp missing in this function, and doesn't run if called. No idea if the
function has ever been called.
---
 pyfpdb/Hand.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 24ccbe3f..4726eaa9 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -265,6 +265,7 @@ For sites which by "raises x" mean "calls and raises putting a total of x in the
 Add a raise on [street] by [player] to [amountTo]
 """
         self.checkPlayerExists(player)
+        Bp = self.lastBet[street]
         Bc = reduce(operator.add, self.bets[street][player], 0)
         Rt = Decimal(amountTo)
         C = Bp - Bc

From 08a4d568cc687e0a3fbd795bfb0142af97a88dfc Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 02:26:29 +0900
Subject: [PATCH 11/66] Fix parseHandStartTime for FullTilt

Doesn't come close to fixing Full Tilt tourneys as far as i can tell.
---
 pyfpdb/Hand.py                 |  1 +
 pyfpdb/HandHistoryConverter.py |  2 ++
 pyfpdb/RegressionTest.py       | 15 +++++++++++++++
 pyfpdb/fpdb_simple.py          |  7 ++++---
 4 files changed, 22 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 pyfpdb/RegressionTest.py

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 4726eaa9..7cadbf3d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -264,6 +264,7 @@ For sites which by "raises x" mean "calls and raises putting a total of x in the
         """\
 Add a raise on [street] by [player] to [amountTo]
 """
+        #CG - No idea if this function has been test/verified
         self.checkPlayerExists(player)
         Bp = self.lastBet[street]
         Bc = reduce(operator.add, self.bets[street][player], 0)
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 9af87d62..f7b1e482 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -110,6 +110,8 @@ class HandHistoryConverter:
             print "Cowardly refusing to continue after failed sanity check"
             return
         self.readFile(self.file)
+        # Ugh
+        self.obs = self.obs.replace('\r\n', '\n')
         outfile = open(self.ofile, 'w')
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
diff --git a/pyfpdb/RegressionTest.py b/pyfpdb/RegressionTest.py
old mode 100644
new mode 100755
index 6acc8a74..d52b6aca
--- a/pyfpdb/RegressionTest.py
+++ b/pyfpdb/RegressionTest.py
@@ -90,6 +90,21 @@ class TestSequenceFunctions(unittest.TestCase):
         self.failUnless(result==datetime.datetime(2008,8,17,6,14,43),
                         "Date incorrect, expected: 2008-08-17 01:14:43 got: " + str(result))
 
+    def testFullTiltHHDate(self):
+        sitngo1 = "Full Tilt Poker Game #10311865543: $1 + $0.25 Sit & Go (78057629), Table 1 - 25/50 - No Limit Hold'em - 0:07:45 ET - 2009/01/29"
+        cash1 = "Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09"
+        cash2 = "Full Tilt Poker Game #9468383505: Table Bike (deep 6) - $0.05/$0.10 - No Limit Hold'em - 5:09:36 ET - 2008/12/13"
+
+        result = fpdb_simple.parseHandStartTime(sitngo1,"ftp")
+        self.failUnless(result==datetime.datetime(2009,1,29,05,07,45),
+                        "Date incorrect, expected: 2009-01-29 05:07:45 got: " + str(result))
+        result = fpdb_simple.parseHandStartTime(cash1,"ftp")
+        self.failUnless(result==datetime.datetime(2008,12,9,14,40,20),
+                        "Date incorrect, expected: 2008-12-09 14:40:20 got: " + str(result))
+        result = fpdb_simple.parseHandStartTime(cash2,"ftp")
+        self.failUnless(result==datetime.datetime(2008,12,13,10,9,36),
+                        "Date incorrect, expected: 2008-12-13 10:09:36 got: " + str(result))
+
     def testTableDetection(self):
         result = Tables.clean_title("French (deep)")
         self.failUnless(result == "French", "French (deep) parsed incorrectly. Expected 'French' got: " + str(result))
diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 76c07187..b0231ecf 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -1158,7 +1158,6 @@ def parseHandStartTime(topline, site):
     
     isUTC=False
     if site=="ftp":
-        # TODO: Turn this into a regex that matches the following
         # Full Tilt Sit'n'Go
         # Full Tilt Poker Game #10311865543: $1 + $0.25 Sit & Go (78057629), Table 1 - 25/50 - No Limit Hold'em - 0:07:45 ET - 2009/01/29
         # Cash Game:
@@ -1166,8 +1165,10 @@ def parseHandStartTime(topline, site):
         # Full Tilt Poker Game #9468383505: Table Bike (deep 6) - $0.05/$0.10 - No Limit Hold'em - 5:09:36 ET - 2008/12/13
         pos = topline.find(" ", len(topline)-26)+1
         tmp = topline[pos:]
-        #print "year:", tmp[14:18], "month", tmp[19:21], "day", tmp[22:24], "hour", tmp[0:2], "minute", tmp[3:5], "second", tmp[6:8]
-        result = datetime.datetime(int(tmp[14:18]), int(tmp[19:21]), int(tmp[22:24]), int(tmp[0:2]), int(tmp[3:5]), int(tmp[6:8]))
+
+        rexx = '(?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+) ET [\- ]+(?P<YEAR>[0-9]{4})\/(?P<MON>[0-9]{2})\/(?P<DAY>[0-9]{2})'
+        m = re.search(rexx,tmp)
+        result = datetime.datetime(int(m.group('YEAR')), int(m.group('MON')), int(m.group('DAY')), int(m.group('HR')), int(m.group('MIN')), int(m.group('SEC')))
     elif site=="ps":
         if topline.find("UTC")!=-1:
             pos1 = topline.find("-")+2

From 14cf64f81b54023f6ded11c92e990aad57aca24f Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Thu, 19 Feb 2009 16:56:37 -0500
Subject: [PATCH 12/66] HHC will return without generating python errors if
 given an empty input, commented out echoing the input

---
 pyfpdb/HandHistoryConverter.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 9b22f42b..a92163ab 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -110,11 +110,14 @@ class HandHistoryConverter:
             print "Cowardly refusing to continue after failed sanity check"
             return
         self.readFile(self.file)
+        if self.obs == "" or self.obs == None:
+            print "Did not read anything from file."
+            return
         outfile = open(self.ofile, 'w')
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
         for hand in self.hands:
-            print "\nInput:\n"+hand.string
+#            print "\nInput:\n"+hand.string
             self.readHandInfo(hand)
             self.readPlayerStacks(hand)
             print "DEBUG stacks:", hand.stacks

From e5ab933659dc29f208c4027a17450d483189226b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 16:06:22 +0900
Subject: [PATCH 13/66] Fix major bug in fpdb_import

Hat tip to Eric
---
 pyfpdb/HandHistoryConverter.py | 2 +-
 pyfpdb/fpdb_import.py          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index f7b1e482..a3179918 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -88,7 +88,7 @@ class HandHistoryConverter:
         self.hhbase    = os.path.expanduser(self.hhbase)
         self.hhdir     = os.path.join(self.hhbase,sitename)
         self.gametype  = []
-        self.ofile     = os.path.join(self.hhdir,file)
+        self.ofile     = os.path.join(self.hhdir, os.path.basename(file))
         self.rexx      = FpdbRegex.FpdbRegex()
 
     def __str__(self):
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index e2e5302e..e5dafe4c 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -205,6 +205,9 @@ class Importer:
             if filter == "EverleafToFpdb":
                 print "converting ", file
                 conv = EverleafToFpdb.Everleaf(self.config, file)
+            elif filter == "FulltiltToFpdb":
+                print "converting ", file
+                conv = FulltiltToFpdb.Fulltilt(self.config, file)
             else:
                 print "Unknown filter ", filter
                 return

From 77591788e41b3806b3af9381c2dc8d8fb3e5fe58 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 16:38:13 +0900
Subject: [PATCH 14/66] Minor regex update for raises in Everleaf

---
 pyfpdb/EverleafToFpdb.py | 2 +-
 pyfpdb/Hand.py           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 6d409bda..263ea9d5 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -78,7 +78,7 @@ class Everleaf(HandHistoryConverter):
         self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
         self.rexx.setPostBothRegex('.*\n(?P<PNAME>.*): posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
         self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<CARDS>.*) \]')
-        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
+        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE>: bets| checks|: raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
         self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[ (?P<CARDS>.*) \]')
         self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?')
         #self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) USD(.*\[ (?P<CARDS>) \S\S, \S\S, \S\S, \S\S, \S\S \])?')
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 7cadbf3d..aede8974 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -158,6 +158,7 @@ Card ranks will be uppercased
 
 
     def checkPlayerExists(self,player):
+        print "XXXX player: ", player
         if player not in [p[1] for p in self.players]:
             raise FpdbParseError
 

From 65821dbd2b01cfb1c11b123d617f8dccc9e4c1d2 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 16:42:57 +0900
Subject: [PATCH 15/66] Remove debug line that slipped thorugh in last commit

---
 pyfpdb/Hand.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index aede8974..7cadbf3d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -158,7 +158,6 @@ Card ranks will be uppercased
 
 
     def checkPlayerExists(self,player):
-        print "XXXX player: ", player
         if player not in [p[1] for p in self.players]:
             raise FpdbParseError
 

From fe5045b14f91fa2da0f800cf51ef5b776d005d37 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Fri, 20 Feb 2009 02:44:06 -0500
Subject: [PATCH 16/66] hand error in checkPlayerExists will tell you why it
 failed

---
 pyfpdb/Hand.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 7cadbf3d..e8546237 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -159,6 +159,7 @@ Card ranks will be uppercased
 
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
+            print "checkPlayerExists", player, "fail"
             raise FpdbParseError
 
     def discardHoleCards(self, cards, player):

From 81c92f959948e44d6b62ea1b1bbb403dfe4ade8a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 20 Feb 2009 17:22:58 +0900
Subject: [PATCH 17/66] Revert last change and try alternate

Assumes that the player names cannot have a ':' or a ' ' in them
---
 pyfpdb/EverleafToFpdb.py | 2 +-
 pyfpdb/Hand.py           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 263ea9d5..7a5344c2 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -78,7 +78,7 @@ class Everleaf(HandHistoryConverter):
         self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
         self.rexx.setPostBothRegex('.*\n(?P<PNAME>.*): posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
         self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<CARDS>.*) \]')
-        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE>: bets| checks|: raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
+        self.rexx.setActionStepRegex('.*\n(?P<PNAME>[^: ]*)(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
         self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[ (?P<CARDS>.*) \]')
         self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?')
         #self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) USD(.*\[ (?P<CARDS>) \S\S, \S\S, \S\S, \S\S, \S\S \])?')
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 7cadbf3d..ec03fc27 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -544,11 +544,11 @@ class Pot(object):
             #print "returning %f to %s" % (lastbet, returnto)
             self.total -= lastbet
             self.committed[returnto] -= lastbet
-        
-        
+
+
         # Work out side pots
         commitsall = sorted([(v,k) for (k,v) in self.committed.items() if v >0])
-        
+
         self.pots = []
         while len(commitsall) > 0:
             commitslive = [(v,k) for (v,k) in commitsall if k in self.contenders]

From b8f88661f39af75e347400884fff6b00e82b7abf Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Fri, 20 Feb 2009 03:33:25 -0500
Subject: [PATCH 18/66] Add comment to Hand.py, around addCollectPot(). Please
 look at that, Matt.

---
 pyfpdb/Hand.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 35476bdf..b902dd67 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -308,6 +308,13 @@ Add a raise on [street] by [player] to [amountTo]
         self.checkPlayerExists(player)
         self.actions[street].append((player, 'checks'))
 
+# dart1 wins $ 51.09 USD from main pot with a full house, queens full of threes [ Qh, Qc, Qd, 3c, 3s ]
+# dart1 wins $ 41.07 USD from side pot with a full house, queens full of threes [ Qh, Qc, Qd, 3c, 3s ]
+# DEBUG: dart1 collected 51.09
+# DEBUG: dart1 collected 41.07
+# [WARNING] %s collected pot more than once; avoidable by reading winnings only from summary lines?
+# TODO: Should we just add the pots together?? 
+
     def addCollectPot(self,player, pot):
         print "DEBUG: %s collected %s" % (player, pot)
         self.checkPlayerExists(player)

From 483e17734643e4f97bf8e6e9f387037c25b12d1c Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Fri, 20 Feb 2009 16:29:52 +0000
Subject: [PATCH 19/66] Explicit matching of player names About the only place
 where we are guaranteed to get all the players' names correctly is in the
 seating plan in the hand header. We extract the names and build a regex that
 matches only the names. We only do this if the current regex is out of date,
 to avoid recompiling them too often. I also did away with self.rexx because
 it seemed unnecessary and was difficult to work with.

---
 pyfpdb/EverleafToFpdb.py       | 68 ++++++++++++++++++----------------
 pyfpdb/GuiAutoImport.py        |  2 +-
 pyfpdb/HandHistoryConverter.py | 39 +++++++++----------
 pyfpdb/fpdb_import.py          |  4 ++
 4 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 7a5344c2..9fbf91d0 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -70,20 +70,24 @@ class Everleaf(HandHistoryConverter):
         HandHistoryConverter.__init__(self, config, file, sitename="Everleaf") # Call super class init.
         self.sitename = "Everleaf"
         self.setFileType("text", "cp1252")
-        self.rexx.setGameInfoRegex('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
-        self.rexx.setSplitHandRegex('\n\n+')
-        self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')
-        self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
-        self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*): posts small blind \[\$? (?P<SB>[.0-9]+)')
-        self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
-        self.rexx.setPostBothRegex('.*\n(?P<PNAME>.*): posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<CARDS>.*) \]')
-        self.rexx.setActionStepRegex('.*\n(?P<PNAME>[^: ]*)(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
-        self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[ (?P<CARDS>.*) \]')
-        self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?')
-        #self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) USD(.*\[ (?P<CARDS>) \S\S, \S\S, \S\S, \S\S, \S\S \])?')
-        self.rexx.sits_out_re = re.compile('(?P<PNAME>.*) sits out')
-        self.rexx.compileRegexes()
+        
+        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)")
+        self.re_SplitHands  = re.compile(r"\n\n+")
+        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
+        self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
+        self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
+
+    def compile_player_regexs(self):
+        player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
+        print "DEBUG player_re: " + player_re
+        self.re_PostSB          = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_PostBB          = re.compile(r"^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_PostBoth        = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_HeroCards       = re.compile(r"^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
+        self.re_Action          = re.compile(r"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?" % player_re, re.MULTILINE)
+        self.re_ShowdownAction  = re.compile(r"^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
+        self.re_CollectPot      = re.compile(r"^%s wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
+        self.re_SitsOut         = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"]]
@@ -91,15 +95,13 @@ class Everleaf(HandHistoryConverter):
     def determineGameType(self):
         # Cheating with this regex, only support nlhe at the moment
         gametype = ["ring", "hold", "nl"]
-
-        m = self.rexx.game_info_re.search(self.obs)
+        m = self.re_GameInfo.search(self.obs)
         gametype = gametype + [m.group('SB')]
         gametype = gametype + [m.group('BB')]
-        
         return gametype
 
     def readHandInfo(self, hand):
-        m =  self.rexx.hand_info_re.search(hand.string)
+        m =  self.re_HandInfo.search(hand.string)
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
 # These work, but the info is already in the Hand class - should be used for tourneys though.
@@ -118,11 +120,12 @@ class Everleaf(HandHistoryConverter):
         hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
-        m = self.rexx.player_info_re.finditer(hand.string)
-        players = []
+        m = self.re_PlayerInfo.finditer(hand.string)
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
+
+        
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **
         # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
@@ -137,25 +140,26 @@ class Everleaf(HandHistoryConverter):
             
 
     def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
-        self.rexx.board_re = re.compile(r"\[ (?P<CARDS>.+) \]")
-        print hand.streets.group(street)
+        print "DEBUG " + street + ":"
+        print hand.streets.group(street) + "\n"
         if street in ('FLOP','TURN','RIVER'):   # a list of streets which get dealt community cards (i.e. all but PREFLOP)
-            m = self.rexx.board_re.search(hand.streets.group(street))
+            m = self.re_Board.search(hand.streets.group(street))
             hand.setCommunityCards(street, m.group('CARDS').split(', '))
 
     def readBlinds(self, hand):
         try:
-            m = self.rexx.small_blind_re.search(hand.string)
+            m = self.re_PostSB.search(hand.string)
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
-        except: # no small blind
+        except Exception, e: # no small blind
+            print e
             hand.addBlind(None, None, None)
-        for a in self.rexx.big_blind_re.finditer(hand.string):
+        for a in self.re_PostBB.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
-        for a in self.rexx.both_blinds_re.finditer(hand.string):
+        for a in self.re_PostBoth.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
     def readHeroCards(self, hand):
-        m = self.rexx.hero_cards_re.search(hand.string)
+        m = self.re_HeroCards.search(hand.string)
         if(m == None):
             #Not involved in hand
             hand.involved = False
@@ -168,7 +172,7 @@ class Everleaf(HandHistoryConverter):
             hand.addHoleCards(cards, m.group('PNAME'))
 
     def readAction(self, hand, street):
-        m = self.rexx.action_re.finditer(hand.streets.group(street))
+        m = self.re_Action.finditer(hand.streets.group(street))
         for action in m:
             if action.group('ATYPE') == ' raises':
                 hand.addCallandRaise( street, action.group('PNAME'), action.group('BET') )
@@ -185,17 +189,17 @@ class Everleaf(HandHistoryConverter):
 
 
     def readShowdownActions(self, hand):
-        for shows in self.rexx.showdown_action_re.finditer(hand.string):            
+        for shows in self.re_ShowdownAction.finditer(hand.string):            
             cards = shows.group('CARDS')
             cards = set(cards.split(', '))
             hand.addShownCards(cards, shows.group('PNAME'))
 
     def readCollectPot(self,hand):
-        for m in self.rexx.collect_pot_re.finditer(hand.string):
+        for m in self.re_CollectPot.finditer(hand.string):
             hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
 
     def readShownCards(self,hand):
-        for m in self.rexx.collect_pot_re.finditer(hand.string):
+        for m in self.re_CollectPot.finditer(hand.string):
             if m.group('CARDS') is not None:
                 cards = m.group('CARDS')
                 cards = set(cards.split(', '))
diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 38535ad1..8f047d85 100644
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -145,7 +145,7 @@ class GuiAutoImport (threading.Thread):
 
     #            Add directories to importer object.
                 for site in self.input_settings:
-                    self.importer.addImportDirectory(self.input_settings[site][0], True, site, self.input_settings[site][1])
+                    self.importer.addImportDirectory(self.input_settings[site][0], monitor=True, site, self.input_settings[site][1])
                     print "Adding import directories - Site: " + site + " dir: "+ str(self.input_settings[site][0])
                 self.do_import()
 
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index a3179918..385fa70b 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -89,7 +89,9 @@ class HandHistoryConverter:
         self.hhdir     = os.path.join(self.hhbase,sitename)
         self.gametype  = []
         self.ofile     = os.path.join(self.hhdir, os.path.basename(file))
+        print self.ofile
         self.rexx      = FpdbRegex.FpdbRegex()
+        self.players   = set()
 
     def __str__(self):
         tmp = "HandHistoryConverter: '%s'\n" % (self.sitename)
@@ -116,10 +118,21 @@ class HandHistoryConverter:
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
         for hand in self.hands:
-            print "\nInput:\n"+hand.string
+            print "\nInput:\n"+hand.string+"\n"
             self.readHandInfo(hand)
+            
             self.readPlayerStacks(hand)
             print "DEBUG stacks:", hand.stacks
+            # at this point we know the player names, they are in hand.players
+            playersThisHand = set([player[1] for player in hand.players])
+            if playersThisHand <= self.players: # x <= y means 'x is subset of y'
+                # we're ok; the regex should already cover them all.
+                pass
+            else:
+                # we need to recompile the player regexs.
+                self.players = playersThisHand
+                self.compile_player_regexs()
+        
             self.markStreets(hand)
             self.readBlinds(hand)
             self.readHeroCards(hand) # want to generalise to draw games
@@ -178,7 +191,11 @@ class HandHistoryConverter:
     # Needs to return a list of lists in the format
     # [['seat#', 'player1name', 'stacksize'] ['seat#', 'player2name', 'stacksize'] [...]]
     def readPlayerStacks(self, hand): abstract
-
+    
+    # Given 
+    #
+    def compile_player_regexs(self): abstract
+    
     # Needs to return a MatchObject with group names identifying the streets into the Hand object
     # so groups are called by street names 'PREFLOP', 'FLOP', 'STREET2' etc
     # blinds are done seperately
@@ -228,7 +245,7 @@ class HandHistoryConverter:
     def splitFileIntoHands(self):
         hands = []
         self.obs.strip()
-        list = self.rexx.split_hand_re.split(self.obs)
+        list = self.re_SplitHands.split(self.obs)
         list.pop() #Last entry is empty
         for l in list:
 #			print "'" + l + "'"
@@ -250,22 +267,6 @@ class HandHistoryConverter:
                 traceback.print_exc(file=sys.stderr)
 
 
-#takes a poker float (including , for thousand seperator and converts it to an int
-    def float2int (self, string):
-        pos=string.find(",")
-        if (pos!=-1): #remove , the thousand seperator
-            string=string[0:pos]+string[pos+1:]
-
-        pos=string.find(".")
-        if (pos!=-1): #remove decimal point
-            string=string[0:pos]+string[pos+1:]
-
-        result = int(string)
-        if pos==-1: #no decimal point - was in full dollars - need to multiply with 100
-            result*=100
-        return result
-#end def float2int
-
     def getStatus(self):
         #TODO: Return a status of true if file processed ok
         return True
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index e5dafe4c..5a581689 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -218,6 +218,10 @@ class Importer:
             conv.processFile()
             if(conv.getStatus()):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
+            else:
+                # conversion didn't work
+                # TODO: appropriate response?
+                return (0, 0, 0, 1, 0)
 
         #This will barf if conv.getStatus != True
         return (stored, duplicates, partial, errors, ttime)

From 2b13d38da69cc15a4c7cced0048e91cd18db03a9 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Fri, 20 Feb 2009 18:02:23 +0000
Subject: [PATCH 20/66] fixed keyword arg before non keyword arg bug from last
 commit

---
 pyfpdb/GuiAutoImport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 8f047d85..38535ad1 100644
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -145,7 +145,7 @@ class GuiAutoImport (threading.Thread):
 
     #            Add directories to importer object.
                 for site in self.input_settings:
-                    self.importer.addImportDirectory(self.input_settings[site][0], monitor=True, site, self.input_settings[site][1])
+                    self.importer.addImportDirectory(self.input_settings[site][0], True, site, self.input_settings[site][1])
                     print "Adding import directories - Site: " + site + " dir: "+ str(self.input_settings[site][0])
                 self.do_import()
 

From 506f0fd7516aa78329c90ca8da965ca6e21067ce Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Fri, 20 Feb 2009 16:54:42 -0500
Subject: [PATCH 21/66] add folder with date-name to outputfilename for
 everleaf converter (uses whatever the prior folder name in the path was,
 regardless of if it's a date or not, but normally it would be a date)

---
 pyfpdb/EverleafToFpdb.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 9fbf91d0..21f24e70 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -76,6 +76,8 @@ class Everleaf(HandHistoryConverter):
         self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
         self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
+        
+        self.ofile     = os.path.join(self.hhdir, file.split("\\")[-2]+"-"+os.path.basename(file))
 
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"

From 6fc903b50487b77ea350c28101598f9ab20778c9 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Fri, 20 Feb 2009 17:22:36 -0500
Subject: [PATCH 22/66] contingency plan in case you refer to the filename
 iwthout it's full pathname, ie manual conversion

---
 pyfpdb/EverleafToFpdb.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 21f24e70..28c75aaf 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -20,6 +20,7 @@
 import sys
 import Configuration
 from HandHistoryConverter import *
+from time import strftime
 
 # Everleaf HH format
 
@@ -77,7 +78,10 @@ class Everleaf(HandHistoryConverter):
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
         self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
         
-        self.ofile     = os.path.join(self.hhdir, file.split("\\")[-2]+"-"+os.path.basename(file))
+        try:
+            self.ofile     = os.path.join(self.hhdir, file.split("\\")[-2]+"-"+os.path.basename(file))
+        except:
+            self.ofile     = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
 
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"

From 22c9fd6acbf488e446c19b2459bed566311465fc Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 20:05:17 +0900
Subject: [PATCH 23/66] Adds command line operation to file.

Only supports a single file at the moment
---
 pyfpdb/GuiBulkImport.py | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 6f06f232..1ac5f701 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -18,7 +18,9 @@
 
 #    Standard Library modules
 import os
+import sys
 from time import time
+from optparse import OptionParser
 
 #    pyGTK modules
 import pygtk
@@ -192,6 +194,12 @@ if __name__ == '__main__':
     def destroy(*args):  # call back for terminating the main eventloop
         gtk.main_quit()
 
+    parser = OptionParser()
+    parser.add_option("-f", "--file", dest="filename", help="Input file in quiet mode", metavar="FILE")
+    parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True, help="don't start gui")
+
+    (options, sys.argv) = parser.parse_args()
+
     config = Configuration.Config()
     db = fpdb_db.fpdb_db()
 
@@ -204,9 +212,18 @@ if __name__ == '__main__':
     settings.update(config.get_import_parameters())
     settings.update(config.get_default_paths())
 
-    i = GuiBulkImport(db, settings, config)
-    main_window = gtk.Window()
-    main_window.connect('destroy', destroy)
-    main_window.add(i.vbox)
-    main_window.show()
-    gtk.main()
+    if(options.gui == True):
+        i = GuiBulkImport(db, settings, config)
+        main_window = gtk.Window()
+        main_window.connect('destroy', destroy)
+        main_window.add(i.vbox)
+        main_window.show()
+        gtk.main()
+    else:
+        #Do something useful
+        importer = fpdb_import.Importer(False,settings, config) 
+        importer.setDropIndexes("auto")
+        importer.addImportFile(options.filename)
+        importer.setCallHud(False)
+        importer.runImport()
+        importer.clearFileList()

From 36568075fe24f03df08a10d4fb7edb70d8355a10 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 20:24:11 +0900
Subject: [PATCH 24/66] Add output line for main import code

Main import should probably read summary, meh
---
 pyfpdb/Hand.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index b902dd67..1bc222e3 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -424,6 +424,15 @@ Map the tuple self.gametype onto the pokerstars string describing it
             print >>fh, _("*** SHOW DOWN ***")
             print >>fh, "DEBUG: what do they show"
 
+        # Current PS format has the lines:
+        # s0rrow collected $5.15 from side pot
+        # stervels: shows [Ks Qs] (two pair, Kings and Queens)
+        # stervels collected $45.35 from main pot
+        # Immediately before the summary.
+        # The current importer uses those lines for importing winning rather than the summary
+        for name in self.collected:
+            print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
+
         print >>fh, _("*** SUMMARY ***")
         print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
         #print >>fh, _("Total pot $%s | Rake $%.2f" % (self.totalpot, self.rake)) # TODO: side pots

From 4baa9835f9c96e7a7180a4a2affe1c6e9bcd2423 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Sat, 21 Feb 2009 06:25:12 -0500
Subject: [PATCH 25/66] fix my last patch to use os.path.sep instead of
 hardcoded "\\"

---
 pyfpdb/EverleafToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 28c75aaf..9d438abe 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -79,7 +79,7 @@ class Everleaf(HandHistoryConverter):
         self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
         
         try:
-            self.ofile     = os.path.join(self.hhdir, file.split("\\")[-2]+"-"+os.path.basename(file))
+            self.ofile     = os.path.join(self.hhdir, file.split(os.path.sep)[-2]+"-"+os.path.basename(file))
         except:
             self.ofile     = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
 

From e8d90bd705c00aa60a70b06817b4f649a58844ef Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 20:42:16 +0900
Subject: [PATCH 26/66] Fix for table names with '-' in them

---
 pyfpdb/EverleafToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 28c75aaf..6ae9dab1 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -74,7 +74,7 @@ class Everleaf(HandHistoryConverter):
         
         self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)")
         self.re_SplitHands  = re.compile(r"\n\n+")
-        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
+        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
         self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
         

From 420c4fec69c3b11ad0c5a04fa5d7ed6567d01ca5 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 21:37:47 +0900
Subject: [PATCH 27/66] Add 'Uncalled bet' line to output of new converter

---
 pyfpdb/Hand.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 1bc222e3..3636ac89 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -425,11 +425,14 @@ Map the tuple self.gametype onto the pokerstars string describing it
             print >>fh, "DEBUG: what do they show"
 
         # Current PS format has the lines:
+        # Uncalled bet ($111.25) returned to s0rrow
         # s0rrow collected $5.15 from side pot
         # stervels: shows [Ks Qs] (two pair, Kings and Queens)
         # stervels collected $45.35 from main pot
         # Immediately before the summary.
         # The current importer uses those lines for importing winning rather than the summary
+        for name in self.pot.returned:
+            print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
         for name in self.collected:
             print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
 
@@ -537,6 +540,7 @@ class Pot(object):
         self.contenders = set()
         self.committed = {}
         self.total = None
+        self.returned = {}
     
     def addPlayer(self,player):
         self.committed[player] = Decimal(0)
@@ -558,9 +562,10 @@ class Pot(object):
         lastbet = committed[-1][0] - committed[-2][0]
         if lastbet > 0: # uncalled
             returnto = committed[-1][1]
-            #print "returning %f to %s" % (lastbet, returnto)
+            #print "DEBUG: returning %f to %s" % (lastbet, returnto)
             self.total -= lastbet
             self.committed[returnto] -= lastbet
+            self.returned[returnto] = lastbet
 
 
         # Work out side pots

From 5c6793d37354b8e9fcc499e561aaf339ef51f01d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 22:06:10 +0900
Subject: [PATCH 28/66] Add sanity check to HHC

Make sure input file and output file are different so we dont overwrite
the source.
---
 pyfpdb/HandHistoryConverter.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index c6e8d130..45912ee7 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -89,7 +89,6 @@ class HandHistoryConverter:
         self.hhdir     = os.path.join(self.hhbase,sitename)
         self.gametype  = []
         self.ofile     = os.path.join(self.hhdir, os.path.basename(file))
-        print self.ofile
         self.rexx      = FpdbRegex.FpdbRegex()
         self.players   = set()
 
@@ -238,6 +237,10 @@ class HandHistoryConverter:
             else:
                 print "HH Sanity Check: Directory hhdir '" + self.hhdir + "' or its parent directory are not writable"
 
+        # Make sure input and output files are different or we'll overwrite the source file
+        if(self.ofile == self.file):
+            print "HH Sanity Check: output and input files are the same, check config"
+
         return sane
 
     # Functions not necessary to implement in sub class

From d196b80a6057289698235a10d95c8fa018833077 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 22:31:57 +0900
Subject: [PATCH 29/66] Deal with case 'no small blind and walk in bb'

---
 pyfpdb/EverleafToFpdb.py | 2 ++
 pyfpdb/GuiBulkImport.py  | 1 +
 pyfpdb/Hand.py           | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 6ae9dab1..c8f86b4f 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -108,6 +108,8 @@ class Everleaf(HandHistoryConverter):
 
     def readHandInfo(self, hand):
         m =  self.re_HandInfo.search(hand.string)
+        if(m == None):
+            print "DEBUG: re_HandInfo.search failed: '%s'" %(hand.string)
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
 # These work, but the info is already in the Hand class - should be used for tourneys though.
diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 1ac5f701..b5e87755 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -223,6 +223,7 @@ if __name__ == '__main__':
         #Do something useful
         importer = fpdb_import.Importer(False,settings, config) 
         importer.setDropIndexes("auto")
+        importer.setFailOnError(True)
         importer.addImportFile(options.filename)
         importer.setCallHud(False)
         importer.runImport()
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 3636ac89..cebfeea7 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -599,8 +599,11 @@ class Pot(object):
             return "Total pot $%.2f Main pot $%.2f. Side pot $%2.f." % (self.total, self.pots[0], self.pots[1])
         elif len(self.pots) == 3:
             return "Total pot $%.2f Main pot $%.2f. Side pot-1 $%2.2f. Side pot-2 $%.2f." % (self.total, self.pots[0], self.pots[1], self.pots[2])
+        elif len(self.pots) == 0:
+            # no small blind and walk in bb (hopefully)
+            return "Total pot $%.2f" % (self.total,)
         else:
-            return "maybe no pot.. or too many pots.. no small blind and walk in bb?."
+            return _("too many pots.. no small blind and walk in bb?. self.pots: %s" %(self.pots))
             # I don't know stars format for a walk in the bb when sb doesn't post.
             # The thing to do here is raise a Hand error like fpdb import does and file it into errors.txt
             

From 76688ed1c21dea9c69a73d0ed038a8cd3720d9dd Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 23:26:37 +0900
Subject: [PATCH 30/66] Fix regex for posting both blinds

Partially fix output:

neslein: posts small blind [$ 0.05 USD]
dokiprogym: posts big blind [$ 0.10 USD]
EricBlade: posts both blinds [$ 0.15 USD]
Tilting2: posts big blind [$ 0.10 USD]

becomes:

neslein: posts small blind $0.05
dokiprogym: posts big blind $0.10
Tilting2: posts big blind $0.10
EricBlade: posts big blind $0.10

EricBlade should post .15
---
 pyfpdb/EverleafToFpdb.py | 4 ++--
 pyfpdb/Hand.py           | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index c8f86b4f..affdc596 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -88,7 +88,7 @@ class Everleaf(HandHistoryConverter):
         print "DEBUG player_re: " + player_re
         self.re_PostSB          = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_PostBB          = re.compile(r"^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
-        self.re_PostBoth        = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_PostBoth        = re.compile(r"^%s: posts both blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_HeroCards       = re.compile(r"^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
         self.re_Action          = re.compile(r"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?" % player_re, re.MULTILINE)
         self.re_ShowdownAction  = re.compile(r"^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
@@ -164,7 +164,7 @@ class Everleaf(HandHistoryConverter):
         for a in self.re_PostBB.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
         for a in self.re_PostBoth.finditer(hand.string):
-            hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
+            hand.addBlind(a.group('PNAME'), 'both', a.group('SBBB'))
 
     def readHeroCards(self, hand):
         m = self.re_HeroCards.search(hand.string)
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index cebfeea7..48516fd4 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -191,7 +191,7 @@ Card ranks will be uppercased
         #   - this is a bet of 1 bb and is the new uncalled
         # 
         # If a player posts a big & small blind
-        #
+        #   - FIXME: We dont record this for later printing yet
         
         print "DEBUG addBlind: %s posts %s, %s" % (player, blindtype, amount)
         if player is not None:
@@ -203,10 +203,11 @@ Card ranks will be uppercased
             self.pot.addMoney(player, Decimal(amount))
             if blindtype == 'big blind':
                 self.lastBet['PREFLOP'] = Decimal(amount)            
-            elif blindtype == 'small & big blinds':
+            elif blindtype == 'both':
                 # extra small blind is 'dead'
                 self.lastBet['PREFLOP'] = Decimal(self.bb)
         self.posted += [player]
+        print "DEBUG: self.posted: %s" %(self.posted)
 
 
     def addCall(self, street, player=None, amount=None):
@@ -389,7 +390,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
         #May be more than 1 bb posting
         for a in self.posted[1:]:
-            print >>fh, _("%s: posts big blind $%s" %(self.posted[1], self.bb))
+            print >>fh, _("%s: posts big blind $%s" %(a, self.bb))
 
         # TODO: What about big & small blinds?
 

From cf52ee4822fe500ad07f2fbd4d7ad695f143e31e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 00:22:25 +0900
Subject: [PATCH 31/66] Fix blinds output

Changes self.posted to be a list of lists.
[[p1, "small blind"][p2, "big blind"][p3, "big blind"][p4, "both"]]
---
 pyfpdb/Hand.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 48516fd4..d786a1c7 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -206,7 +206,7 @@ Card ranks will be uppercased
             elif blindtype == 'both':
                 # extra small blind is 'dead'
                 self.lastBet['PREFLOP'] = Decimal(self.bb)
-        self.posted += [player]
+        self.posted = self.posted + [[player,blindtype]]
         print "DEBUG: self.posted: %s" %(self.posted)
 
 
@@ -382,17 +382,15 @@ Map the tuple self.gametype onto the pokerstars string describing it
             #Only print stacks of players who do something preflop
             print >>fh, _("Seat %s: %s ($%s)" %(player[0], player[1], player[2]))
 
-        if(self.posted[0] is None):
-            #print >>fh, _("No small blind posted") # PS doesn't say this
-            pass
-        else:
-            print >>fh, _("%s: posts small blind $%s" %(self.posted[0], self.sb))
 
         #May be more than 1 bb posting
-        for a in self.posted[1:]:
-            print >>fh, _("%s: posts big blind $%s" %(a, self.bb))
-
-        # TODO: What about big & small blinds?
+        for a in self.posted:
+            if(a[1] == "small blind"):
+                print >>fh, _("%s: posts small blind $%s" %(a[0], self.sb))
+            if(a[1] == "big blind"):
+                print >>fh, _("%s: posts big blind $%s" %(a[0], self.bb))
+            if(a[1] == "both"):
+                print >>fh, _("%s: posts small & big blinds $%.2f" %(a[0], (Decimal(self.sb) + Decimal(self.bb))))
 
         print >>fh, _("*** HOLE CARDS ***")
         if self.involved:

From 40ccefe1055add00bafc4ac456f3d7469512a241 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 01:17:06 +0900
Subject: [PATCH 32/66] Separate collected and collectees for output

---
 pyfpdb/Hand.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index d786a1c7..36b946f8 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -83,7 +83,8 @@ class Hand:
         self.stacks = {}
 
         # dict from player names to amounts collected
-        self.collected = {}
+        self.collected = []
+        self.collectees = {}
 
         # Sets of players
         self.shown = set()
@@ -319,10 +320,11 @@ Add a raise on [street] by [player] to [amountTo]
     def addCollectPot(self,player, pot):
         print "DEBUG: %s collected %s" % (player, pot)
         self.checkPlayerExists(player)
-        if player not in self.collected:
-            self.collected[player] = pot
+        self.collected = self.collected + [[player, pot]]
+        if player not in self.collectees:
+            self.collectees[player] = Decimal(pot)
         else:
-            print "[WARNING] %s collected pot more than once; avoidable by reading winnings only from summary lines?"
+            self.collectees[player] += Decimal(pot)
 
 
     def totalPot(self):
@@ -336,8 +338,9 @@ Add a raise on [street] by [player] to [amountTo]
         # This gives us the amount collected, i.e. after rake
         if self.totalcollected is None:
             self.totalcollected = 0;
-            for amount in self.collected.values():
-                self.totalcollected += Decimal(amount)
+            #self.collected looks like [[p1,amount][px,amount]]
+            for entry in self.collected:
+                self.totalcollected += Decimal(entry[1])
 
 
 
@@ -432,8 +435,8 @@ Map the tuple self.gametype onto the pokerstars string describing it
         # The current importer uses those lines for importing winning rather than the summary
         for name in self.pot.returned:
             print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
-        for name in self.collected:
-            print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
+        for entry in self.collected:
+            print >>fh, _("%s collected $%s from x pot" %(entry[0], entry[1]))
 
         print >>fh, _("*** SUMMARY ***")
         print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
@@ -448,10 +451,10 @@ Map the tuple self.gametype onto the pokerstars string describing it
         for player in [x for x in self.players if x[1] in players_who_act_preflop]:
             seatnum = player[0]
             name = player[1]
-            if name in self.collected and name in self.shown:
-                print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collected[name]))
-            elif name in self.collected:
-                print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collected[name]))
+            if name in self.collectees and name in self.shown:
+                print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collectees[name]))
+            elif name in self.collectees:
+                print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
             elif name in self.shown:
                 print >>fh, _("Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name])))
             elif name in self.folded:

From 3febe073cc8e177f5fa9566e3cf5c237ae44681b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 12:42:16 +0900
Subject: [PATCH 33/66] Make FullTilt wrk with new importer

---
 pyfpdb/FulltiltToFpdb.py | 66 +++++++++++++++++++++-------------------
 pyfpdb/fpdb_import.py    |  3 +-
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 8a4436fd..c884fc0e 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -72,22 +72,27 @@ class FullTilt(HandHistoryConverter):
         HandHistoryConverter.__init__(self, config, file, sitename="FullTilt") # Call super class init.
         self.sitename = "FullTilt"
         self.setFileType("text", "cp1252")
-        self.rexx.setGameInfoRegex('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) -')
-        self.rexx.setSplitHandRegex('\n\n+')
-        self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
-#        self.rexx.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]+)')
-        self.rexx.button_re = re.compile('The button is in seat #(?P<BUTTON>\d+)')
-        self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
-        self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*) posts the small blind of \$?(?P<SB>[.0-9]+)')
-        self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
-        self.rexx.setPostBothRegex('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]')
-        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
-        self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[(?P<CARDS>.*)\]')
-        self.rexx.setCollectPotRegex(r"Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)")
-        self.rexx.shown_cards_re = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(.*\) showed \[(?P<CARDS>.*)\].*')
-        self.rexx.sits_out_re = re.compile('(?P<PNAME>.*) sits out')
-        self.rexx.compileRegexes()
+
+        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) -')
+        self.re_SplitHands  = re.compile(r"\n\n+")
+        self.re_HandInfo    = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
+        self.re_Button      = re.compile('The button is in seat #(?P<BUTTON>\d+)')
+        self.re_PlayerInfo  = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
+        self.re_Board = re.compile(r"\[(?P<CARDS>.+)\]")
+
+    def compile_player_regexs(self):
+        player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
+        print "DEBUG player_re: " + player_re
+        self.re_PostSB           = re.compile('.*\n(?P<PNAME>.*) posts the small blind of \$?(?P<SB>[.0-9]+)')
+        self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
+        self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
+        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]')
+        self.re_Action           = re.compile('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
+        self.re_ShowdownAction   = re.compile('.*\n(?P<PNAME>.*) shows \[(?P<CARDS>.*)\]')
+        self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)")
+        self.re_SitsOut          = re.compile('(?P<PNAME>.*) sits out')
+        self.re_ShownCards       = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(.*\) showed \[(?P<CARDS>.*)\].*')
+
 
     def readSupportedGames(self):
         pass
@@ -96,18 +101,18 @@ class FullTilt(HandHistoryConverter):
         # Cheating with this regex, only support nlhe at the moment
         gametype = ["ring", "hold", "nl"]
 
-        m = self.rexx.game_info_re.search(self.obs)
+        m = self.re_GameInfo.search(self.obs)
         gametype = gametype + [m.group('SB')]
         gametype = gametype + [m.group('BB')]
         
         return gametype
 
     def readHandInfo(self, hand):
-        m =  self.rexx.hand_info_re.search(hand.string,re.DOTALL)
+        m =  self.re_HandInfo.search(hand.string,re.DOTALL)
         #print m.groups()
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
-        hand.buttonpos = int(self.rexx.button_re.search(hand.string).group('BUTTON'))
+        hand.buttonpos = int(self.re_Button.search(hand.string).group('BUTTON'))
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #		m.group('SB')
@@ -125,7 +130,7 @@ class FullTilt(HandHistoryConverter):
 #FIXME:        hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
-        m = self.rexx.player_info_re.finditer(hand.string)
+        m = self.re_PlayerInfo.finditer(hand.string)
         players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
@@ -143,25 +148,24 @@ class FullTilt(HandHistoryConverter):
 
     def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
         if street in ('FLOP','TURN','RIVER'):   # a list of streets which get dealt community cards (i.e. all but PREFLOP)
-            self.rexx.board_re = re.compile(r"\[(?P<CARDS>.+)\]")
             #print "DEBUG readCommunityCards:", street, hand.streets.group(street)
-            m = self.rexx.board_re.search(hand.streets.group(street))
+            m = self.re_Board.search(hand.streets.group(street))
             hand.setCommunityCards(street, m.group('CARDS').split(' '))
 
 
     def readBlinds(self, hand):
         try:
-            m = self.rexx.small_blind_re.search(hand.string)
+            m = self.re_PostSB.search(hand.string)
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         except: # no small blind
             hand.addBlind(None, None, None)
-        for a in self.rexx.big_blind_re.finditer(hand.string):
+        for a in self.re_PostBB.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
-        for a in self.rexx.both_blinds_re.finditer(hand.string):
+        for a in self.re_PostBoth.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
     def readHeroCards(self, hand):
-        m = self.rexx.hero_cards_re.search(hand.string)
+        m = self.re_HeroCards.search(hand.string)
         if(m == None):
             #Not involved in hand
             hand.involved = False
@@ -174,7 +178,7 @@ class FullTilt(HandHistoryConverter):
             hand.addHoleCards(cards, m.group('PNAME'))
 
     def readAction(self, hand, street):
-        m = self.rexx.action_re.finditer(hand.streets.group(street))
+        m = self.re_Action.finditer(hand.streets.group(street))
         for action in m:
             if action.group('ATYPE') == ' raises to':
                 hand.addRaiseTo( street, action.group('PNAME'), action.group('BET') )
@@ -191,17 +195,17 @@ class FullTilt(HandHistoryConverter):
 
 
     def readShowdownActions(self, hand):
-        for shows in self.rexx.showdown_action_re.finditer(hand.string):            
+        for shows in self.re_ShowdownAction.finditer(hand.string):
             cards = shows.group('CARDS')
             cards = set(cards.split(' '))
             hand.addShownCards(cards, shows.group('PNAME'))
 
     def readCollectPot(self,hand):
-        for m in self.rexx.collect_pot_re.finditer(hand.string):
+        for m in self.re_CollectPot.finditer(hand.string):
             hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
 
     def readShownCards(self,hand):
-        for m in self.rexx.shown_cards_re.finditer(hand.string):
+        for m in self.re_ShownCards.finditer(hand.string):
             if m.group('CARDS') is not None:
                 cards = m.group('CARDS')
                 cards = set(cards.split(' '))
@@ -211,7 +215,7 @@ class FullTilt(HandHistoryConverter):
 if __name__ == "__main__":
     c = Configuration.Config()
     if len(sys.argv) ==  1:
-        testfile = "regression-test-files/FT20081209 CR - tay - $0.05-$0.10 - No Limit Hold'em.txt"
+        testfile = "regression-test-files/fulltilt/FT20081209 CR - tay - $0.05-$0.10 - No Limit Hold'em.txt"
     else:
         testfile = sys.argv[1]
         print "Converting: ", testfile
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 5a581689..aeb1e027 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -34,6 +34,7 @@ import fpdb_db
 import fpdb_parse_logic
 import Configuration
 import EverleafToFpdb
+import FulltiltToFpdb
 
 #    database interface modules
 try:
@@ -207,7 +208,7 @@ class Importer:
                 conv = EverleafToFpdb.Everleaf(self.config, file)
             elif filter == "FulltiltToFpdb":
                 print "converting ", file
-                conv = FulltiltToFpdb.Fulltilt(self.config, file)
+                conv = FulltiltToFpdb.FullTilt(self.config, file)
             else:
                 print "Unknown filter ", filter
                 return

From baae7af5e094f70bdd2fa8f4f89e4f2659408b80 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 14:37:38 +0900
Subject: [PATCH 34/66] Remove a tonne of debug, neaten output

---
 pyfpdb/EverleafToFpdb.py       |  8 ++++----
 pyfpdb/FulltiltToFpdb.py       |  2 +-
 pyfpdb/Hand.py                 | 26 ++++++++++----------------
 pyfpdb/HandHistoryConverter.py | 16 ++++++++--------
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index affdc596..ffb16daf 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -85,7 +85,7 @@ class Everleaf(HandHistoryConverter):
 
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
-        print "DEBUG player_re: " + player_re
+        #print "DEBUG player_re: " + player_re
         self.re_PostSB          = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_PostBB          = re.compile(r"^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_PostBoth        = re.compile(r"^%s: posts both blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
@@ -148,8 +148,8 @@ class Everleaf(HandHistoryConverter):
             
 
     def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
-        print "DEBUG " + street + ":"
-        print hand.streets.group(street) + "\n"
+        #print "DEBUG " + street + ":"
+        #print hand.streets.group(street) + "\n"
         if street in ('FLOP','TURN','RIVER'):   # a list of streets which get dealt community cards (i.e. all but PREFLOP)
             m = self.re_Board.search(hand.streets.group(street))
             hand.setCommunityCards(street, m.group('CARDS').split(', '))
@@ -159,7 +159,7 @@ class Everleaf(HandHistoryConverter):
             m = self.re_PostSB.search(hand.string)
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         except Exception, e: # no small blind
-            print e
+            #print e
             hand.addBlind(None, None, None)
         for a in self.re_PostBB.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index c884fc0e..4d408e95 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -82,7 +82,7 @@ class FullTilt(HandHistoryConverter):
 
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
-        print "DEBUG player_re: " + player_re
+        #print "DEBUG player_re: " + player_re
         self.re_PostSB           = re.compile('.*\n(?P<PNAME>.*) posts the small blind of \$?(?P<SB>[.0-9]+)')
         self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
         self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 36b946f8..57012235 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -135,7 +135,7 @@ Assigns observed holecards to a player.
 cards   set of card bigrams e.g. set(['2h','Jc'])     
 player  (string) name of player
 """
-        print "DEBUG: addHoleCards", cards,player
+        #print "DEBUG: addHoleCards", cards,player
         try:
             self.checkPlayerExists(player)
             cards = set([self.card(c) for c in cards])
@@ -148,7 +148,7 @@ player  (string) name of player
 For when a player shows cards for any reason (for showdown or out of choice).
 Card ranks will be uppercased
 """
-        print "DEBUG: addShownCards", cards,player,holeandboard
+        #print "DEBUG: addShownCards", cards,player,holeandboard
         if cards is not None:
             self.shown.add(player)
             self.addHoleCards(cards,player)
@@ -194,7 +194,7 @@ Card ranks will be uppercased
         # If a player posts a big & small blind
         #   - FIXME: We dont record this for later printing yet
         
-        print "DEBUG addBlind: %s posts %s, %s" % (player, blindtype, amount)
+        #print "DEBUG addBlind: %s posts %s, %s" % (player, blindtype, amount)
         if player is not None:
             self.bets['PREFLOP'][player].append(Decimal(amount))
             self.stacks[player] -= Decimal(amount)
@@ -208,7 +208,7 @@ Card ranks will be uppercased
                 # extra small blind is 'dead'
                 self.lastBet['PREFLOP'] = Decimal(self.bb)
         self.posted = self.posted + [[player,blindtype]]
-        print "DEBUG: self.posted: %s" %(self.posted)
+        #print "DEBUG: self.posted: %s" %(self.posted)
 
 
     def addCall(self, street, player=None, amount=None):
@@ -218,7 +218,7 @@ Card ranks will be uppercased
             self.bets[street][player].append(Decimal(amount))
             #self.lastBet[street] = Decimal(amount)
             self.stacks[player] -= Decimal(amount)
-            print "DEBUG %s calls %s, stack %s" % (player, amount, self.stacks[player])
+            #print "DEBUG %s calls %s, stack %s" % (player, amount, self.stacks[player])
             act = (player, 'calls', amount, self.stacks[player]==0)
             self.actions[street].append(act)
             self.pot.addMoney(player, Decimal(amount))
@@ -290,7 +290,7 @@ Add a raise on [street] by [player] to [amountTo]
         self.checkPlayerExists(player)
         self.bets[street][player].append(Decimal(amount))
         self.stacks[player] -= Decimal(amount)
-        print "DEBUG %s bets %s, stack %s" % (player, amount, self.stacks[player])
+        #print "DEBUG %s bets %s, stack %s" % (player, amount, self.stacks[player])
         act = (player, 'bets', amount, self.stacks[player]==0)
         self.actions[street].append(act)
         self.lastBet[street] = Decimal(amount)
@@ -298,7 +298,7 @@ Add a raise on [street] by [player] to [amountTo]
         
 
     def addFold(self, street, player):
-        print "DEBUG: %s %s folded" % (street, player)
+        #print "DEBUG: %s %s folded" % (street, player)
         self.checkPlayerExists(player)
         self.folded.add(player)
         self.pot.addFold(player)
@@ -306,19 +306,13 @@ Add a raise on [street] by [player] to [amountTo]
         
 
     def addCheck(self, street, player):
-        print "DEBUG: %s %s checked" % (street, player)
+        #print "DEBUG: %s %s checked" % (street, player)
         self.checkPlayerExists(player)
         self.actions[street].append((player, 'checks'))
 
-# dart1 wins $ 51.09 USD from main pot with a full house, queens full of threes [ Qh, Qc, Qd, 3c, 3s ]
-# dart1 wins $ 41.07 USD from side pot with a full house, queens full of threes [ Qh, Qc, Qd, 3c, 3s ]
-# DEBUG: dart1 collected 51.09
-# DEBUG: dart1 collected 41.07
-# [WARNING] %s collected pot more than once; avoidable by reading winnings only from summary lines?
-# TODO: Should we just add the pots together?? 
 
     def addCollectPot(self,player, pot):
-        print "DEBUG: %s collected %s" % (player, pot)
+        #print "DEBUG: %s collected %s" % (player, pot)
         self.checkPlayerExists(player)
         self.collected = self.collected + [[player, pot]]
         if player not in self.collectees:
@@ -424,7 +418,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
         # we probably don't need a showdown section in pseudo stars format for our filtering purposes
         if 'SHOWDOWN' in self.actions:
             print >>fh, _("*** SHOW DOWN ***")
-            print >>fh, "DEBUG: what do they show"
+#            print >>fh, "DEBUG: what do they show"
 
         # Current PS format has the lines:
         # Uncalled bet ($111.25) returned to s0rrow
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 45912ee7..b59117ca 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -98,11 +98,11 @@ class HandHistoryConverter:
         tmp = tmp + "\thhdir:      '%s'\n" % (self.hhdir)
         tmp = tmp + "\tfiletype:   '%s'\n" % (self.filetype)
         tmp = tmp + "\tinfile:     '%s'\n" % (self.file)
-#		tmp = tmp + "\toutfile:    '%s'\n" % (self.ofile)
-#		tmp = tmp + "\tgametype:   '%s'\n" % (self.gametype[0])
-#		tmp = tmp + "\tgamebase:   '%s'\n" % (self.gametype[1])
-#		tmp = tmp + "\tlimit:      '%s'\n" % (self.gametype[2])
-#		tmp = tmp + "\tsb/bb:      '%s/%s'\n" % (self.gametype[3], self.gametype[4])
+        tmp = tmp + "\toutfile:    '%s'\n" % (self.ofile)
+        #tmp = tmp + "\tgametype:   '%s'\n" % (self.gametype[0])
+        #tmp = tmp + "\tgamebase:   '%s'\n" % (self.gametype[1])
+        #tmp = tmp + "\tlimit:      '%s'\n" % (self.gametype[2])
+        #tmp = tmp + "\tsb/bb:      '%s/%s'\n" % (self.gametype[3], self.gametype[4])
         return tmp
 
     def processFile(self):
@@ -120,11 +120,11 @@ class HandHistoryConverter:
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
         for hand in self.hands:
-#            print "\nInput:\n"+hand.string
+            #print "\nDEBUG: Input:\n"+hand.string
             self.readHandInfo(hand)
             
             self.readPlayerStacks(hand)
-            print "DEBUG stacks:", hand.stacks
+            #print "DEBUG stacks:", hand.stacks
             # at this point we know the player names, they are in hand.players
             playersThisHand = set([player[1] for player in hand.players])
             if playersThisHand <= self.players: # x <= y means 'x is subset of y'
@@ -164,7 +164,7 @@ class HandHistoryConverter:
 
         outfile.close()
         endtime = time.time()
-        print "Processed %d hands in %d seconds" % (len(self.hands), endtime-starttime)
+        print "Processed %d hands in %.3f seconds" % (len(self.hands), endtime - starttime)
 
     #####
     # These functions are parse actions that may be overridden by the inheriting class

From 232c0df33a2a38b1779fd34134022384e8b27851 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 18:07:11 +0900
Subject: [PATCH 35/66] determineGameType fixed for FTP, PLO working

---
 pyfpdb/EverleafToFpdb.py       | 43 +-------------------
 pyfpdb/FulltiltToFpdb.py       | 73 +++++++++++-----------------------
 pyfpdb/Hand.py                 |  2 +-
 pyfpdb/HandHistoryConverter.py |  2 +-
 4 files changed, 26 insertions(+), 94 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index ffb16daf..fc234513 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -22,48 +22,7 @@ import Configuration
 from HandHistoryConverter import *
 from time import strftime
 
-# Everleaf HH format
-
-# Everleaf Gaming Game #55208539
-# ***** Hand history for game #55208539 *****
-# Blinds $0.50/$1 NL Hold'em - 2008/09/01 - 13:35:01
-# Table Speed Kuala
-# Seat 1 is the button
-# Total number of players: 9
-# Seat 1: BadBeatBox (  $ 98.97 USD )
-# Seat 3: EricBlade (  $ 73.96 USD )
-# Seat 4: randy888 (  $ 196.50 USD )
-# Seat 5: BaronSengir (  $ 182.80 USD )
-# Seat 6: dogge (  $ 186.06 USD )
-# Seat 7: wings ( $ 50 USD )
-# Seat 8: schoffeltje (  $ 282.05 USD )
-# Seat 9: harrydebeng (  $ 109.45 USD )
-# Seat 10: smaragdar (  $ 96.50 USD )
-# EricBlade: posts small blind [$ 0.50 USD]
-# randy888: posts big blind [$ 1 USD]
-# wings: posts big blind [$ 1 USD]
-# ** Dealing down cards **
-# Dealt to EricBlade [ qc, 3c ]
-# BaronSengir folds
-# dogge folds
-# wings raises [$ 2.50 USD]
-# schoffeltje folds
-# harrydebeng calls [$ 3.50 USD]
-# smaragdar raises [$ 15.50 USD]
-# BadBeatBox folds
-# EricBlade folds
-# randy888 folds
-# wings calls [$ 12 USD]
-# harrydebeng folds
-# ** Dealing Flop ** [ qs, 3d, 8h ]
-# wings: bets [$ 34.50 USD]
-# smaragdar calls [$ 34.50 USD]
-# ** Dealing Turn ** [ 2d ]
-# ** Dealing River ** [ 6c ]
-# dogge shows [ 9h, 9c ]a pair of nines
-# spicybum shows [ 5d, 6d ]a straight, eight high
-# harrydebeng does not show cards
-# smaragdar wins $ 102 USD from main pot with a pair of aces [ ad, ah, qs, 8h, 6c ]
+# Class for converting Everleaf HH format.
 
 class Everleaf(HandHistoryConverter):
     def __init__(self, config, file):
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 4d408e95..62685042 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -20,51 +20,7 @@ import sys
 import Configuration
 from HandHistoryConverter import *
 
-# FullTilt HH Format
-
-#Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09
-#Seat 1: rigoise ($15.95)
-#Seat 2: K2dream ($6.70)
-#Seat 4: ravens2216 ($10)
-#Seat 5: rizkouner ($4)
-#Seat 6: Sorrowful ($8.35)
-#rigoise posts the small blind of $0.05
-#K2dream posts the big blind of $0.10
-#5 seconds left to act
-#rizkouner posts $0.10
-#The button is in seat #6
-#*** HOLE CARDS ***
-#Dealt to Sorrowful [8h Qc]
-#ravens2216 folds
-#rizkouner checks
-#Sorrowful has 15 seconds left to act
-#Sorrowful folds
-#rigoise folds
-#K2dream checks
-#*** FLOP *** [9d Kc 5c]
-#K2dream checks
-#rizkouner checks
-#*** TURN *** [9d Kc 5c] [5h]
-#K2dream has 15 seconds left to act
-#K2dream bets $0.20
-#rizkouner calls $0.20
-#*** RIVER *** [9d Kc 5c 5h] [6h]
-#K2dream checks
-#rizkouner has 15 seconds left to act
-#rizkouner bets $0.20
-#K2dream folds
-#Uncalled bet of $0.20 returned to rizkouner
-#rizkouner mucks
-#rizkouner wins the pot ($0.60)
-#*** SUMMARY ***
-#Total pot $0.65 | Rake $0.05
-#Board: [9d Kc 5c 5h 6h]
-#Seat 1: rigoise (small blind) folded before the Flop
-#Seat 2: K2dream (big blind) folded on the River
-#Seat 4: ravens2216 didn't bet (folded)
-#Seat 5: rizkouner collected ($0.60), mucked
-#Seat 6: Sorrowful (button) didn't bet (folded)
-#Seat N: rizkouner (button) showed [Jh Ah] and won ($0.70) with a pair of Threes
+# FullTilt HH Format converter
 
 class FullTilt(HandHistoryConverter):
     def __init__(self, config, file):
@@ -73,7 +29,7 @@ class FullTilt(HandHistoryConverter):
         self.sitename = "FullTilt"
         self.setFileType("text", "cp1252")
 
-        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) -')
+        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<LTYPE>(No|Pot)) Limit (?P<GAME>(Hold\'em|Omaha))')
         self.re_SplitHands  = re.compile(r"\n\n+")
         self.re_HandInfo    = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
         self.re_Button      = re.compile('The button is in seat #(?P<BUTTON>\d+)')
@@ -95,15 +51,32 @@ class FullTilt(HandHistoryConverter):
 
 
     def readSupportedGames(self):
-        pass
+        return [["ring", "hold", "nl"], 
+                ["ring", "hold", "pl"]
+                ["ring", "omaha", "pl"]
+               ]
 
     def determineGameType(self):
         # Cheating with this regex, only support nlhe at the moment
-        gametype = ["ring", "hold", "nl"]
+        # Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22
+        # Full Tilt Poker Game #10773265574: Table Butte (6 max) - $0.01/$0.02 - Pot Limit Hold'em - 21:33:46 ET - 2009/02/21
+        # Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09
+        structure = "" # nl, pl, cn, cp, fl
+        game      = ""
+
 
         m = self.re_GameInfo.search(self.obs)
-        gametype = gametype + [m.group('SB')]
-        gametype = gametype + [m.group('BB')]
+        if m.group('LTYPE') == "No":
+            structure = "nl"
+        elif m.group('LTYPE') == "Pot":
+            structure = "pl"
+
+        if m.group('GAME') == "Hold\'em":
+            game = "hold"
+        if m.group('GAME') == "Omaha":
+            game = "omahahi"
+
+        gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
         
         return gametype
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 57012235..55169841 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -345,7 +345,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
 """
         # currently it appears to be something like ["ring", "hold", "nl", sb, bb]:
         gs = {"hold"       : "Hold'em",
-              "omahahi"    : "FIXME",
+              "omahahi"    : "Omaha",
               "omahahilo"  : "FIXME",
               "razz"       : "Razz",
               "studhi"     : "FIXME",
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index b59117ca..20b99300 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -114,7 +114,7 @@ class HandHistoryConverter:
         if self.obs == "" or self.obs == None:
             print "Did not read anything from file."
             return
-        # Ugh
+
         self.obs = self.obs.replace('\r\n', '\n')
         outfile = open(self.ofile, 'w')
         self.gametype = self.determineGameType()

From 1c1adfaf088af7d3adab5e134cf706b66e5cda2a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 18:21:49 +0900
Subject: [PATCH 36/66] Preliminary support for Everleaf PLO?

---
 pyfpdb/EverleafToFpdb.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index fc234513..ef4ec180 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -31,7 +31,7 @@ class Everleaf(HandHistoryConverter):
         self.sitename = "Everleaf"
         self.setFileType("text", "cp1252")
         
-        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)")
+        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<LTYPE>(NL|PL)) (?P<GAME>(Hold\'em|Omaha))")
         self.re_SplitHands  = re.compile(r"\n\n+")
         self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
@@ -55,14 +55,32 @@ class Everleaf(HandHistoryConverter):
         self.re_SitsOut         = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
-        return [["ring", "hold", "nl"]]
+        return [["ring", "hold", "nl"]
+                ["ring", "hold", "pl"]
+                ["ring", "omaha", "pl"]
+               ]
 
     def determineGameType(self):
         # Cheating with this regex, only support nlhe at the moment
-        gametype = ["ring", "hold", "nl"]
+        # Blinds $0.50/$1 PL Omaha - 2008/12/07 - 21:59:48
+        # Blinds $0.05/$0.10 NL Hold'em - 2009/02/21 - 11:21:57
+        # $0.25/$0.50 7 Card Stud - 2008/12/05 - 21:43:59
+        structure = "" # nl, pl, cn, cp, fl
+        game      = ""
+
         m = self.re_GameInfo.search(self.obs)
-        gametype = gametype + [m.group('SB')]
-        gametype = gametype + [m.group('BB')]
+        if m.group('LTYPE') == "NL":
+            structure = "nl"
+        elif m.group('LTYPE') == "PL":
+            structure = "pl"
+
+        if m.group('GAME') == "Hold\'em":
+            game = "hold"
+        if m.group('GAME') == "Omaha":
+            game = "omahahi"
+
+        gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
+
         return gametype
 
     def readHandInfo(self, hand):

From 89fde673e2dd9765df26d1c49e4f767ea2adc173 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Sun, 22 Feb 2009 18:03:19 -0500
Subject: [PATCH 37/66] should detect FL games (need to implement way to
 actually not continue processing FL since we don't support it currently)

---
 pyfpdb/EverleafToFpdb.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index d3437bbc..0df5e440 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -73,6 +73,8 @@ class Everleaf(HandHistoryConverter):
             structure = "nl"
         elif m.group('LTYPE') == "PL":
             structure = "pl"
+        else:
+            structure = "fl" # we don't support it, but there should be how to detect it at least.
 
         if m.group('GAME') == "Hold\'em":
             game = "hold"

From 03f89ee439a105793a28e2b00808cc157fa56e70 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Mon, 23 Feb 2009 01:03:18 +0000
Subject: [PATCH 38/66] for some reason my GuiBulkImport was missing get_vbox()
 Added a combobox for selecting a filter But import brokea  bit

---
 pyfpdb/GuiBulkImport.py | 45 ++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index b5e87755..376ceb47 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -35,17 +35,6 @@ import Configuration
 
 class GuiBulkImport():
 
-    def import_dir(self):
-        """imports a directory, non-recursive. todo: move this to fpdb_import so CLI can use it"""
-
-        self.path = self.inputFile
-        self.importer.addImportDirectory(self.path)
-        self.importer.setCallHud(False)
-        starttime = time()
-        (stored, dups, partial, errs, ttime) = self.importer.runImport()
-        print 'GuiBulkImport.import_dir done: Stored: %d Duplicates: %d Partial: %d Errors: %d in %s seconds - %d/sec'\
-             % (stored, dups, partial, errs, ttime, stored / ttime)
-
     def load_clicked(self, widget, data=None):
 #    get the dir to import from the chooser
         self.inputFile = self.chooser.get_filename()
@@ -63,18 +52,22 @@ class GuiBulkImport():
             self.importer.setDropIndexes(cb_model[cb_index][0])
         else:
             self.importer.setDropIndexes("auto")
-
+        hhc=self.cbfilter.get_model()[self.cbfilter.get_active()][0]
         self.lab_info.set_text("Importing")
-        if os.path.isdir(self.inputFile):
-            self.import_dir()
-        else:
-            self.importer.addImportFile(self.inputFile)
-            self.importer.setCallHud(False)
-            self.importer.runImport()
-            self.importer.clearFileList()
+        
+        self.importer.addImportFile(self.inputFile,filter=hhc)
+        self.importer.setCallHud(False)
+        starttime = time()
+        (stored, dups, partial, errs, ttime) = self.importer.runImport()
+        print 'GuiBulkImport.import_dir done: Stored: %d Duplicates: %d Partial: %d Errors: %d in %s seconds - %d/sec'\
+             % (stored, dups, partial, errs, ttime, stored / ttime)
+        self.importer.clearFileList()
 
         self.lab_info.set_text("Import finished")
 
+    def get_vbox(self):
+        return self.vbox
+
     def __init__(self, db, settings, config):
         self.db = db # this is an instance of fpdb_db
         self.settings = settings
@@ -159,6 +152,20 @@ class GuiBulkImport():
         self.table.attach(self.cb, 4, 5, 1, 2, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
         self.cb.show()
 
+#    label - filter
+        self.lab_filter = gtk.Label("Site filter:")
+        self.table.attach(self.lab_filter, 2, 3, 2, 3, xpadding = 0, ypadding = 0, yoptions=gtk.SHRINK)
+        self.lab_filter.show()
+        self.lab_filter.set_justify(gtk.JUSTIFY_RIGHT)
+
+#    ComboBox - filter
+        self.cbfilter = gtk.combo_box_new_text()
+        self.cbfilter.append_text("passthrough")
+        self.cbfilter.append_text("Everleaf")
+        self.cbfilter.set_active(0)
+        self.table.attach(self.cbfilter, 3, 4, 2, 3, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
+        self.cbfilter.show()
+
 #    label - info
         self.lab_info = gtk.Label()
         self.table.attach(self.lab_info, 0, 4, 2, 3, xpadding = 0, ypadding = 0, yoptions=gtk.SHRINK)

From 5aecfb8e30d00100465beb8a66c20418da6dcd0d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Feb 2009 19:24:21 +0900
Subject: [PATCH 39/66] Oops. fix syntax error

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 62685042..ef50c518 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -52,7 +52,7 @@ class FullTilt(HandHistoryConverter):
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"], 
-                ["ring", "hold", "pl"]
+                ["ring", "hold", "pl"],
                 ["ring", "omaha", "pl"]
                ]
 

From a4911b8b9e839ef803cc2b814f53d1f8c2c1f99e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Feb 2009 21:56:29 +0900
Subject: [PATCH 40/66] More syntax error

---
 pyfpdb/EverleafToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index ef4ec180..a46751de 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -55,8 +55,8 @@ class Everleaf(HandHistoryConverter):
         self.re_SitsOut         = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
-        return [["ring", "hold", "nl"]
-                ["ring", "hold", "pl"]
+        return [["ring", "hold", "nl"],
+                ["ring", "hold", "pl"],
                 ["ring", "omaha", "pl"]
                ]
 

From b2ee8fa0ce5cabb13a8c36c9df5e3d428671523a Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Mon, 23 Feb 2009 07:56:33 -0500
Subject: [PATCH 41/66] add a couple of missing commas

---
 pyfpdb/EverleafToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 0df5e440..4f8748f3 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -55,8 +55,8 @@ class Everleaf(HandHistoryConverter):
         self.re_SitsOut         = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
-        return [["ring", "hold", "nl"]
-                ["ring", "hold", "pl"]
+        return [["ring", "hold", "nl"],
+                ["ring", "hold", "pl"],
                 ["ring", "omaha", "pl"]
                ]
 

From bca9fb15cf5371232b82b4e1ab9c29e445ba06d9 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 24 Feb 2009 22:46:05 +0900
Subject: [PATCH 42/66] Note in code re: os.walk

---
 pyfpdb/fpdb_import.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aeb1e027..cdfee353 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -118,6 +118,8 @@ class Importer:
     #dirlist is a hash of lists:
     #dirlist{ 'PokerStars' => ["/path/to/import/", "filtername"] }
     def addImportDirectory(self,dir,monitor = False, site = "default", filter = "passthrough"):
+        #This should really be using os.walk
+        #http://docs.python.org/library/os.html
         if os.path.isdir(dir):
             if monitor == True:
                 self.monitor = True

From b38c62367ae4f91d2b336e55ff469503fa663787 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 01:17:25 +0900
Subject: [PATCH 43/66] Preliminary razz support for Fulltilt

Breaks stuff
---
 pyfpdb/FulltiltToFpdb.py       | 35 +++++++++++++++++++++++++++-------
 pyfpdb/Hand.py                 |  3 +++
 pyfpdb/HandHistoryConverter.py | 25 +++++++++++++++++++-----
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index ef50c518..ecaab23a 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -28,10 +28,9 @@ class FullTilt(HandHistoryConverter):
         HandHistoryConverter.__init__(self, config, file, sitename="FullTilt") # Call super class init.
         self.sitename = "FullTilt"
         self.setFileType("text", "cp1252")
-
-        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<LTYPE>(No|Pot)) Limit (?P<GAME>(Hold\'em|Omaha))')
+        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<LTYPE>(No|Pot)? )?Limit (?P<GAME>(Hold\'em|Omaha|Razz))')
         self.re_SplitHands  = re.compile(r"\n\n+")
-        self.re_HandInfo    = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
+        self.re_HandInfo    = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
         self.re_Button      = re.compile('The button is in seat #(?P<BUTTON>\d+)')
         self.re_PlayerInfo  = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
         self.re_Board = re.compile(r"\[(?P<CARDS>.+)\]")
@@ -41,6 +40,7 @@ class FullTilt(HandHistoryConverter):
         #print "DEBUG player_re: " + player_re
         self.re_PostSB           = re.compile('.*\n(?P<PNAME>.*) posts the small blind of \$?(?P<SB>[.0-9]+)')
         self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
+        self.re_BringIn          = re.compile('.*\n(?P<PNAME>.*) brings in for \$?(?P<BRINGIN>[.0-9]+)')
         self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
         self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]')
         self.re_Action           = re.compile('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
@@ -53,6 +53,7 @@ class FullTilt(HandHistoryConverter):
     def readSupportedGames(self):
         return [["ring", "hold", "nl"], 
                 ["ring", "hold", "pl"],
+                ["ring", "razz", "fl"],
                 ["ring", "omaha", "pl"]
                ]
 
@@ -70,11 +71,16 @@ class FullTilt(HandHistoryConverter):
             structure = "nl"
         elif m.group('LTYPE') == "Pot":
             structure = "pl"
+        elif m.group('LTYPE') == "None":
+            structure = "fl"
 
         if m.group('GAME') == "Hold\'em":
             game = "hold"
-        if m.group('GAME') == "Omaha":
+        elif m.group('GAME') == "Omaha":
             game = "omahahi"
+        elif m.group('GAME') == "Razz":
+            game = "razz"
+        
 
         gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
         
@@ -85,7 +91,6 @@ class FullTilt(HandHistoryConverter):
         #print m.groups()
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
-        hand.buttonpos = int(self.re_Button.search(hand.string).group('BUTTON'))
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #		m.group('SB')
@@ -112,10 +117,13 @@ class FullTilt(HandHistoryConverter):
         # PREFLOP = ** Dealing down cards **
         # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
 
-        m =  re.search(r"\*\*\* HOLE CARDS \*\*\*(?P<PREFLOP>.+(?=\*\*\* FLOP \*\*\*)|.+)"
+        if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
+            m =  re.search(r"\*\*\* HOLE CARDS \*\*\*(?P<PREFLOP>.+(?=\*\*\* FLOP \*\*\*)|.+)"
                        r"(\*\*\* FLOP \*\*\*(?P<FLOP> \[\S\S \S\S \S\S\].+(?=\*\*\* TURN \*\*\*)|.+))?"
                        r"(\*\*\* TURN \*\*\* \[\S\S \S\S \S\S] (?P<TURN>\[\S\S\].+(?=\*\*\* RIVER \*\*\*)|.+))?"
                        r"(\*\*\* RIVER \*\*\* \[\S\S \S\S \S\S \S\S] (?P<RIVER>\[\S\S\].+))?", hand.string,re.DOTALL)
+        elif self.gametype[1] == "razz":
+            m =  re.search("\*\*\*(?P<THIRD>.+(?=\*\*\* 3RD STREET \*\*\*)|.+)", hand.string,re.DOTALL)
 
         hand.addStreets(m)
 
@@ -137,6 +145,19 @@ class FullTilt(HandHistoryConverter):
         for a in self.re_PostBoth.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
+    def readAntes(self, hand):
+        print "DEBUG: reading antes"
+        print "DEBUG: FIXME reading antes"
+
+    def readBringIn(self, hand):
+        print "DEBUG: reading bring in"
+#        print hand.string
+        m = self.re_Button.search(hand.string,re.DOTALL)
+        print "DEBUG: Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN'))
+
+    def readButton(self, hand):
+        hand.buttonpos = int(self.re_Button.search(hand.string).group('BUTTON'))
+
     def readHeroCards(self, hand):
         m = self.re_HeroCards.search(hand.string)
         if(m == None):
@@ -188,7 +209,7 @@ class FullTilt(HandHistoryConverter):
 if __name__ == "__main__":
     c = Configuration.Config()
     if len(sys.argv) ==  1:
-        testfile = "regression-test-files/fulltilt/FT20081209 CR - tay - $0.05-$0.10 - No Limit Hold'em.txt"
+        testfile = "regression-test-files/fulltilt/razz/FT20090223 Danville - $0.50-$1 Ante $0.10 - Limit Razz.txt"
     else:
         testfile = sys.argv[1]
         print "Converting: ", testfile
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 55169841..9c4fc658 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -39,7 +39,10 @@ class Hand:
         self.gametype = gametype
         self.string = string
 
+        #if gametype[1] == "hold" or self.gametype[1] == "omaha":
         self.streetList = ['PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
+        #elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
+        #self.streetList = ['ANTES','3RD','4TH','5TH','6TH','7TH'] # a list of the observed street names in order
 
         self.handid = 0
         self.sb = gametype[3]
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 20b99300..43186430 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -91,6 +91,7 @@ class HandHistoryConverter:
         self.ofile     = os.path.join(self.hhdir, os.path.basename(file))
         self.rexx      = FpdbRegex.FpdbRegex()
         self.players   = set()
+        self.maxseats  = 10
 
     def __str__(self):
         tmp = "HandHistoryConverter: '%s'\n" % (self.sitename)
@@ -134,17 +135,28 @@ class HandHistoryConverter:
                 # we need to recompile the player regexs.
                 self.players = playersThisHand
                 self.compile_player_regexs()
-        
-            self.markStreets(hand)
-            self.readBlinds(hand)
-            self.readHeroCards(hand) # want to generalise to draw games
+
+            # Different calls if stud or holdem like
+            if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
+                self.markStreets(hand)
+                self.readBlinds(hand)
+                self.readButton(hand)
+                self.readHeroCards(hand) # want to generalise to draw games
+            elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
+                self.markStreets(hand) # <--- Different streets
+                self.readAntes(hand)
+                self.readBringIn(hand)
 
             self.readShowdownActions(hand)
             
             # Read actions in street order
             for street in hand.streetList: # go through them in order
                 if hand.streets.group(street) is not None:
-                    self.readCommunityCards(hand, street) # read community cards
+                    if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
+                        self.readCommunityCards(hand, street) # read community cards
+                    elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
+                        self.readPlayerCards(hand, street)
+
                     self.readAction(hand, street)
 
                     
@@ -207,6 +219,9 @@ class HandHistoryConverter:
     # ['player1name', 'player2name', ...] where player1name is the sb and player2name is bb, 
     # addtional players are assumed to post a bb oop
     def readBlinds(self, hand): abstract
+    def readAntes(self, hand): abstract
+    def readBringIn(self, hand): abstract
+    def readButton(self, hand): abstract
     def readHeroCards(self, hand): abstract
     def readAction(self, hand, street): abstract
     def readCollectPot(self, hand): abstract

From 7fd90ce760622a5b6e207f28bbcf6aa4a11a3a58 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 01:27:10 +0900
Subject: [PATCH 44/66] Thinko - use right regex

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index ecaab23a..043d37b1 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -152,7 +152,7 @@ class FullTilt(HandHistoryConverter):
     def readBringIn(self, hand):
         print "DEBUG: reading bring in"
 #        print hand.string
-        m = self.re_Button.search(hand.string,re.DOTALL)
+        m = self.re_BringIn.search(hand.string,re.DOTALL)
         print "DEBUG: Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN'))
 
     def readButton(self, hand):

From a4f0e9a1fd1b11cfa7227a67f0cb81ec4d775617 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 02:05:51 +0900
Subject: [PATCH 45/66] Fulltilt nlhe working, more razz stuff

Everleaf still broken - need to create/move button regex to new abstract
method
---
 pyfpdb/FulltiltToFpdb.py | 13 ++++++++-----
 pyfpdb/Hand.py           |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 043d37b1..50d69568 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -67,9 +67,9 @@ class FullTilt(HandHistoryConverter):
 
 
         m = self.re_GameInfo.search(self.obs)
-        if m.group('LTYPE') == "No":
+        if m.group('LTYPE') == "No ":
             structure = "nl"
-        elif m.group('LTYPE') == "Pot":
+        elif m.group('LTYPE') == "Pot ":
             structure = "pl"
         elif m.group('LTYPE') == "None":
             structure = "fl"
@@ -81,7 +81,6 @@ class FullTilt(HandHistoryConverter):
         elif m.group('GAME') == "Razz":
             game = "razz"
         
-
         gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
         
         return gametype
@@ -123,8 +122,12 @@ class FullTilt(HandHistoryConverter):
                        r"(\*\*\* TURN \*\*\* \[\S\S \S\S \S\S] (?P<TURN>\[\S\S\].+(?=\*\*\* RIVER \*\*\*)|.+))?"
                        r"(\*\*\* RIVER \*\*\* \[\S\S \S\S \S\S \S\S] (?P<RIVER>\[\S\S\].+))?", hand.string,re.DOTALL)
         elif self.gametype[1] == "razz":
-            m =  re.search("\*\*\*(?P<THIRD>.+(?=\*\*\* 3RD STREET \*\*\*)|.+)", hand.string,re.DOTALL)
-
+            m =  re.search(r"(?P<ANTES>.+(?=\*\*\* 3RD STREET \*\*\*)|.+)"
+                           r"(\*\*\* 3RD STREET \*\*\*(?P<THIRD>.+(?=\*\*\* 4TH STREET \*\*\*)|.+))?"
+                           r"(\*\*\* 4TH STREET \*\*\*(?P<FOURTH>.+(?=\*\*\* 5TH STREET \*\*\*)|.+))?"
+                           r"(\*\*\* 5TH STREET \*\*\*(?P<FIFTH>.+(?=\*\*\* 6TH STREET \*\*\*)|.+))?"
+                           r"(\*\*\* 6TH STREET \*\*\*(?P<SIXTH>.+(?=\*\*\* 7TH STREET \*\*\*)|.+))?"
+                           r"(\*\*\* 7TH STREET \*\*\*(?P<SEVENTH>.+))?", hand.string,re.DOTALL)
         hand.addStreets(m)
 
     def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 9c4fc658..a461e95e 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -39,10 +39,10 @@ class Hand:
         self.gametype = gametype
         self.string = string
 
-        #if gametype[1] == "hold" or self.gametype[1] == "omaha":
-        self.streetList = ['PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
-        #elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
-        #self.streetList = ['ANTES','3RD','4TH','5TH','6TH','7TH'] # a list of the observed street names in order
+        if gametype[1] == "hold" or self.gametype[1] == "omaha":
+            self.streetList = ['PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
+        elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
+            self.streetList = ['ANTES','THIRD','FORTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
 
         self.handid = 0
         self.sb = gametype[3]

From dd6c23ad8565f460ea54e3ac6e561a6a0fb06fea Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 02:12:45 +0900
Subject: [PATCH 46/66] Move markStreets outside of if statement in main
 processing loop

---
 pyfpdb/HandHistoryConverter.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 43186430..5a53b5a9 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -136,14 +136,13 @@ class HandHistoryConverter:
                 self.players = playersThisHand
                 self.compile_player_regexs()
 
+            self.markStreets(hand)
             # Different calls if stud or holdem like
             if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
-                self.markStreets(hand)
                 self.readBlinds(hand)
                 self.readButton(hand)
                 self.readHeroCards(hand) # want to generalise to draw games
             elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
-                self.markStreets(hand) # <--- Different streets
                 self.readAntes(hand)
                 self.readBringIn(hand)
 

From 3d9026da2c87572676ad58edaea8cac7132da5be Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 19:32:12 +0900
Subject: [PATCH 47/66] More razz updates

---
 pyfpdb/FulltiltToFpdb.py       | 17 ++++++++++++++++-
 pyfpdb/Hand.py                 |  2 +-
 pyfpdb/HandHistoryConverter.py |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 50d69568..697eb632 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -42,7 +42,7 @@ class FullTilt(HandHistoryConverter):
         self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
         self.re_BringIn          = re.compile('.*\n(?P<PNAME>.*) brings in for \$?(?P<BRINGIN>[.0-9]+)')
         self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]')
+        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]( [(?P<NEWCARD>.*])?')
         self.re_Action           = re.compile('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
         self.re_ShowdownAction   = re.compile('.*\n(?P<PNAME>.*) shows \[(?P<CARDS>.*)\]')
         self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)")
@@ -174,6 +174,21 @@ class FullTilt(HandHistoryConverter):
             cards = set(cards.split(' '))
             hand.addHoleCards(cards, m.group('PNAME'))
 
+    def readPlayerCards(self, hand, street):
+        #Used for stud hands - borrows the HeroCards regex for now.
+        m = self.re_HeroCards.finditer(hand.streets.group(street))
+        print "DEBUG: razz/stud readPlayerCards"
+        print "DEBUG: STREET: %s", street
+        for player in m:
+            print player.groups()
+            #hand.hero = m.group('PNAME')
+            # "2c, qh" -> set(["2c","qc"])
+            # Also works with Omaha hands.
+            cards = player.group('CARDS')
+            print "DEBUG: PNAME: %s CARDS: %s" %(player.group('PNAME'), player.group('CARDS'))
+            cards = set(cards.split(' '))
+#            hand.addHoleCards(cards, m.group('PNAME'))
+
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets.group(street))
         for action in m:
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a461e95e..1047a69a 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -42,7 +42,7 @@ class Hand:
         if gametype[1] == "hold" or self.gametype[1] == "omaha":
             self.streetList = ['PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
         elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8":
-            self.streetList = ['ANTES','THIRD','FORTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
+            self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
 
         self.handid = 0
         self.sb = gametype[3]
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 5a53b5a9..41e133ea 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -150,6 +150,7 @@ class HandHistoryConverter:
             
             # Read actions in street order
             for street in hand.streetList: # go through them in order
+                print "DEBUG: ", street
                 if hand.streets.group(street) is not None:
                     if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
                         self.readCommunityCards(hand, street) # read community cards
@@ -222,6 +223,7 @@ class HandHistoryConverter:
     def readBringIn(self, hand): abstract
     def readButton(self, hand): abstract
     def readHeroCards(self, hand): abstract
+    def readPlayerCards(self, hand, street): abstract
     def readAction(self, hand, street): abstract
     def readCollectPot(self, hand): abstract
     def readShownCards(self, hand): abstract

From cda897608c01222cac476ae0874ffacf3f6af6b3 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 06:01:44 -0500
Subject: [PATCH 48/66] EverleafToFpdb: should at least recognise Stud, once
 the HandInfo regex is fixed. Not that it'll do anything good with it. HHC:
 return doing nothing but printing a warning message to output, if
 determineGameType() returns None

---
 pyfpdb/EverleafToFpdb.py       | 18 +++++++++++++-----
 pyfpdb/HandHistoryConverter.py |  5 ++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 4f8748f3..33ae0cd3 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -31,7 +31,7 @@ class Everleaf(HandHistoryConverter):
         self.sitename = "Everleaf"
         self.setFileType("text", "cp1252")
         
-        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<LTYPE>(NL|PL)) (?P<GAME>(Hold\'em|Omaha))")
+        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<LTYPE>(NL|PL)) (?P<GAME>(Hold\'em|Omaha|7 Card Stud))")
         self.re_SplitHands  = re.compile(r"\n\n+")
         self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
@@ -69,6 +69,8 @@ class Everleaf(HandHistoryConverter):
         game      = ""
 
         m = self.re_GameInfo.search(self.obs)
+        if m == None:
+            return None
         if m.group('LTYPE') == "NL":
             structure = "nl"
         elif m.group('LTYPE') == "PL":
@@ -78,8 +80,10 @@ class Everleaf(HandHistoryConverter):
 
         if m.group('GAME') == "Hold\'em":
             game = "hold"
-        if m.group('GAME') == "Omaha":
+        elif m.group('GAME') == "Omaha":
             game = "omahahi"
+        elif m.group('GAME') == "7 Card Stud":
+            game = "studhi" # Everleaf currently only does Hi stud
 
         gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
 
@@ -91,6 +95,7 @@ class Everleaf(HandHistoryConverter):
             print "DEBUG: re_HandInfo.search failed: '%s'" %(hand.string)
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
+        hand.max_seats = 6 # assume 6-max unless we have proof it's a larger/smaller game, since everleaf doesn't give seat max info
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #		m.group('SB')
 #		m.group('BB')
@@ -109,9 +114,12 @@ class Everleaf(HandHistoryConverter):
     def readPlayerStacks(self, hand):
         m = self.re_PlayerInfo.finditer(hand.string)
         for a in m:
-            hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
-
-
+            seatnum = int(a.group('SEAT'))
+            hand.addPlayer(seatnum, a.group('PNAME'), a.group('CASH'))
+            if seatnum > 6:
+                hand.max_seats = 10 # everleaf currently does 2/6/10 games, so if seats > 6 are in use, it must be 10-max.
+                # TODO: implement lookup list by table-name to determine maxes, then fall back to 6 default/10 here, if there's no entry in the list?
+            
         
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 20b99300..48badcc7 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -116,9 +116,12 @@ class HandHistoryConverter:
             return
 
         self.obs = self.obs.replace('\r\n', '\n')
-        outfile = open(self.ofile, 'w')
         self.gametype = self.determineGameType()
+        if self.gametype == None:
+            print "Unknown game type from file, aborting on this file."
+            return
         self.hands = self.splitFileIntoHands()
+        outfile = open(self.ofile, 'w')        
         for hand in self.hands:
             #print "\nDEBUG: Input:\n"+hand.string
             self.readHandInfo(hand)

From a5b7b8202aa2593607d41c40d57828b6b06ab103 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 11:32:03 +0000
Subject: [PATCH 49/66] tiny changes

---
 pyfpdb/Hand.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a461e95e..48e0f103 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -421,7 +421,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
         # we probably don't need a showdown section in pseudo stars format for our filtering purposes
         if 'SHOWDOWN' in self.actions:
             print >>fh, _("*** SHOW DOWN ***")
-#            print >>fh, "DEBUG: what do they show"
+        #TODO: Complete SHOWDOWN
 
         # Current PS format has the lines:
         # Uncalled bet ($111.25) returned to s0rrow
@@ -437,7 +437,6 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
         print >>fh, _("*** SUMMARY ***")
         print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
-        #print >>fh, _("Total pot $%s | Rake $%.2f" % (self.totalpot, self.rake)) # TODO: side pots
 
         board = []
         for s in self.board.values():

From 8cccce512d6e6a6b99fca64349a47f3a8a1fdba7 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 12:34:01 +0000
Subject: [PATCH 50/66] regexs start at start of lines

---
 pyfpdb/FulltiltToFpdb.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 697eb632..baf356f7 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -38,16 +38,16 @@ class FullTilt(HandHistoryConverter):
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
         #print "DEBUG player_re: " + player_re
-        self.re_PostSB           = re.compile('.*\n(?P<PNAME>.*) posts the small blind of \$?(?P<SB>[.0-9]+)')
-        self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
-        self.re_BringIn          = re.compile('.*\n(?P<PNAME>.*) brings in for \$?(?P<BRINGIN>[.0-9]+)')
-        self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]( [(?P<NEWCARD>.*])?')
-        self.re_Action           = re.compile('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
-        self.re_ShowdownAction   = re.compile('.*\n(?P<PNAME>.*) shows \[(?P<CARDS>.*)\]')
-        self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)")
-        self.re_SitsOut          = re.compile('(?P<PNAME>.*) sits out')
-        self.re_ShownCards       = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(.*\) showed \[(?P<CARDS>.*)\].*')
+        self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)", player_re)
+        self.re_PostBB           = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)", player_re)
+        self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)", player_re)
+        self.re_PostBoth         = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)", player_re)
+        self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( [(?P<NEWCARD>.*])?", player_re)
+        self.re_Action           = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?", player_re)
+        self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]", player_re)
+        self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)", player_re)
+        self.re_SitsOut          = re.compile(r"^%s sits out", player_re)
+        self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s \(.*\) showed \[(?P<CARDS>.*)\].*", player_re)
 
 
     def readSupportedGames(self):

From d500a9f9c5fb16846fb52e576bef0700f948a0e2 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 25 Feb 2009 21:34:05 +0900
Subject: [PATCH 51/66] More Razz - First pass through hh that doesn't crash

---
 pyfpdb/FulltiltToFpdb.py |   8 +--
 pyfpdb/Hand.py           | 107 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 697eb632..b9be85dc 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -42,7 +42,7 @@ class FullTilt(HandHistoryConverter):
         self.re_PostBB           = re.compile('.*\n(?P<PNAME>.*) posts (the big blind of )?\$?(?P<BB>[.0-9]+)')
         self.re_BringIn          = re.compile('.*\n(?P<PNAME>.*) brings in for \$?(?P<BRINGIN>[.0-9]+)')
         self.re_PostBoth         = re.compile('.*\n(?P<PNAME>.*) posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]( [(?P<NEWCARD>.*])?')
+        self.re_HeroCards        = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*)\])?')
         self.re_Action           = re.compile('.*\n(?P<PNAME>.*)(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?')
         self.re_ShowdownAction   = re.compile('.*\n(?P<PNAME>.*) shows \[(?P<CARDS>.*)\]')
         self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)")
@@ -71,7 +71,7 @@ class FullTilt(HandHistoryConverter):
             structure = "nl"
         elif m.group('LTYPE') == "Pot ":
             structure = "pl"
-        elif m.group('LTYPE') == "None":
+        elif m.group('LTYPE') == None:
             structure = "fl"
 
         if m.group('GAME') == "Hold\'em":
@@ -80,7 +80,9 @@ class FullTilt(HandHistoryConverter):
             game = "omahahi"
         elif m.group('GAME') == "Razz":
             game = "razz"
-        
+
+        print m.groups()
+
         gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
         
         return gametype
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 1047a69a..883e67b3 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -365,11 +365,19 @@ Map the tuple self.gametype onto the pokerstars string describing it
               "cp"  : "Cap Pot Limit"
              }
 
+        print "DEBUG: self.gametype: %s" %(self.gametype)
         string = "%s %s" %(gs[self.gametype[1]], ls[self.gametype[2]])
         
         return string
 
     def writeHand(self, fh=sys.__stdout__):
+        if self.gametype[1] == "hold" or self.gametype[1] == "omaha":
+            self.writeHoldemHand(fh)
+        else:
+            self.writeStudHand(fh)
+
+
+    def writeHoldemHand(self, fh=sys.__stdout__):
         # PokerStars format.
         #print "\n### Pseudo stars format ###"
         #print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %(self.sitename, self.handid, self.getGameTypeAsString(), self.sb, self.bb, self.starttime))
@@ -474,6 +482,105 @@ Map the tuple self.gametype onto the pokerstars string describing it
                 #print "Seat %d: %s showed %s" % (player[0], player[1], hole)
             #else:
                 #print "Seat %d: %s mucked or folded" % (player[0], player[1])
+
+
+    def writeStudHand(self, fh=sys.__stdout__):
+        # PokerStars format.
+        #print "\n### Pseudo stars format ###"
+        #print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %(self.sitename, self.handid, self.getGameTypeAsString(), self.sb, self.bb, self.starttime))
+        print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S (ET)', self.starttime)))
+        print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
+        
+        players_who_post_antes = set([x[0] for x in self.actions['ANTES']])
+
+        for player in [x for x in self.players if x[1] in players_who_post_antes]:
+            #Only print stacks of players who do something preflop
+            print >>fh, _("Seat %s: %s ($%s)" %(player[0], player[1], player[2]))
+
+
+        if 'THIRD' in self.actions:
+            print >>fh, _("*** 3RD STREET ***")
+            for act in self.actions['THIRD']:
+                self.printActionLine(act, fh)
+
+        if 'FOURTH' in self.actions:
+            print >>fh, _("*** 4TH STREET ***")
+            for act in self.actions['FOURTH']:
+                self.printActionLine(act, fh)
+
+        if 'FIFTH' in self.actions:
+            print >>fh, _("*** 5TH STREET ***")
+            for act in self.actions['FIFTH']:
+                self.printActionLine(act, fh)
+
+        if 'SIXTH' in self.actions:
+            print >>fh, _("*** 6TH STREET ***")
+            for act in self.actions['SIXTH']:
+                self.printActionLine(act, fh)
+
+        if 'SEVENTH' in self.actions:
+            print >>fh, _("*** 7TH STREET ***")
+            for act in self.actions['SEVENTH']:
+                self.printActionLine(act, fh)
+
+        #Some sites don't have a showdown section so we have to figure out if there should be one
+        # The logic for a showdown is: at the end of river action there are at least two players in the hand
+        # we probably don't need a showdown section in pseudo stars format for our filtering purposes
+        if 'SHOWDOWN' in self.actions:
+            print >>fh, _("*** SHOW DOWN ***")
+#            print >>fh, "DEBUG: what do they show"
+
+        # Current PS format has the lines:
+        # Uncalled bet ($111.25) returned to s0rrow
+        # s0rrow collected $5.15 from side pot
+        # stervels: shows [Ks Qs] (two pair, Kings and Queens)
+        # stervels collected $45.35 from main pot
+        # Immediately before the summary.
+        # The current importer uses those lines for importing winning rather than the summary
+        for name in self.pot.returned:
+            print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
+        for entry in self.collected:
+            print >>fh, _("%s collected $%s from x pot" %(entry[0], entry[1]))
+
+        print >>fh, _("*** SUMMARY ***")
+        print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
+        #print >>fh, _("Total pot $%s | Rake $%.2f" % (self.totalpot, self.rake)) # TODO: side pots
+
+        board = []
+        for s in self.board.values():
+            board += s
+        if board:   # sometimes hand ends preflop without a board
+            print >>fh, _("Board [%s]" % (" ".join(board)))
+
+        for player in [x for x in self.players if x[1] in players_who_post_antes]:
+            seatnum = player[0]
+            name = player[1]
+            if name in self.collectees and name in self.shown:
+                print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collectees[name]))
+            elif name in self.collectees:
+                print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
+            elif name in self.shown:
+                print >>fh, _("Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name])))
+            elif name in self.folded:
+                print >>fh, _("Seat %d: %s folded" % (seatnum, name))
+            else:
+                print >>fh, _("Seat %d: %s mucked" % (seatnum, name))
+
+        print >>fh, "\n\n"
+            # TODO:
+            # logic for side pots
+            # logic for which players get to showdown
+            # I'm just not sure we need to do this so heavily.. and if we do, it's probably better to use pokerlib
+            #if self.holecards[player[1]]: # empty list default is false
+                #hole = self.holecards[player[1]]
+                ##board = []
+                ##for s in self.board.values():
+                    ##board += s
+                ##playerhand = self.bestHand('hi', board+hole)
+                ##print "Seat %d: %s showed %s and won/lost with %s" % (player[0], player[1], hole, playerhand)
+                #print "Seat %d: %s showed %s" % (player[0], player[1], hole)
+            #else:
+                #print "Seat %d: %s mucked or folded" % (player[0], player[1])
         
 
     def printHand(self):

From abf489f0c62b7b7473b4f111ee64f577462be7fe Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 14:14:42 +0000
Subject: [PATCH 52/66] need re.MULTILINE and not to have syntax errors

---
 pyfpdb/FulltiltToFpdb.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index aa0e3141..1fe4ea9e 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -37,17 +37,17 @@ class FullTilt(HandHistoryConverter):
 
     def compile_player_regexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
-        #print "DEBUG player_re: " + player_re
-        self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)", player_re)
-        self.re_PostBB           = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)", player_re)
-        self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)", player_re)
-        self.re_PostBoth         = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)", player_re)
-        self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*\])?", player_re)
-        self.re_Action           = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?", player_re)
-        self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]", player_re)
-        self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)", player_re)
-        self.re_SitsOut          = re.compile(r"^%s sits out", player_re)
-        self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s \(.*\) showed \[(?P<CARDS>.*)\].*", player_re)
+        print "DEBUG player_re: " + player_re
+        self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" %  player_re, re.MULTILINE)
+        self.re_PostBB           = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_PostBoth         = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*)\])?" % player_re, re.MULTILINE)
+        self.re_Action           = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?" % player_re, re.MULTILINE)
+        self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
+        self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE)
+        self.re_SitsOut          = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
+        self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s \(.*\) showed \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
 
 
     def readSupportedGames(self):

From 65c34a7377565720fb1e6ce14bdb93725cb9bfb3 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 14:35:28 +0000
Subject: [PATCH 53/66] keeping Everleaf uptodate with FullSteamAhead changes
 Also, made static regexes class-wide, so compile once on import

---
 pyfpdb/EverleafToFpdb.py       | 23 +++++++++++++++--------
 pyfpdb/FulltiltToFpdb.py       | 17 ++++++++++-------
 pyfpdb/HandHistoryConverter.py |  7 +++----
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 33ae0cd3..f04480bf 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -25,24 +25,29 @@ from time import strftime
 # Class for converting Everleaf HH format.
 
 class Everleaf(HandHistoryConverter):
+    
+    # Static regexes
+    re_SplitHands  = re.compile(r"\n\n+")
+    re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<LTYPE>(NL|PL)) (?P<GAME>(Hold\'em|Omaha|7 Card Stud))")
+    re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)")
+    re_Button      = re.compile(r"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
+    re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
+    re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
+        
+    
     def __init__(self, config, file):
         print "Initialising Everleaf converter class"
         HandHistoryConverter.__init__(self, config, file, sitename="Everleaf") # Call super class init.
         self.sitename = "Everleaf"
         self.setFileType("text", "cp1252")
         
-        self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<LTYPE>(NL|PL)) (?P<GAME>(Hold\'em|Omaha|7 Card Stud))")
-        self.re_SplitHands  = re.compile(r"\n\n+")
-        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
-        self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
-        self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
-        
+
         try:
             self.ofile     = os.path.join(self.hhdir, file.split(os.path.sep)[-2]+"-"+os.path.basename(file))
         except:
             self.ofile     = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
 
-    def compile_player_regexs(self):
+    def compilePlayerRegexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
         #print "DEBUG player_re: " + player_re
         self.re_PostSB          = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
@@ -109,7 +114,6 @@ class Everleaf(HandHistoryConverter):
 #TODO: Do conversion from GMT to ET
 #TODO: Need some date functions to convert to different timezones (Date::Manip for perl rocked for this)
         hand.starttime = time.strptime(m.group('DATETIME'), "%Y/%m/%d - %H:%M:%S")
-        hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
         m = self.re_PlayerInfo.finditer(hand.string)
@@ -153,6 +157,9 @@ class Everleaf(HandHistoryConverter):
         for a in self.re_PostBoth.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'both', a.group('SBBB'))
 
+    def readButton(self, hand):
+        hand.buttonpos = int(self.re_Button.search(hand.string).group('BUTTON'))
+
     def readHeroCards(self, hand):
         m = self.re_HeroCards.search(hand.string)
         if(m == None):
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 1fe4ea9e..d6410048 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -23,19 +23,22 @@ from HandHistoryConverter import *
 # FullTilt HH Format converter
 
 class FullTilt(HandHistoryConverter):
+    
+    # Static regexes
+    re_GameInfo     = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<LTYPE>(No|Pot)? )?Limit (?P<GAME>(Hold\'em|Omaha|Razz))')
+    re_SplitHands   = re.compile(r"\n\n+")
+    re_HandInfo     = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
+    re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)')
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
+    re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
+
     def __init__(self, config, file):
         print "Initialising FullTilt converter class"
         HandHistoryConverter.__init__(self, config, file, sitename="FullTilt") # Call super class init.
         self.sitename = "FullTilt"
         self.setFileType("text", "cp1252")
-        self.re_GameInfo    = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<LTYPE>(No|Pot)? )?Limit (?P<GAME>(Hold\'em|Omaha|Razz))')
-        self.re_SplitHands  = re.compile(r"\n\n+")
-        self.re_HandInfo    = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
-        self.re_Button      = re.compile('The button is in seat #(?P<BUTTON>\d+)')
-        self.re_PlayerInfo  = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
-        self.re_Board = re.compile(r"\[(?P<CARDS>.+)\]")
 
-    def compile_player_regexs(self):
+    def compilePlayerRegexs(self):
         player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")"
         print "DEBUG player_re: " + player_re
         self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" %  player_re, re.MULTILINE)
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 95bf8851..93e0beb6 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -137,7 +137,7 @@ class HandHistoryConverter:
             else:
                 # we need to recompile the player regexs.
                 self.players = playersThisHand
-                self.compile_player_regexs()
+                self.compilePlayerRegexs()
 
             self.markStreets(hand)
             # Different calls if stud or holdem like
@@ -209,9 +209,8 @@ class HandHistoryConverter:
     # [['seat#', 'player1name', 'stacksize'] ['seat#', 'player2name', 'stacksize'] [...]]
     def readPlayerStacks(self, hand): abstract
     
-    # Given 
-    #
-    def compile_player_regexs(self): abstract
+    def compilePlayerRegexs(self): abstract
+    """Compile dynamic regexes -- these explicitly match known player names and must be updated if a new player joins"""
     
     # Needs to return a MatchObject with group names identifying the streets into the Hand object
     # so groups are called by street names 'PREFLOP', 'FLOP', 'STREET2' etc

From e5489056ff86fd113e385752dc519743ab83e99b Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 14:59:11 +0000
Subject: [PATCH 54/66] less broken, please check sanity

---
 pyfpdb/GuiBulkImport.py |  2 +-
 pyfpdb/fpdb_import.py   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 376ceb47..46ac3f0f 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -55,7 +55,7 @@ class GuiBulkImport():
         hhc=self.cbfilter.get_model()[self.cbfilter.get_active()][0]
         self.lab_info.set_text("Importing")
         
-        self.importer.addImportFile(self.inputFile,filter=hhc)
+        self.importer.addBulkImportImportFileOrDir(self.inputFile,filter=hhc)
         self.importer.setCallHud(False)
         starttime = time()
         (stored, dups, partial, errs, ttime) = self.importer.runImport()
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 49657762..607cf96a 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -113,6 +113,20 @@ class Importer:
         #TODO: test it is a valid file -> put that in config!!
         self.filelist[filename] = [site] + [filter]
 
+    # Called from GuiBulkImport to add a file or directory.
+    def addBulkImportImportFileOrDir(self, inputPath,filter = "passthrough"):
+        """Add a file or directory for bulk import"""
+        # Bulk import never monitors
+        
+        # if directory, add all files in it. Otherwise add single file.
+        # TODO: only add sane files?
+        if os.path.isdir(inputPath):
+            for subdir in os.walk(inputPath):
+                for file in subdir[2]:
+                    self.addImportFile(os.path.join(inputPath, subdir, file), site="default", filter=filter)
+        else:
+            self.addImportFile(inputPath, site="default", filter=filter)
+
     #Add a directory of files to filelist
     #Only one import directory per site supported.
     #dirlist is a hash of lists:

From d5b7b17b21430b72e8ba9e4283941c81b9e6f15e Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 25 Feb 2009 15:16:18 +0000
Subject: [PATCH 55/66] bugfix

---
 pyfpdb/fpdb_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 607cf96a..2a339663 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -123,7 +123,7 @@ class Importer:
         if os.path.isdir(inputPath):
             for subdir in os.walk(inputPath):
                 for file in subdir[2]:
-                    self.addImportFile(os.path.join(inputPath, subdir, file), site="default", filter=filter)
+                    self.addImportFile(os.path.join(inputPath, subdir[0], file), site="default", filter=filter)
         else:
             self.addImportFile(inputPath, site="default", filter=filter)
 

From a71be6ddd39da7ad3d9b8a7a93d6c42b68208a32 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 26 Feb 2009 00:45:46 +0900
Subject: [PATCH 56/66] Add stud/razz ante for FullTilt converter

---
 pyfpdb/FulltiltToFpdb.py |  8 ++++++--
 pyfpdb/Hand.py           | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index d6410048..d46db318 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -43,6 +43,7 @@ class FullTilt(HandHistoryConverter):
         print "DEBUG player_re: " + player_re
         self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" %  player_re, re.MULTILINE)
         self.re_PostBB           = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
+        self.re_Antes            = re.compile(r"^%s antes \$?(?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_PostBoth         = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*)\])?" % player_re, re.MULTILINE)
@@ -155,7 +156,10 @@ class FullTilt(HandHistoryConverter):
 
     def readAntes(self, hand):
         print "DEBUG: reading antes"
-        print "DEBUG: FIXME reading antes"
+        m = self.re_Antes.finditer(hand.string)
+        for player in m:
+            print "DEBUG: hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE'))
+            hand.addAnte(player.group('PNAME'), player.group('ANTE'))
 
     def readBringIn(self, hand):
         print "DEBUG: reading bring in"
@@ -184,13 +188,13 @@ class FullTilt(HandHistoryConverter):
         m = self.re_HeroCards.finditer(hand.streets.group(street))
         print "DEBUG: razz/stud readPlayerCards"
         print "DEBUG: STREET: %s", street
+        print hand.streets.group(street)
         for player in m:
             print player.groups()
             #hand.hero = m.group('PNAME')
             # "2c, qh" -> set(["2c","qc"])
             # Also works with Omaha hands.
             cards = player.group('CARDS')
-            print "DEBUG: PNAME: %s CARDS: %s" %(player.group('PNAME'), player.group('CARDS'))
             cards = set(cards.split(' '))
 #            hand.addHoleCards(cards, m.group('PNAME'))
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 0c08aa79..847d5f34 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -185,6 +185,14 @@ Card ranks will be uppercased
             c = c.replace(k,v)
         return c
 
+    def addAnte(self, player, ante):
+        if player is not None:
+            self.bets['ANTES'][player].append(Decimal(ante))
+            self.stacks[player] -= Decimal(ante)
+            act = (player, 'posts', "ante", ante, self.stacks[player]==0)
+            self.actions['ANTES'].append(act)
+            self.pot.addMoney(player, Decimal(ante))
+
     def addBlind(self, player, blindtype, amount):
         # if player is None, it's a missing small blind.
         # TODO:
@@ -496,6 +504,11 @@ Map the tuple self.gametype onto the pokerstars string describing it
             #Only print stacks of players who do something preflop
             print >>fh, _("Seat %s: %s ($%s)" %(player[0], player[1], player[2]))
 
+        if 'ANTES' in self.actions:
+            for act in self.actions['ANTES']:
+                print act
+                print >>fh, _("%s: posts the ante $%s" %(act[0], act[3]))
+
 
         if 'THIRD' in self.actions:
             print >>fh, _("*** 3RD STREET ***")

From 354a67c0e4a2f1b10826b2e9d956ed9a2b2839a0 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 26 Feb 2009 01:23:46 +0900
Subject: [PATCH 57/66] Some bringin code for stud/razz

---
 pyfpdb/FulltiltToFpdb.py | 1 +
 pyfpdb/Hand.py           | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index d46db318..1ad2c330 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -166,6 +166,7 @@ class FullTilt(HandHistoryConverter):
 #        print hand.string
         m = self.re_BringIn.search(hand.string,re.DOTALL)
         print "DEBUG: Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN'))
+        hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
 
     def readButton(self, hand):
         hand.buttonpos = int(self.re_Button.search(hand.string).group('BUTTON'))
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 847d5f34..861808ab 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -221,6 +221,14 @@ Card ranks will be uppercased
         self.posted = self.posted + [[player,blindtype]]
         #print "DEBUG: self.posted: %s" %(self.posted)
 
+    def addBringIn(self, player, ante):
+        if player is not None:
+            self.bets['THIRD'][player].append(Decimal(ante))
+            self.stacks[player] -= Decimal(ante)
+            act = (player, 'bringin', "bringin", ante, self.stacks[player]==0)
+            self.actions['THIRD'].append(act)
+            self.pot.addMoney(player, Decimal(ante))
+
 
     def addCall(self, street, player=None, amount=None):
         # Potentially calculate the amount of the call if not supplied
@@ -513,6 +521,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
         if 'THIRD' in self.actions:
             print >>fh, _("*** 3RD STREET ***")
             for act in self.actions['THIRD']:
+                #FIXME: Need some logic here for bringin vs completes
                 self.printActionLine(act, fh)
 
         if 'FOURTH' in self.actions:

From 440602198f81cc09d9ecb5ee4c44858057e81545 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 26 Feb 2009 01:48:41 +0900
Subject: [PATCH 58/66] Fix(?) HeroCards regex for stud

---
 pyfpdb/FulltiltToFpdb.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 1ad2c330..a2420251 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -46,7 +46,7 @@ class FullTilt(HandHistoryConverter):
         self.re_Antes            = re.compile(r"^%s antes \$?(?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
         self.re_PostBoth         = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
-        self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*)\])?" % player_re, re.MULTILINE)
+        self.re_HeroCards        = re.compile(r"^Dealt to %s \[(?P<CARDS>[AKQJT0-9hcsd ]+)\]( \[(?P<NEWCARD>[AKQJT0-9hcsd ]+)\])?" % player_re, re.MULTILINE)
         self.re_Action           = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?" % player_re, re.MULTILINE)
         self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
         self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE)
@@ -188,7 +188,6 @@ class FullTilt(HandHistoryConverter):
         #Used for stud hands - borrows the HeroCards regex for now.
         m = self.re_HeroCards.finditer(hand.streets.group(street))
         print "DEBUG: razz/stud readPlayerCards"
-        print "DEBUG: STREET: %s", street
         print hand.streets.group(street)
         for player in m:
             print player.groups()

From 3c9f5537ea155fa81ffaa421dabffbd10abd690e Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 12:40:39 -0500
Subject: [PATCH 59/66] import should stop erroring out and crashing if a file
 it wanted to read has been deleted

---
 pyfpdb/fpdb_import.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aeb1e027..ca9167e8 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -235,8 +235,9 @@ class Importer:
         if (file=="stdin"):
             inputFile=sys.stdin
         else:
-            inputFile=open(file, "rU")
-            try: loc = self.pos_in_file[file]
+            try:
+                inputFile=open(file, "rU")
+                loc = self.pos_in_file[file]
             except: pass
 
         # Read input file into class and close file

From 7ebf27c07e2716d81d978597b546be021829674f Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 15:25:58 -0500
Subject: [PATCH 60/66] add site config option "use_frames", set to "True" to
 get frames

---
 pyfpdb/Configuration.py  |  4 ++++
 pyfpdb/EverleafToFpdb.py |  7 +++++++
 pyfpdb/Hud.py            | 20 +++++++++++++-------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index a9a884a7..fb182f4b 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -62,6 +62,7 @@ class Site:
         self.aux_window   = node.getAttribute("aux_window")
         self.font         = node.getAttribute("font")
         self.font_size    = node.getAttribute("font_size")
+        self.use_frames    = node.getAttribute("use_frames")
         self.layout       = {}
         
         for layout_node in node.getElementsByTagName('layout'):
@@ -465,6 +466,9 @@ class Config:
             paths['hud-defaultPath']        = "default"
             paths['bulkImport-defaultPath'] = "default"
         return paths
+    
+    def get_frames(self, site = "PokerStars"):
+        return self.supported_sites[site].use_frames == "True"
 
     def get_default_colors(self, site = "PokerStars"):
         colors = {}
diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 33ae0cd3..a97e2bde 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -65,6 +65,13 @@ class Everleaf(HandHistoryConverter):
         # Blinds $0.50/$1 PL Omaha - 2008/12/07 - 21:59:48
         # Blinds $0.05/$0.10 NL Hold'em - 2009/02/21 - 11:21:57
         # $0.25/$0.50 7 Card Stud - 2008/12/05 - 21:43:59
+        
+        # Tourney:
+        # Everleaf Gaming Game #75065769
+        # ***** Hand history for game #75065769 *****
+        # Blinds 10/20 NL Hold'em - 2009/02/25 - 17:30:32
+        # Table 2
+
         structure = "" # nl, pl, cn, cp, fl
         game      = ""
 
diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 17497d90..f77b7318 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -285,7 +285,7 @@ class Hud:
                 self.stat_windows[stat_dict[s]['seat']].player_id = stat_dict[s]['player_id']
             except: # omg, we have more seats than stat windows .. damn poker sites with incorrect max seating info .. let's force 10 here
                 self.max = 10
-                self.create(hand, config)
+                self.create(hand, config, stat_dict)
                 self.stat_windows[stat_dict[s]['seat']].player_id = stat_dict[s]['player_id']
                 
             for r in range(0, config.supported_games[self.poker_game].rows):
@@ -365,6 +365,7 @@ class Stat_Window:
         self.y = y + table.y        # x and y are the location relative to table.x & y
         self.player_id = player_id  # looks like this isn't used ;)
         self.sb_click = 0           # used to figure out button clicks
+        self.useframes = parent.config.get_frames(parent.site)
 
         self.window = gtk.Window()
         self.window.set_decorated(0)
@@ -382,23 +383,28 @@ class Stat_Window:
         self.frame = []
         self.label = []
         for r in range(self.game.rows):
-            self.frame.append([])
+            if self.useframes:
+                self.frame.append([])
             self.e_box.append([])
             self.label.append([])
             for c in range(self.game.cols):
-                self.frame[r].append( gtk.Frame() )
+                if self.useframes:
+                    self.frame[r].append( gtk.Frame() )
                 self.e_box[r].append( gtk.EventBox() )
                 
                 self.e_box[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor)
                 self.e_box[r][c].modify_fg(gtk.STATE_NORMAL, parent.foregroundcolor)
                 
                 Stats.do_tip(self.e_box[r][c], 'stuff')
-#                self.grid.attach(self.e_box[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0)
-                self.grid.attach(self.frame[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0)
-                self.frame[r][c].add(self.e_box[r][c])
+                if self.useframes:
+                    self.grid.attach(self.frame[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0)
+                    self.frame[r][c].add(self.e_box[r][c])
+                else:
+                    self.grid.attach(self.e_box[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0)
                 self.label[r].append( gtk.Label('xxx') )
                 
-                self.frame[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor)
+                if self.useframes:
+                    self.frame[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor)
                 self.label[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor)
                 self.label[r][c].modify_fg(gtk.STATE_NORMAL, parent.foregroundcolor)
 

From 560cb1a543b481415764b88448210b7d5b0562ac Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 22:44:03 -0500
Subject: [PATCH 61/66] fpdb_import runUpdated() will now remove files that
 were found to be newly missing on it's most recent pass from it's list of
 files to check

---
 pyfpdb/fpdb_import.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index ca9167e8..aa40b218 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -61,6 +61,7 @@ class Importer:
         self.filelist = {}
         self.dirlist = {}
         self.addToDirList = {}
+        self.removeFromFileList = {} # to remove deleted files
         self.monitor = False
         self.updated = {}       #Time last import was run {file:mtime}
         self.lines = None
@@ -187,8 +188,12 @@ class Importer:
                     
         for dir in self.addToDirList:
             self.addImportDirectory(dir, True, self.addToDirList[dir][0], self.addToDirList[dir][1])
+            
+        for file in self.removeFromFileList:
+            del self.filelist[file]
         
         self.addToDirList = {}
+        self.removeFromFileList = {}
 
     # This is now an internal function that should not be called directly.
     def import_file_dict(self, file, site, filter):
@@ -235,10 +240,15 @@ class Importer:
         if (file=="stdin"):
             inputFile=sys.stdin
         else:
+            if os.path.exists(file):
+                inputFile = open(file, "rU")
+            else:
+                self.removeFromFileList['file'] = True
+                return
             try:
-                inputFile=open(file, "rU")
                 loc = self.pos_in_file[file]
-            except: pass
+            except:
+                pass
 
         # Read input file into class and close file
         inputFile.seek(loc)

From 9066cf9fc6ad9330730970be976f086194a68992 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 22:47:22 -0500
Subject: [PATCH 62/66] return appropriate tuple from import_fpdb_file on file
 error

---
 pyfpdb/fpdb_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aa40b218..16435b06 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -244,7 +244,7 @@ class Importer:
                 inputFile = open(file, "rU")
             else:
                 self.removeFromFileList['file'] = True
-                return
+                return (0, 0, 0, 1, 0)
             try:
                 loc = self.pos_in_file[file]
             except:

From c7541d9f14d9a7f2fc007b168a24791da715dc05 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 23:17:36 -0500
Subject: [PATCH 63/66] return appropriate tuple from import_fpdb_file on file
 error

---
 pyfpdb/fpdb_import.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aa40b218..980b1bae 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -190,7 +190,8 @@ class Importer:
             self.addImportDirectory(dir, True, self.addToDirList[dir][0], self.addToDirList[dir][1])
             
         for file in self.removeFromFileList:
-            del self.filelist[file]
+            if file in self.filelist:
+                del self.filelist[file]
         
         self.addToDirList = {}
         self.removeFromFileList = {}
@@ -243,8 +244,8 @@ class Importer:
             if os.path.exists(file):
                 inputFile = open(file, "rU")
             else:
-                self.removeFromFileList['file'] = True
-                return
+                self.removeFromFileList[file] = True
+                return (0, 0, 0, 1, 0)
             try:
                 loc = self.pos_in_file[file]
             except:

From 9557117a16b78b3be4297760bbb1804f32d7f9a6 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Thu, 26 Feb 2009 09:27:59 -0500
Subject: [PATCH 64/66] add "totalprofit" stat

---
 pyfpdb/Stats.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 0870c73e..cad3af88 100644
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -70,6 +70,13 @@ def do_stat(stat_dict, player = 24, stat = 'vpip'):
 ########################################### 
 #    functions that return individual stats
 
+def totalprofit(stat_dict, player):
+    """     Total Profit."""
+    if stat_dict[player]['net'] != 0:
+        stat = float(stat_dict[player]['net']) / 100
+        return (stat, '$%.2f' % stat, 'tp=$%.2f' % stat, 'totalprofit=$%.2f' % stat, str(stat), 'Total Profit')
+    return ('0', '0', '0', '0', 'Total Profit')
+
 def playername(stat_dict, player):
     """    Player Name."""
     return (stat_dict[player]['screen_name'],

From 6d862cff529161bd5439a3034c18de54ae704757 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 27 Feb 2009 00:35:15 +0900
Subject: [PATCH 65/66] addPlayerCards done - now need to print it

---
 pyfpdb/FulltiltToFpdb.py |  8 ++++----
 pyfpdb/Hand.py           | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index a2420251..73607790 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -191,12 +191,12 @@ class FullTilt(HandHistoryConverter):
         print hand.streets.group(street)
         for player in m:
             print player.groups()
-            #hand.hero = m.group('PNAME')
-            # "2c, qh" -> set(["2c","qc"])
-            # Also works with Omaha hands.
             cards = player.group('CARDS')
+            if player.group('NEWCARD') != None:
+                print cards
+                cards = cards + " " + player.group('NEWCARD')
             cards = set(cards.split(' '))
-#            hand.addHoleCards(cards, m.group('PNAME'))
+            hand.addPlayerCards(cards, player.group('PNAME'))
 
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets.group(street))
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 861808ab..80591a5f 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -146,6 +146,22 @@ player  (string) name of player
         except FpdbParseError, e:
             print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
 
+    def addPlayerCards(self, cards, player):
+        """\
+Assigns observed cards to a player.
+cards   set of card bigrams e.g. set(['2h','Jc'])     
+player  (string) name of player
+
+Should probably be merged with addHoleCards
+"""
+        print "DEBUG: addPlayerCards", cards,player
+        try:
+            self.checkPlayerExists(player)
+            cards = set([self.card(c) for c in cards])
+            self.holecards[player].update(cards)
+        except FpdbParseError, e:
+            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+
     def addShownCards(self, cards, player, holeandboard=None):
         """\
 For when a player shows cards for any reason (for showdown or out of choice).
@@ -514,12 +530,12 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
         if 'ANTES' in self.actions:
             for act in self.actions['ANTES']:
-                print act
                 print >>fh, _("%s: posts the ante $%s" %(act[0], act[3]))
 
-
         if 'THIRD' in self.actions:
             print >>fh, _("*** 3RD STREET ***")
+            for player in [x for x in self.players if x[1] in players_who_post_antes]:
+                print >>fh, _("Dealt to ")
             for act in self.actions['THIRD']:
                 #FIXME: Need some logic here for bringin vs completes
                 self.printActionLine(act, fh)

From 3fba85456cce622b2dfc69ae3f812e9bdcac4224 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 27 Feb 2009 01:26:50 +0900
Subject: [PATCH 66/66] Fix button regex

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 73607790..2d2e36d1 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -28,7 +28,7 @@ class FullTilt(HandHistoryConverter):
     re_GameInfo     = re.compile('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<LTYPE>(No|Pot)? )?Limit (?P<GAME>(Hold\'em|Omaha|Razz))')
     re_SplitHands   = re.compile(r"\n\n+")
     re_HandInfo     = re.compile('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<DATETIME>.*)')
-    re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)')
+    re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")