From 40d98b11d9f8313ae68c5286c2ffbd496c628987 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 15 Mar 2009 14:32:52 +0900
Subject: [PATCH] PokerStarsToFpdb - PLO parsing update

---
 pyfpdb/PokerStarsToFpdb.py |  8 ++++----
 pyfpdb/test_PokerStars.py  | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index b7322a1b..8b905005 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -24,9 +24,9 @@ from HandHistoryConverter import *
 # PokerStars HH Format
 
 class PokerStars(HandHistoryConverter):
-    
+
     # Static regexes
-    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
+    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
     re_SplitHands   = re.compile('\n\n+')
     re_HandInfo     = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
     re_Button       = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
@@ -80,7 +80,7 @@ follow :  whether to tail -f the input"""
         info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
-        if not m: 
+        if not m:
             return None
 
         mg = m.groupdict()
@@ -89,7 +89,7 @@ follow :  whether to tail -f the input"""
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         games = {              # base, category
                   "Hold'em" : ('hold','holdem'), 
-                 'Omaha Hi' : ('hold','omahahi'),
+                    'Omaha' : ('hold','omahahi'),
               'Omaha Hi/Lo' : ('hold','omahahilo'),
                      'Razz' : ('stud','razz'), 
               '7 Card Stud' : ('stud','studhi'),
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 85107e6f..53a5fbee 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -4,7 +4,10 @@ from Hand import *
 import py
 
 #regression-test-files/stars/badugi/ring-fl-badugi.txt
-#   s0rrow: start $30.00 end: $22.65 total: ($7.35)
+#   s0rrow: input: $30.00 end: $22.65 total: ($7.35)
+#regression-test-files/stars/plo/PLO-6max.txt
+#   s0rrow: input: $18.35 end: $0 total: ($18.35)
+#   Notes: last hand #25975302416 s0rrow aifp against 2 players
 
 gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}
 text = ""
@@ -30,7 +33,10 @@ def testGameInfo():
     {'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'}),
 
     (u"PokerStars Game #25923772706:  Badugi Limit ($0.25/$0.50) - 2009/03/13 16:40:58 ET",
-    {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'})
+    {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}),
+
+    (u"PokerStars Game #25974627364:  Omaha Pot Limit ($0.05/$0.10) - 2009/03/15 0:29:00 ET",
+    {'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.05', 'bb':'0.10','currency':'USD'})
     )
     for (header, info) in pairs:
         yield checkGameInfo, hhc, header, info