From 88cadd36ad562a9813996d8a28b2bafe045de66e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 11 Mar 2009 00:57:13 +0900
Subject: [PATCH] Fix Everleaf to start parsing 7 Card Stud games

Still missing readAntes
---
 pyfpdb/EverleafToFpdb.py       | 15 ++++++++-------
 pyfpdb/Hand.py                 |  6 +++---
 pyfpdb/HandHistoryConverter.py |  5 +++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 1e6ee335..20cfe16d 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -27,7 +27,7 @@ class Everleaf(HandHistoryConverter):
     
     # Static regexes
     re_SplitHands  = re.compile(r"\n\n+")
-    re_GameInfo    = re.compile(u"^(Blinds )?(?P<currency>\$| €|)(?P<sb>[.0-9]+)/(?:\$| €)?(?P<bb>[.0-9]+) (?P<limit>NL|PL|) (?P<game>(Hold\'em|Omaha|7 Card Stud))", re.MULTILINE)
+    re_GameInfo    = re.compile(u"^(Blinds )?(?P<CURRENCY>\$| €|)(?P<SB>[.0-9]+)/(?:\$| €)?(?P<BB>[.0-9]+) (?P<LIMIT>NL|PL|) ?(?P<GAME>(Hold\'em|Omaha|7 Card Stud))", re.MULTILINE)
     re_HandInfo    = re.compile(u".*#(?P<HID>[0-9]+)\n.*\n(Blinds )?(?:\$| €|)(?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(u"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|)|new player|All-in) \)", re.MULTILINE)
@@ -67,6 +67,7 @@ follow :  whether to tail -f the input"""
         return [["ring", "hold", "nl"],
                 ["ring", "hold", "pl"],
                 ["ring", "hold", "fl"],
+                ["ring", "studhi", "fl"],
                 ["ring", "omahahi", "pl"]
                ]
 
@@ -83,15 +84,15 @@ follow :  whether to tail -f the input"""
         games = { 'Hold\'em':'hold', 'Omaha':'omahahi', 'Razz':'razz','7 Card Stud':'studhi' }
         currencies = { u' €':'EUR', '$':'USD', '':'T$' }
         for key in info:
-            if key == 'limit':
+            if key == 'LIMIT':
                 info[key] = limits[info[key]]
-            if key == 'game':
+            if key == 'GAME':
                 info[key] = games[info[key]]
-            if key == 'sb':
+            if key == 'SB':
                 pass
-            if key == 'bb':
+            if key == 'BB':
                 pass
-            if key == 'currency':
+            if key == 'CURRENCY':
                 info[key] = currencies[info[key]]
 
         return info
@@ -263,7 +264,7 @@ follow :  whether to tail -f the input"""
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="regression-test-files/everleaf/plo/Naos.txt")
+    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="regression-test-files/everleaf/studhi/Plymouth.txt")
     parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
     parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
     parser.add_option("-q", "--quiet",
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index b294b77e..ce439dfc 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -544,13 +544,13 @@ class DrawHand(Hand):
 
 class StudHand(Hand):
     def __init__(self, hhc, sitename, gametype, handText):
-        if gametype['game'] not in ["razz","stud","stud8"]:
+        if gametype['GAME'] not in ["razz","studhi","stud8"]:
             pass # or indeed don't pass and complain instead
         self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
         self.holeStreets = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
         Hand.__init__(self, sitename, gametype, handText)
-        self.sb = gametype['sb']
-        self.bb = gametype['bb']
+        self.sb = gametype['SB']
+        self.bb = gametype['BB']
         #Populate the StudHand
         #Generally, we call a 'read' method here, which gets the info according to the particular filter (hhc) 
         # which then invokes a 'addXXX' callback
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 2a31a145..e9f03de0 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -148,9 +148,10 @@ class HandHistoryConverter(threading.Thread):
             return
         
         hand = None
-        if gametype['game'] in ("hold", "omahahi"):
+        if gametype['GAME'] in ("hold", "omahahi"):
+            logging.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
             hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)
-        elif gametype['game'] in ("razz","stud","stud8"):
+        elif gametype['GAME'] in ("razz","studhi","stud8"):
             hand = Hand.StudHand(self, self.sitename, gametype, handtext)
         
         if hand: