From 0dc1bafdeb81c59c72e0b722c77b3a8af1e917ca Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Mon, 9 Mar 2009 23:03:17 +0000
Subject: [PATCH] gameinfo changes to fit db spec in docs/ some temporary bits,
 broken commit do not use.

---
 pyfpdb/EverleafToFpdb.py       | 72 +++++++++++++++++++++++----------
 pyfpdb/FulltiltToFpdb.py       | 59 +++++++++++++++------------
 pyfpdb/HandHistoryConverter.py | 73 +++++++++++++++++++++++++++++-----
 pyfpdb/PokerStarstoFpdb.py     | 57 ++++++++++++++------------
 pyfpdb/test_Everleaf.py        | 44 ++++++++++----------
 5 files changed, 203 insertions(+), 102 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 37a1eb60..ac61e7f2 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
 #    Copyright 2008, Carl Gherardi
 #    
 #    This program is free software; you can redistribute it and/or modify
@@ -27,13 +28,11 @@ 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_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_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.MULTILINE)
-    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)
-    re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")
+    re_GameInfo    = re.compile(ur"^(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(ur".*#(?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>.+$)")
+    re_Button      = re.compile(ur"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
+    re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|)|new player|All-in) \)", re.MULTILINE)
+    re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
     
     
     def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
@@ -72,29 +71,58 @@ follow :  whether to tail -f the input"""
                ]
 
     def determineGameType(self, handText):
-        info = {}
+        """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 """
+        #(TODO: which parts are optional/required?)
+    
+        # 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
+        info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
         if not m: 
             return None
 
-        info.update(m.groupdict())
+        mg = m.groupdict()
         
+        # translations from captured groups to our info strings
         limits = { 'NL':'nl', 'PL':'pl', '':'fl' }
-        games = { 'Hold\'em':'hold', 'Omaha':'omahahi', 'Razz':'razz','7 Card Stud':'studhi' }
+        games = {              # base, category
+                  "Hold'em" : ('hold','holdem'), 
+                    'Omaha' : ('hold','omahahi'), 
+                     'Razz' : ('stud','razz'), 
+              '7 Card Stud' : ('stud','studhi')
+               }
         currencies = { u' €':'EUR', '$':'USD', '':'T$' }
-        for key in info:
-            if key == 'limit':
-                info[key] = limits[info[key]]
-            if key == 'game':
-                info[key] = games[info[key]]
-            if key == 'sb':
-                pass
-            if key == 'bb':
-                pass
-            if key == 'currency':
-                info[key] = currencies[info[key]]
-
+        if 'LIMIT' in mg:
+            info['limitType'] = limits[mg['LIMIT']]
+        if 'GAME' in mg:
+            (info['base'], info['category']) = games[mg['GAME']]
+        if 'SB' in mg:
+            info['sb'] = mg['SB']
+        if 'BB' in mg:
+            info['bb'] = mg['BB']
+        if 'CURRENCY' in mg:
+            info['currency'] = currencies[mg['CURRENCY']]
+        # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
+        
         return info
 
 
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 51464e03..85842661 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
 #    Copyright 2008, Carl Gherardi
 #    
 #    This program is free software; you can redistribute it and/or modify
@@ -24,7 +26,7 @@ from HandHistoryConverter import *
 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_GameInfo     = re.compile('- (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (Ante \$(?P<ANTE>[.0-9]+) )?- (?P<LIMIT>(No Limit|Pot Limit|Limit))? (?P<GAME>(Hold\'em|Omaha Hi|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.MULTILINE)
@@ -44,7 +46,8 @@ follow :  whether to tail -f the input"""
             self.start()
 
 
-    def compilePlayerRegexs(self,  players):
+    def compilePlayerRegexs(self,  hand):
+        players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
             # we need to recompile the player regexs.
             self.compiledPlayers = players
