From 37e098fce9586d73dfee8c3c5b79756716aa5e83 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sat, 31 Jul 2010 14:38:24 +0400
Subject: [PATCH] Fixes for absolute poker

Note: previous xtables's re doesn't match java absolute client
---
 pyfpdb/AbsoluteToFpdb.py | 32 ++++++++++++++++++--------------
 pyfpdb/XTables.py        |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py
index b1cf7ded..02b74edf 100755
--- a/pyfpdb/AbsoluteToFpdb.py
+++ b/pyfpdb/AbsoluteToFpdb.py
@@ -42,10 +42,10 @@ class Absolute(HandHistoryConverter):
 #Seat 6 - FETS63 ($0.75 in chips)
 #Board [10s 5d Kh Qh 8c]
 
-    re_GameInfo     = re.compile(ur"^Stage #([0-9]+): (?P<GAME>Holdem|HORSE)(?: \(1 on 1\)|)?  ?(?P<LIMIT>No Limit|Pot Limit|Normal|)? ?(?P<CURRENCY>\$| €|)(?P<SB>[.0-9]+)/?(?:\$| €|)(?P<BB>[.0-9]+)?", re.MULTILINE)
+    re_GameInfo     = re.compile(ur"^Stage #(C?[0-9]+): (?P<GAME>Holdem|HORSE)(?: \(1 on 1\)|)?  ?(?P<LIMIT>No Limit|Pot Limit|Normal|)? ?(?P<CURRENCY>\$| €|)(?P<SB>[.0-9]+)/?(?:\$| €|)(?P<BB>[.0-9]+)?", re.MULTILINE)
     re_HorseGameInfo = re.compile(ur"^Game Type: (?P<LIMIT>Limit) (?P<GAME>Holdem)", re.MULTILINE)
     # TODO: can set max seats via (1 on 1) to a known 2 .. 
-    re_HandInfo     = re.compile(ur"^Stage #(?P<HID>[0-9]+): .*(?P<DATETIME>\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d).*\n(Table: (?P<TABLE>.*) \(Real Money\))?", re.MULTILINE)
+    re_HandInfo     = re.compile(ur"^Stage #C?(?P<HID>[0-9]+): .*(?P<DATETIME>\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d).*\n(Table: (?P<TABLE>.*) \(Real Money\))?", re.MULTILINE)
     re_TableFromFilename = re.compile(ur".*IHH([0-9]+) (?P<TABLE>.*) -") # on HORSE STUD games, the table name isn't in the hand info!
     re_Button       = re.compile(ur"Seat #(?P<BUTTON>[0-9]) is the ?[dead]* dealer$", re.MULTILINE) # TODO: that's not the right way to match for "dead" dealer is it?
     re_PlayerInfo   = re.compile(ur"^Seat (?P<SEAT>[0-9]) - (?P<PNAME>.*) \((?:\$| €|)(?P<CASH>[0-9]*[.0-9]+) in chips\)", re.MULTILINE)
@@ -96,17 +96,18 @@ class Absolute(HandHistoryConverter):
 
     def determineGameType(self, handText):
         """return dict with keys/values:
-    'type'       in ('ring', 'tour')
-    'limitType'  in ('nl', 'cn', 'pl', 'cp', 'fl')
-    'base'       in ('hold', 'stud', 'draw')
-    'category'   in ('holdem', 'omahahi', omahahilo', 'razz', 'studhi', 'studhilo', 'fivedraw', '27_1draw', '27_3draw', 'badugi')
-    'hilo'       in ('h','l','s')
-    'smallBlind' int?
-    'bigBlind'   int?
-    'smallBet'
-    'bigBet'
-    'currency'  in ('USD', 'EUR', 'T$', <countrycode>)
-or None if we fail to get the info """
+        'type'       in ('ring', 'tour')
+        'limitType'  in ('nl', 'cn', 'pl', 'cp', 'fl')
+        'base'       in ('hold', 'stud', 'draw')
+        'category'   in ('holdem', 'omahahi', omahahilo', 'razz', 'studhi', 'studhilo', 'fivedraw', '27_1draw', '27_3draw', 'badugi')
+        'hilo'       in ('h','l','s')
+        'smallBlind' int?
+        'bigBlind'   int?
+        'smallBet'
+        'bigBet'
+        'currency'  in ('USD', 'EUR', 'T$', <countrycode>)
+
+        or None if we fail to get the info """
         info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
@@ -329,6 +330,9 @@ def validCard(card):
     return card
 
 if __name__ == "__main__":
+    import Configuration
+    config =  Configuration.Config(None)
+
     parser = OptionParser()
     parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
     parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
@@ -345,5 +349,5 @@ if __name__ == "__main__":
     LOG_FILENAME = './logging.out'
     logging.basicConfig(filename=LOG_FILENAME,level=options.verbosity)
 
-    e = Absolute(in_path = options.ipath, out_path = options.opath, follow = options.follow, autostart=True, debugging=True)
+    e = Absolute(config, in_path = options.ipath, out_path = options.opath, follow = options.follow, autostart=True)
 
diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py
index 29a9b1d9..0aac869d 100644
--- a/pyfpdb/XTables.py
+++ b/pyfpdb/XTables.py
@@ -69,7 +69,7 @@ class Table(Table_Window):
         for listing in os.popen('xwininfo -root -tree').readlines():
             if re.search(search_string, listing):
 #                print listing
-                mo = re.match('\s+([\dxabcdef]+) (.+):\s\(\"([a-zA-Z.]+)\".+  (\d+)x(\d+)\+\d+\+\d+  \+(\d+)\+(\d+)', listing)
+                mo = re.match('\s+([\dxabcdef]+) (.+):\s\(\"([a-zA-Z0-9\-.]+)\".+  (\d+)x(\d+)\+\d+\+\d+  \+(\d+)\+(\d+)', listing)
                 self.number = int( mo.group(1), 0)
                 self.width  = int( mo.group(4) )
                 self.height = int( mo.group(5) )