From 9d803957cb7638b1ad775ad6193f27c7f8e7af4f Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Wed, 22 Jul 2009 10:24:29 -0400
Subject: [PATCH] Detect mixed games in FTP HH. Fix typos.

---
 pyfpdb/FulltiltToFpdb.py       | 11 ++++++++++-
 pyfpdb/Hand.py                 |  3 ++-
 pyfpdb/HandHistoryConverter.py |  7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index b860fe94..be3b6ba5 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -42,7 +42,7 @@ class Fulltilt(HandHistoryConverter):
     re_HandInfo     = re.compile('''.*\#(?P<HID>[0-9]+):\s
                                     (?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
                                     Table\s
-                                    (?P<PLAY>Play\sChip\s|PC)
+                                    (?P<PLAY>Play\sChip\s|PC)?
                                     (?P<TABLE>[-\s\da-zA-Z]+)\s
                                     (\((?P<TABLEATTRIBUTES>.+)\)\s)?-\s
                                     \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\s(Ante\s\$?(?P<ANTE>[.0-9]+)\s)?-\s
@@ -52,8 +52,11 @@ class Fulltilt(HandHistoryConverter):
     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]+)\)$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
+    re_Mixed        = re.compile(r'\s\-\s(?P<MIXED>HA|HORSE|HOSE)\s\-\s', re.VERBOSE)
     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports.
 
+    mixes = { 'HORSE': 'horse', '7-Game': '7game', 'HOSE': 'hose', 'HA': 'ha'}
+
     def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
         """\
 in_path   (default '-' = sys.stdin)
@@ -319,6 +322,12 @@ follow :  whether to tail -f the input"""
         if mo <= 6: return 6
         return 9
 
+    def readOther(self, hand):
+        m = self.re_Mixed.search(self.in_path)
+        if m == None: hand.mixed = None
+        else:
+            hand.mixed = self.mixes[m.groupdict()['MIXED']]
+        print "mixed =", hand.mixed
 
 if __name__ == "__main__":
     parser = OptionParser()
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index c9ecc71d..254c802f 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -39,7 +39,7 @@ class Hand(object):
     UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K', 'S':'s', 'C':'c', 'H':'h', 'D':'d'}
     LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
     SYMBOL = {'USD': '$', 'EUR': u'$', 'T$': '', 'play': ''}
-    MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE'}
+    MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE', 'ha': 'HA'}
 
 
     def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
@@ -632,6 +632,7 @@ class HoldemOmahaHand(Hand):
             hhc.getRake(self)
             if self.maxseats == None:
                 self.maxseats = hhc.guessMaxSeats(self)
+            hhc.readOther(self)
         elif builtFrom == "DB":
             if handid is not None:
                 self.select(handid) # Will need a handId
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 4855b834..ccfb3bfe 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -200,7 +200,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             logging.info("Unsupported game type: %s" % gametype)
 
         if hand:
-#            print hand
+            print hand
             hand.writeHand(self.out_fh)
             return hand
         else:
@@ -269,6 +269,11 @@ or None if we fail to get the info """
     def readAction(self, hand, street): abstract
     def readCollectPot(self, hand): abstract
     def readShownCards(self, hand): abstract
+
+    # Some sites do odd stuff that doesn't fall in to the normal HH parsing.
+    # e.g., FTP doesn't put mixed game info in the HH, but puts in in the 
+    # file name. Use readOther() to clean up those messes.
+    def readOther(self, hand): pass
     
     # Some sites don't report the rake. This will be called at the end of the hand after the pot total has been calculated
     # an inheriting class can calculate it for the specific site if need be.