@@ -76,30 +79,36 @@ follow :  whether to tail -f the input"""
         # 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
         # Full Tilt Poker Game #10809877615: Table Danville - $0.50/$1 Ante $0.10 - Limit Razz - 21:47:27 ET - 2009/02/23
-        structure = "" # nl, pl, cn, cp, fl
-        game      = ""
-
-
-        m = self.re_GameInfo.search(handText)
-        if m.group('LTYPE') == "No ":
-            structure = "nl"
-        elif m.group('LTYPE') == "Pot ":
-            structure = "pl"
-        elif m.group('LTYPE') == None:
-            structure = "fl"
-
-        if m.group('GAME') == "Hold\'em":
-            game = "hold"
-        elif m.group('GAME') == "Omaha":
-            game = "omahahi"
-        elif m.group('GAME') == "Razz":
-            game = "razz"
-
-        logging.debug("HandInfo: %s", m.groupdict())
-
-        gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
+        info = {'type':'ring'}
         
-        return gametype
+        m = self.re_GameInfo.search(handText)
+        if not m: 
+            return None
+
+        mg = m.groupdict()
+        
+        # translations from captured groups to our info strings
+        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
+        games = {              # base, category
+                  "Hold'em" : ('hold','holdem'), 
+                 'Omaha Hi' : ('hold','omahahi'), 
+                     'Razz' : ('stud','razz'), 
+              '7 Card Stud' : ('stud','studhi')
+               }
+        currencies = { u' €':'EUR', '$':'USD', '':'T$' }
+        if 'LIMIT' in mg:
+            info['limitType'] = limits[mg['LIMIT']]
+        if 'GAME' in mg:
+            (info['base'], info['category']) = games[mg['GAME']]
+        if 'SB' in mg:
+            info['sb'] = mg['SB']
+        if 'BB' in mg:
+            info['bb'] = mg['BB']
+        if 'CURRENCY' in mg:
+            info['currency'] = currencies[mg['CURRENCY']]
+        # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
+        
+        return info
 
     def readHandInfo(self, hand):
         m =  self.re_HandInfo.search(hand.handText,re.DOTALL)
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 4a549ba8..b0f30596 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -109,6 +109,17 @@ class HandHistoryConverter(threading.Thread):
         return tmp
 
     def run(self):
+        for handtext in self.readHands():
+            self.processHand(handText)
+            
+    def readHands(self):
+    """yield a hand at a time from the input specified by in_path.
+If in follow mode, wait for more data to turn up.
+Otherwise, raise the no more things exception..."""
+        while True:
+            where = file.tell()
+            lines = file.readlines(1000)
+            
         if self.follow:
             for handtext in self.tailHands():
                 self.processHand(handtext)
@@ -119,14 +130,43 @@ class HandHistoryConverter(threading.Thread):
                 self.processHand(handtext)
             if self.out_fh != sys.stdout:
                 self.ouf_fh.close()
+                
+    def paragraphs(file, separator=None):
+        if not callable(separator):
+            def separator(line): return line == '\n'
+        paragraph = []
+        for line in file:
+            if separator(line):
+                if paragraph:
+                    yield ''.join(paragraph)
+                    paragraph = []
+            else:
+                paragraph.append(line)
+        if paragraph: yield ''.join(paragraph)
+
+
+def tail_f(file):
+  interval = 1.0
+
+  while True:
+    where = file.tell()
+    lines = file.readlines(1000)
+    if not lines:
+      time.sleep(interval)
+      file.seek(where)
+    else:
+      yield line
+
 
     def tailHands(self):
         """pseudo-code"""
+        interval = 1.0
         while True:
-            ifile.tell()
-            text = ifile.read()
-            if nomoretext:
-                wait or sleep
+            pos = ifile.tell()
+            text = ifile.readlines(1000)
+            if not text:
+                time.sleep(interval)
+                ifile.seek(pos)
             else:
                 ahand = thenexthandinthetext
                 yield(ahand)
@@ -148,11 +188,13 @@ class HandHistoryConverter(threading.Thread):
             return
         
         hand = None
-        if gametype['game'] in ("hold", "omaha"):
+        if gametype['base'] == 'hold':
             hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)
-        elif gametype['game'] in ("razz","stud","stud8"):
+        elif gametype['base'] == 'stud':
             hand = Hand.StudHand(self, self.sitename, gametype, handtext)
-        
+        elif gametype['base'] == 'draw':
+            hand = Hand.DrawHand(self, self.sitename, gametype, handtext)
+
         if hand:
             hand.writeHand(self.out_fh)
         else:
@@ -248,6 +290,19 @@ class HandHistoryConverter(threading.Thread):
     # [ ring, hold, nl   , sb, bb ]
     # Valid types specified in docs/tabledesign.html in Gametypes
     def determineGameType(self): abstract
+    """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 """
+    #TODO: which parts are optional/required?
 
     # Read any of:
     # HID       HandID
@@ -330,8 +385,8 @@ class HandHistoryConverter(threading.Thread):
             hands = hands + [Hand.Hand(self.sitename, self.gametype, l)]
         return hands
 
-    def readFile(self):
-        """Read in_path into self.obs or self.doc"""
+    def openFile(self):
+        """open in_path according to self.codepage"""
         
         if(self.filetype == "text"):
             if self.in_path == '-':
diff --git a/pyfpdb/PokerStarstoFpdb.py b/pyfpdb/PokerStarstoFpdb.py
index 49d016ec..d74b9898 100755
--- a/pyfpdb/PokerStarstoFpdb.py
+++ b/pyfpdb/PokerStarstoFpdb.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
 #    Copyright 2008, Carl Gherardi
 #    
 #    This program is free software; you can redistribute it and/or modify
@@ -67,7 +69,7 @@ from HandHistoryConverter import *
 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) (?P<LTYPE>No Limit|Limit|Pot Limit),? \(?\$?(?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) (?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)
@@ -88,7 +90,8 @@ follow :  whether to tail -f the input"""
             self.start()
 
         
-    def compilePlayerRegexs(self,  players):
+    def compilePlayerRegexs(self,  hand):
+    players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
             # we need to recompile the player regexs.
             self.compiledPlayers = players
@@ -111,33 +114,37 @@ follow :  whether to tail -f the input"""
         return []
 
     def determineGameType(self, handText):
-        game = None
-        structure = None
-        sb = None
-        bb = None
-        info = {}
+        info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
-        if m: 
-            info.update(m.groupdict())
-        else:
+        if not m: 
             return None
-            
+
+        mg = m.groupdict()
         
-        ltypes = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
-        gtypes = { 'Hold\'em':'hold', 'Omaha':'omahahi', 'Razz':'razz','7 Card Stud':'studhi' }
-        for key in info:
-            if key == 'LTYPE':
-                structure = ltypes[info[key]]
-            if key == 'GAME':
-                game = gtypes[info[key]]
-            if key == 'SB':
-                sb = info[key]
-            if key == 'BB':
-                bb = info[key]
-            
-        gametype = ["ring", game, structure, sb, bb]
-        return gametype
+        # translations from captured groups to our info strings
+        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
+        games = {              # base, category
+                  "Hold'em" : ('hold','holdem'), 
+                 'Omaha Hi' : ('hold','omahahi'), 
+                     'Razz' : ('stud','razz'), 
+              '7 Card Stud' : ('stud','studhi')
+               }
+        currencies = { u'€':'EUR', '$':'USD', '':'T$' }
+        if 'LIMIT' in mg:
+            info['limitType'] = limits[mg['LIMIT']]
+        if 'GAME' in mg:
+            (info['base'], info['category']) = games[mg['GAME']]
+        if 'SB' in mg:
+            info['sb'] = mg['SB']
+        if 'BB' in mg:
+            info['bb'] = mg['BB']
+        if 'CURRENCY' in mg:
+            info['currency'] = currencies[mg['CURRENCY']]
+        # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
+        
+        return info
+
 
     def readHandInfo(self, hand):
         info = {}
diff --git a/pyfpdb/test_Everleaf.py b/pyfpdb/test_Everleaf.py
index 7bd2541a..ee77910f 100644
--- a/pyfpdb/test_Everleaf.py
+++ b/pyfpdb/test_Everleaf.py
@@ -1,36 +1,38 @@
 # -*- coding: utf-8 -*-
 import EverleafToFpdb
 import py
-class TestEverleaf:
-    def testGameInfo1(self):
-        e = EverleafToFpdb.Everleaf(autostart=False)
-        g = """Everleaf Gaming Game #3732225
+
+
+def checkGameInfo(hhc, header, info):
+    assert hhc.determineGameType(header) == info
+
+def testGameInfo():
+    hhc = EverleafToFpdb.Everleaf(autostart=False)    
+    pairs = (
+    (u"""Everleaf Gaming Game #3732225
 ***** Hand history for game #3732225 *****
 Blinds  €0.50/ €1 NL Hold'em - 2009/01/11 - 16:09:40
 Table Casino Lyon Vert 58
 Seat 3 is the button
-Total number of players: 6"""
-        assert e.determineGameType(g) == {'sb':'0.50', 'bb':'1','game':"hold", 'currency':'EUR', 'limit':'nl'}
-
-        
-    def testGameInfo2(self):
-        e = EverleafToFpdb.Everleaf(autostart=False)
-        g = """Everleaf Gaming Game #55198191
+Total number of players: 6""",
+            {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'0.50', 'bb':'1', 'currency':'EUR'}),
+    ("""Everleaf Gaming Game #55198191
 ***** Hand history for game #55198191 *****
 Blinds $0.50/$1 NL Hold'em - 2008/09/01 - 10:02:11
 Table Speed Kuala
 Seat 8 is the button
-Total number of players: 10"""
-        assert e.determineGameType(g) == {'sb':'0.50', 'bb':'1','game':"hold", 'currency':'USD', 'limit':'nl'}
-
-    def testGameInfo3(self):
-        # Note: It looks difficult to distinguish T$ from play money.
-        e = EverleafToFpdb.Everleaf(autostart=False)
-        g = """Everleaf Gaming Game #75065769
+Total number of players: 10""",
+            {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'0.50', 'bb':'1', 'currency':'USD'}),
+    ("""Everleaf Gaming Game #75065769
 ***** Hand history for game #75065769 *****
 Blinds 10/20 NL Hold'em - 2009/02/25 - 17:30:32
 Table 2
 Seat 1 is the button
-Total number of players: 10"""
-        assert e.determineGameType(g) == {'sb':'10', 'bb':'20','game':"hold", 'currency':'T$', 'limit':'nl'}
-        
\ No newline at end of file
+Total number of players: 10""",
+            {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'10', 'bb':'20', 'currency':'T$'})
+    )
+    for (header, info) in pairs:
+        yield checkGameInfo, hhc, header, info
+
+
+