From 9d7395a61c6a6b8c9ba4a9ab3b3b156e9c6dda36 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 11 Mar 2009 23:10:31 -0400
Subject: [PATCH 01/14] unbreak psuedo-recursion

---
 pyfpdb/fpdb_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index d86c4214..54b48dee 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -200,7 +200,7 @@ class Importer:
                 self.updated[file] = time()
                 # If modified in the last minute run an immediate import.
                 # This codepath only runs first time the file is found.
-                if (time() - stat_info.st_mtime) < 60:
+                if os.path.isdir(file) or (time() - stat_info.st_mtime) < 60:
                     # TODO attach a HHC thread to the file
                     # TODO import the output of the HHC thread  -- this needs to wait for the HHC to block?
                     self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])

From ff675fb3aea6282ba82eae564045e018996ac4a7 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Thu, 12 Mar 2009 03:15:34 +0000
Subject: [PATCH 02/14] import working?

---
 pyfpdb/Hand.py        | 4 ----
 pyfpdb/fpdb_import.py | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index f77b9425..9591525e 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -102,10 +102,6 @@ If a player has None chips he won't be added."""
         else:
             logging.error("markstreets didn't match")
 
-#def addHoleCards -- to Holdem subclass
-
-
-
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
             print "checkPlayerExists", player, "fail"
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index d86c4214..15c25ac8 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -252,9 +252,9 @@ class Importer:
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
             #gt = conv.determineGameType()
             # TODO: Check that gt is in supp - error appropriately if not
-            conv.processFile()
+            #conv.processFile()
             if(conv.getStatus()):
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
+                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
             else:
                 # conversion didn't work
                 # TODO: appropriate response?

From cd3d4ef835d90fb4d0f517b3d48dd2309e38206a Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Thu, 12 Mar 2009 03:58:42 +0000
Subject: [PATCH 03/14] no longer 'safely' appends -- will now overwrite
 out_path.

---
 pyfpdb/HandHistoryConverter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 7ed679a4..a627766e 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -90,7 +90,7 @@ class HandHistoryConverter(threading.Thread):
         else:
             # TODO: out_path should be sanity checked before opening. Perhaps in fpdb_import?
             # I'm not sure what we're looking for, although we don't want out_path==in_path!='-'
-            self.out_fh = open(self.out_path, 'a') #TODO: append may be overly conservative.
+            self.out_fh = open(self.out_path, 'w') # doomswitch is now on :|
         self.sitename  = sitename
         self.follow = follow
         self.compiledPlayers   = set()

From fbbd2c4d5cc0d7b795b85b8ba547eb3f91393a1a Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Thu, 12 Mar 2009 00:10:34 -0400
Subject: [PATCH 04/14] asdfsadfsadfasdfsadf

---
 pyfpdb/Database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 11038a68..4abac8ec 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -149,7 +149,7 @@ class Database:
             cv = "card%dValue" % i
             if cv not in d or d[cv] == None:
                 break
-            elif d[key] == 0:
+            elif d[cv] == 0:
                 cards += "xx"
             else:
                 cs = "card%dSuit" % i

From 02c5cfb39eff8f5c2c054f8078805c58d4640ca3 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Thu, 12 Mar 2009 01:18:31 -0400
Subject: [PATCH 05/14] remove call to hhc.processFile as someone removed that
 function

---
 pyfpdb/fpdb_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 54b48dee..6adf3ec4 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -252,7 +252,7 @@ class Importer:
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
             #gt = conv.determineGameType()
             # TODO: Check that gt is in supp - error appropriately if not
-            conv.processFile()
+#            conv.processFile()
             if(conv.getStatus()):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
             else:

From 76ca6beab01857647aaa1fd775af76807652026c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 15:17:46 +0900
Subject: [PATCH 06/14] Update Betfair importer a bit

No longer crashes on test file, but doesn't actually import anything
yet.
---
 pyfpdb/BetfairToFpdb.py  | 253 +++++++++++++++++++++------------------
 pyfpdb/FulltiltToFpdb.py |   1 -
 2 files changed, 138 insertions(+), 116 deletions(-)

diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py
index 6fd6b984..a4420434 100755
--- a/pyfpdb/BetfairToFpdb.py
+++ b/pyfpdb/BetfairToFpdb.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: iso-8859-15 -*-
+# -*- coding: utf-8 -*-
+#
 #    Copyright 2008, Carl Gherardi
 #    
 #    This program is free software; you can redistribute it and/or modify
@@ -18,111 +19,103 @@
 ########################################################################
 
 import sys
-import Configuration
+import logging
 from HandHistoryConverter import *
 
 # Betfair HH format
 
-#***** Betfair Poker Hand History for Game 466894418 *****
-#NL $0.02/$0.04 Texas Hold'em - Tuesday, January 13, 18:58:55 GMT 2009
-#Table Rookie 102 6-max (Real Money)
-#Seat 1 is the button
-#Total number of active players : 3
-#Seat 1: wilco16 ( $5.12 )
-#Seat 2: fredo2003 ( $6.12 )
-#Seat 4: Didlidaa ( $3.61 )
-#Seat 5: Heck ( $4.47 )
-#Seat 6: MoDDe200009 ( $0 )
-#Didlidaa posts big blind [$0.04]
-#** Dealing down cards **
-#Heck calls [$0.04]
-#wilco16 calls [$0.04]
-#Didlidaa checks
-#** Dealing Flop ** [ 2c, Kd, Jh ]
-#Didlidaa checks
-#Heck checks
-#wilco16 checks
-#** Dealing Turn ** [ 5c ]
-#Didlidaa checks
-#Heck bets [$0.12]
-#wilco16 folds
-#Didlidaa calls [$0.12]
-#** Dealing River ** [ Kc ]
-#Didlidaa checks
-#Heck bets [$0.18]
-#Didlidaa calls [$0.18]
-#** Showdown **
-#Heck shows [ Qs, 6c ] a pair of Kings
-#Didlidaa shows [ Ad, 5h ] two pair, Kings and Fives
-#** Hand Conclusion **
-#Didlidaa wins $0.69 from main pot with two pair, Kings and Fives
-#************  Game 466894418 ends  ************
-
-
 class Betfair(HandHistoryConverter):
-    def __init__(self, config, file):
-        print "Initialising Betfair converter class"
-        HandHistoryConverter.__init__(self, config, file, sitename="Betfair") # Call super class init.
-        self.sitename = "Betfair"
-        self.setFileType("text", "cp1252")
-        self.rexx.setGameInfoRegex('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
-        self.rexx.setSplitHandRegex('\n\n+')
-        self.rexx.setHandInfoRegex('.*#(?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]+)\nSeat (?P<BUTTON>[0-9]+)')
-        self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
-        self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*): posts small blind \[\$? (?P<SB>[.0-9]+)')
-        self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
-        self.rexx.setPostBothRegex('.*\n(?P<PNAME>.*): posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)')
-        self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<CARDS>.*) \]')
-        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?')
-        self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[ (?P<CARDS>.*) \]')
-        self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?')
-        #self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) USD(.*\[ (?P<CARDS>) \S\S, \S\S, \S\S, \S\S, \S\S \])?')
-        self.rexx.sits_out_re = re.compile('(?P<PNAME>.*) sits out')
-        self.rexx.compileRegexes()
+
+    # Static regexes
+    re_GameInfo      = re.compile('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
+    re_SplitHands    = re.compile(r'\n\n+')
+    re_HandInfo      = re.compile('.*#(?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]+)\nSeat (?P<BUTTON>[0-9]+)')
+    re_Button        = re.compile('asdfsadfasdf')
+    re_PlayerInfo    = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
+    re_Board         = re.compile('asdfasdfasdf')
+
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
+        """\
+in_path   (default '-' = sys.stdin)
+out_path  (default '-' = sys.stdout)
+follow :  whether to tail -f the input"""
+        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Betfair", follow=follow) # Call super class init.
+        logging.info("Initialising Betfair converter class")
+        self.filetype = "text"
+        self.codepage = "cp1252"
+        if autostart:
+            self.start()
+
+
+    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
+            player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
+            logging.debug("player_re: " + player_re)
+            self.re_PostSB          = re.compile("^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_PostBB          = re.compile("^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_Antes           = re.compile("^%s antes asdf sadf sadf" % player_re, re.MULTILINE)
+            self.re_BringIn         = re.compile("^%s antes asdf sadf sadf" % player_re, re.MULTILINE)
+            self.re_PostBoth        = re.compile("^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_HeroCards       = re.compile("^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
+            self.re_Action          = re.compile("^%s: (?P<ATYPE>bets|checks|raises|calls|folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?" % player_re, re.MULTILINE)
+            self.re_ShowdownAction  = re.compile("^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
+            self.re_CollectPot      = re.compile("^%s wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
+            self.re_SitsOut         = re.compile("^%s sits out" % player_re, re.MULTILINE)
+            self.re_ShownCards      = re.compile(r"asdfasdfa" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
-        pass
+        return [["ring", "hold", "nl"]
+               ]
 
-    def determineGameType(self):
-        # Cheating with this regex, only support nlhe at the moment
-        gametype = ["ring", "hold", "nl"]
+    def determineGameType(self, handText):
+        info = {'type':'ring'}
 
-        m = self.rexx.game_info_re.search(self.obs)
-        gametype = gametype + [m.group('SB')]
-        gametype = gametype + [m.group('BB')]
-        
-        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.rexx.hand_info_re.search(hand.string)
+        m = elf.re_HandInfo.search(hand.handText,re.DOTALL)
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
-# These work, but the info is already in the Hand class - should be used for tourneys though.
-#		m.group('SB')
-#		m.group('BB')
-#		m.group('GAMETYPE')
-
-# Betfair HH files in GMT
-# Stars format (Nov 10 2008): 2008/11/07 12:38:49 CET [2008/11/07 7:38:49 ET]
-# or                        : 2008/11/07 12:38:49 ET
-# Not getting it in my HH files yet, so using
-# 2008/11/10 3:58:52 ET
-#TODO: Do conversion from GMT to ET
-#TODO: Need some date functions to convert to different timezones (Date::Manip for perl rocked for this)
         hand.starttime = time.strptime(m.group('DATETIME'), "%Y/%m/%d - %H:%M:%S")
-        hand.buttonpos = int(m.group('BUTTON'))
+        #hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
-        m = self.rexx.player_info_re.finditer(hand.string)
+        m = self.re_PlayerInfo.finditer(hand.handText)
         players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
     def markStreets(self, hand):
-        # PREFLOP = ** Dealing down cards **
-        # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
-        #m = re.search('(\*\* Dealing down cards \*\*\n)(?P<PREFLOP>.*?\n\*\*)?( Dealing Flop \*\* \[ (?P<FLOP1>\S\S), (?P<FLOP2>\S\S), (?P<FLOP3>\S\S) \])?(?P<FLOP>.*?\*\*)?( Dealing Turn \*\* \[ (?P<TURN1>\S\S) \])?(?P<TURN>.*?\*\*)?( Dealing River \*\* \[ (?P<RIVER1>\S\S) \])?(?P<RIVER>.*)', hand.string,re.DOTALL)
-
         m =  re.search(r"\*\* Dealing down cards \*\*(?P<PREFLOP>.+(?=\*\* Dealing Flop \*\*)|.+)"
                        r"(\*\* Dealing Flop \*\*(?P<FLOP> \[ \S\S, \S\S, \S\S \].+(?=\*\* Dealing Turn \*\*)|.+))?"
                        r"(\*\* Dealing Turn \*\*(?P<TURN> \[ \S\S \].+(?=\*\* Dealing River \*\*)|.+))?"
@@ -132,10 +125,8 @@ class Betfair(HandHistoryConverter):
             
 
     def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
-        self.rexx.board_re = re.compile(r"\[ (?P<CARDS>.+) \]")
-        print hand.streets.group(street)
         if street in ('FLOP','TURN','RIVER'):   # a list of streets which get dealt community cards (i.e. all but PREFLOP)
-            m = self.rexx.board_re.search(hand.streets.group(street))
+            m = self.re_Board.search(hand.streets[street])
             hand.setCommunityCards(street, m.group('CARDS').split(', '))
 
     def readBlinds(self, hand):
@@ -149,6 +140,23 @@ class Betfair(HandHistoryConverter):
         for a in self.rexx.both_blinds_re.finditer(hand.string):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
+    def readAntes(self, hand):
+        logging.debug("reading antes")
+        for player in m:
+            logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
+            hand.addAnte(player.group('PNAME'), player.group('ANTE'))
+
+    def readBringIn(self, hand):
+        m = self.re_BringIn.search(hand.handText,re.DOTALL)
+        if m:
+            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
+            hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
+        else:
+            logging.warning("No bringin found")
+
+    def readButton(self, hand):
+        hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
+
     def readHeroCards(self, hand):
         m = self.rexx.hero_cards_re.search(hand.string)
         if(m == None):
@@ -159,51 +167,66 @@ class Betfair(HandHistoryConverter):
             # "2c, qh" -> set(["2c","qc"])
             # Also works with Omaha hands.
             cards = m.group('CARDS')
-            cards = set(cards.split(', '))
+            cards = [c.strip() for c in cards.split(' ')]
             hand.addHoleCards(cards, m.group('PNAME'))
 
+    def readStudPlayerCards(self, hand, street):
+        # balh blah blah
+        pass
+
     def readAction(self, hand, street):
-        m = self.rexx.action_re.finditer(hand.streets.group(street))
+        m = self.re_Action.finditer(hand.streets[street])
         for action in m:
-            if action.group('ATYPE') == ' raises':
-                hand.addCallandRaise( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == ' calls':
-                hand.addCall( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == ': bets':
-                hand.addBet( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == ' folds':
-                hand.addFold( street, action.group('PNAME'))
-            elif action.group('ATYPE') == ' checks':
-                hand.addCheck( street, action.group('PNAME'))
+            if action.group('ATYPE') == ' raises to':
+                hand.addRaiseTo( street, action.group('PNAME'), action.group('BET') )
+#            elif action.group('ATYPE') == ' completes it to':
+#                hand.addComplete( street, action.group('PNAME'), action.group('BET') )
+#            elif action.group('ATYPE') == ' calls':
+#                hand.addCall( street, action.group('PNAME'), action.group('BET') )
+#            elif action.group('ATYPE') == ' bets':
+#                hand.addBet( street, action.group('PNAME'), action.group('BET') )
+#            elif action.group('ATYPE') == ' folds':
+#                hand.addFold( street, action.group('PNAME'))
+#            elif action.group('ATYPE') == ' checks':
+#                hand.addCheck( street, action.group('PNAME'))
             else:
-                print "DEBUG: unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)
+                print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
 
 
     def readShowdownActions(self, hand):
-        for shows in self.rexx.showdown_action_re.finditer(hand.string):            
+        for shows in self.re_ShowdownAction.finditer(hand.handText):
             cards = shows.group('CARDS')
-            cards = set(cards.split(', '))
+            cards = cards.split(', ')
             hand.addShownCards(cards, shows.group('PNAME'))
 
     def readCollectPot(self,hand):
-        for m in self.rexx.collect_pot_re.finditer(hand.string):
+        for m in self.re_CollectPot.finditer(hand.handText):
             hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
 
     def readShownCards(self,hand):
-        for m in self.rexx.collect_pot_re.finditer(hand.string):
+        for m in self.re_ShownCards.finditer(hand.handText):
             if m.group('CARDS') is not None:
                 cards = m.group('CARDS')
-                cards = set(cards.split(', '))
+                cards = cards.split(', ')
                 hand.addShownCards(cards=None, player=m.group('PNAME'), holeandboard=cards)
 
 
-
 if __name__ == "__main__":
-    c = Configuration.Config()
-    if len(sys.argv) ==  1:
-        testfile = "regression-test-files/betfair/befair.02.04.txt"
-    else:
-        testfile = sys.argv[1]
-    e = Betfair(c, testfile)
-    e.processFile()
-    print str(e)
+    parser = OptionParser()
+    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="regression-test-files/betfair/befair.02.04.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",
+                  action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
+    parser.add_option("-v", "--verbose",
+                  action="store_const", const=logging.INFO, dest="verbosity")
+    parser.add_option("--vv",
+                  action="store_const", const=logging.DEBUG, dest="verbosity")
+
+    (options, args) = parser.parse_args()
+
+    LOG_FILENAME = './logging.out'
+    logging.basicConfig(filename=LOG_FILENAME,level=options.verbosity)
+
+    e = Betfair(in_path = options.ipath, out_path = options.opath, follow = options.follow)
+
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 213f7ecc..7be43285 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -75,7 +75,6 @@ follow :  whether to tail -f the input"""
                ]
 
     def determineGameType(self, handText):
-        # Cheating with this regex, only support nlhe at the moment
         # Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22
         # 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

From 19ec7662e1ca4104535e1ef5551df6b9947d5916 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 17:26:15 +0900
Subject: [PATCH 07/14] BetfairToFpdb - HandInfo regex

---
 pyfpdb/BetfairToFpdb.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py
index a4420434..77434ecb 100755
--- a/pyfpdb/BetfairToFpdb.py
+++ b/pyfpdb/BetfairToFpdb.py
@@ -27,9 +27,9 @@ from HandHistoryConverter import *
 class Betfair(HandHistoryConverter):
 
     # Static regexes
-    re_GameInfo      = re.compile('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
+    re_GameInfo      = re.compile("^(?P<LIMIT>NL|PL|) (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAME>(Texas Hold\'em|Omaha Hi|Razz))", re.MULTILINE)
     re_SplitHands    = re.compile(r'\n\n+')
-    re_HandInfo      = re.compile('.*#(?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]+)\nSeat (?P<BUTTON>[0-9]+)')
+    re_HandInfo      = re.compile("\*\*\*\*\* Betfair Poker Hand History for Game (?P<HID>[0-9]+) \*\*\*\*\*\n(?P<LIMIT>NL|PL|) (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>(Texas Hold\'em|Omaha Hi|Razz)) - (?P<DATETIME>[a-zA-Z]+, [a-zA-Z]+ \d+, \d\d:\d\d:\d\d GMT \d\d\d\d)\nTable (?P<TABLE>[ a-zA-Z0-9]+) \d-max \(Real Money\)\nSeat (?P<BUTTON>[0-9]+)", re.MULTILINE)
     re_Button        = re.compile('asdfsadfasdf')
     re_PlayerInfo    = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
     re_Board         = re.compile('asdfasdfasdf')
@@ -75,17 +75,18 @@ follow :  whether to tail -f the input"""
 
         m = self.re_GameInfo.search(handText)
         if not m:
+            logging.info('GameInfo regex did not match')
             return None
 
         mg = m.groupdict()
 
         # translations from captured groups to our info strings
-        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
+        limits = { 'NL':'nl', 'PL':'pl', 'Limit':'fl' }
         games = {              # base, category
-                  "Hold'em" : ('hold','holdem'),
-                 'Omaha Hi' : ('hold','omahahi'),
-                     'Razz' : ('stud','razz'),
-              '7 Card Stud' : ('stud','studhi')
+                  "Texas 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:
@@ -103,10 +104,15 @@ follow :  whether to tail -f the input"""
         return info
 
     def readHandInfo(self, hand):
-        m = elf.re_HandInfo.search(hand.handText,re.DOTALL)
+        m = self.re_HandInfo.search(hand.handText)
+        if(m == None):
+            logging.info("Didn't match re_HandInfo")
+            logging.info(hand.handText)
+            return None
+        logging.debug("HID %s, Table %s" % (m.group('HID'),  m.group('TABLE')))
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
-        hand.starttime = time.strptime(m.group('DATETIME'), "%Y/%m/%d - %H:%M:%S")
+        hand.starttime = time.strptime(m.group('DATETIME'), "%A, %B %d, %H:%M:%S GMT %Y")
         #hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):

From 8126972731658d43a9ce5160b3bffb5e5108881e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 18:23:20 +0900
Subject: [PATCH 08/14] Betfair update. Now doesn't crash on test file.

Board and Hero cards are read. Actions all appear to be failing.
---
 pyfpdb/BetfairToFpdb.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py
index 77434ecb..e532b86b 100755
--- a/pyfpdb/BetfairToFpdb.py
+++ b/pyfpdb/BetfairToFpdb.py
@@ -30,9 +30,9 @@ class Betfair(HandHistoryConverter):
     re_GameInfo      = re.compile("^(?P<LIMIT>NL|PL|) (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAME>(Texas Hold\'em|Omaha Hi|Razz))", re.MULTILINE)
     re_SplitHands    = re.compile(r'\n\n+')
     re_HandInfo      = re.compile("\*\*\*\*\* Betfair Poker Hand History for Game (?P<HID>[0-9]+) \*\*\*\*\*\n(?P<LIMIT>NL|PL|) (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>(Texas Hold\'em|Omaha Hi|Razz)) - (?P<DATETIME>[a-zA-Z]+, [a-zA-Z]+ \d+, \d\d:\d\d:\d\d GMT \d\d\d\d)\nTable (?P<TABLE>[ a-zA-Z0-9]+) \d-max \(Real Money\)\nSeat (?P<BUTTON>[0-9]+)", re.MULTILINE)
-    re_Button        = re.compile('asdfsadfasdf')
-    re_PlayerInfo    = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
-    re_Board         = re.compile('asdfasdfasdf')
+    re_Button        = re.compile(ur"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
+    re_PlayerInfo    = re.compile("Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*)\s\(\s(\$(?P<CASH>[.0-9]+)) \)")
+    re_Board         = re.compile(ur"\[ (?P<CARDS>.+) \]")
 
     def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
         """\
@@ -64,7 +64,7 @@ follow :  whether to tail -f the input"""
             self.re_ShowdownAction  = re.compile("^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
             self.re_CollectPot      = re.compile("^%s wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile("^%s sits out" % player_re, re.MULTILINE)
-            self.re_ShownCards      = re.compile(r"asdfasdfa" % player_re, re.MULTILINE)
+            self.re_ShownCards      = re.compile(r"%s (?P<SEAT>[0-9]+) (?P<CARDS>adsfasdf)" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"]
@@ -117,15 +117,18 @@ follow :  whether to tail -f the input"""
 
     def readPlayerStacks(self, hand):
         m = self.re_PlayerInfo.finditer(hand.handText)
-        players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
+        #Shouldn't really dip into the Hand object, but i've no idea how to tell the length of iter m
+        if len(hand.players) < 2:
+            logging.info("readPlayerStacks: Less than 2 players found in a hand")
+
     def markStreets(self, hand):
         m =  re.search(r"\*\* Dealing down cards \*\*(?P<PREFLOP>.+(?=\*\* Dealing Flop \*\*)|.+)"
                        r"(\*\* Dealing Flop \*\*(?P<FLOP> \[ \S\S, \S\S, \S\S \].+(?=\*\* Dealing Turn \*\*)|.+))?"
                        r"(\*\* Dealing Turn \*\*(?P<TURN> \[ \S\S \].+(?=\*\* Dealing River \*\*)|.+))?"
-                       r"(\*\* Dealing River \*\*(?P<RIVER> \[ \S\S \].+))?", hand.string,re.DOTALL)
+                       r"(\*\* Dealing River \*\*(?P<RIVER> \[ \S\S \].+))?", hand.handText,re.DOTALL)
 
         hand.addStreets(m)
             
@@ -137,13 +140,13 @@ follow :  whether to tail -f the input"""
 
     def readBlinds(self, hand):
         try:
-            m = self.rexx.small_blind_re.search(hand.string)
+            m = self.re_PostSB.search(hand.handText)
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         except: # no small blind
             hand.addBlind(None, None, None)
-        for a in self.rexx.big_blind_re.finditer(hand.string):
+        for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
-        for a in self.rexx.both_blinds_re.finditer(hand.string):
+        for a in self.re_PostBoth.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
     def readAntes(self, hand):
@@ -164,7 +167,7 @@ follow :  whether to tail -f the input"""
         hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
 
     def readHeroCards(self, hand):
-        m = self.rexx.hero_cards_re.search(hand.string)
+        m = self.re_HeroCards.search(hand.handText)
         if(m == None):
             #Not involved in hand
             hand.involved = False
@@ -173,7 +176,7 @@ follow :  whether to tail -f the input"""
             # "2c, qh" -> set(["2c","qc"])
             # Also works with Omaha hands.
             cards = m.group('CARDS')
-            cards = [c.strip() for c in cards.split(' ')]
+            cards = [c.strip() for c in cards.split(',')]
             hand.addHoleCards(cards, m.group('PNAME'))
 
     def readStudPlayerCards(self, hand, street):

From bb2104e5f8f9541d4435717a3deb4b4c25f9ac2e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 18:38:48 +0900
Subject: [PATCH 09/14] First successful Betfair import

---
 pyfpdb/BetfairToFpdb.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py
index e532b86b..bc1d17c9 100755
--- a/pyfpdb/BetfairToFpdb.py
+++ b/pyfpdb/BetfairToFpdb.py
@@ -54,15 +54,15 @@ follow :  whether to tail -f the input"""
             self.compiledPlayers = players
             player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
             logging.debug("player_re: " + player_re)
-            self.re_PostSB          = re.compile("^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
-            self.re_PostBB          = re.compile("^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_PostSB          = re.compile("^%s posts small blind \[\$?(?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_PostBB          = re.compile("^%s posts big blind \[\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_Antes           = re.compile("^%s antes asdf sadf sadf" % player_re, re.MULTILINE)
             self.re_BringIn         = re.compile("^%s antes asdf sadf sadf" % player_re, re.MULTILINE)
-            self.re_PostBoth        = re.compile("^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
+            self.re_PostBoth        = re.compile("^%s posts small \& big blinds \[\$?(?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_HeroCards       = re.compile("^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
-            self.re_Action          = re.compile("^%s: (?P<ATYPE>bets|checks|raises|calls|folds)(\s\[\$ (?P<BET>[.\d]+) (USD|EUR)\])?" % player_re, re.MULTILINE)
+            self.re_Action          = re.compile("^%s (?P<ATYPE>bets|checks|raises to|raises|calls|folds)(\s\[\$(?P<BET>[.\d]+)\])?" % player_re, re.MULTILINE)
             self.re_ShowdownAction  = re.compile("^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
-            self.re_CollectPot      = re.compile("^%s wins \$ (?P<POT>[.\d]+) (USD|EUR)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
+            self.re_CollectPot      = re.compile("^%s wins \$(?P<POT>[.\d]+) (.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile("^%s sits out" % player_re, re.MULTILINE)
             self.re_ShownCards      = re.compile(r"%s (?P<SEAT>[0-9]+) (?P<CARDS>adsfasdf)" % player_re, re.MULTILINE)
 
@@ -186,18 +186,18 @@ follow :  whether to tail -f the input"""
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets[street])
         for action in m:
-            if action.group('ATYPE') == ' raises to':
+            if action.group('ATYPE') == 'raises to':
                 hand.addRaiseTo( street, action.group('PNAME'), action.group('BET') )
 #            elif action.group('ATYPE') == ' completes it to':
 #                hand.addComplete( street, action.group('PNAME'), action.group('BET') )
-#            elif action.group('ATYPE') == ' calls':
-#                hand.addCall( street, action.group('PNAME'), action.group('BET') )
-#            elif action.group('ATYPE') == ' bets':
-#                hand.addBet( street, action.group('PNAME'), action.group('BET') )
-#            elif action.group('ATYPE') == ' folds':
-#                hand.addFold( street, action.group('PNAME'))
-#            elif action.group('ATYPE') == ' checks':
-#                hand.addCheck( street, action.group('PNAME'))
+            elif action.group('ATYPE') == 'calls':
+                hand.addCall( street, action.group('PNAME'), action.group('BET') )
+            elif action.group('ATYPE') == 'bets':
+                hand.addBet( street, action.group('PNAME'), action.group('BET') )
+            elif action.group('ATYPE') == 'folds':
+                hand.addFold( street, action.group('PNAME'))
+            elif action.group('ATYPE') == 'checks':
+                hand.addCheck( street, action.group('PNAME'))
             else:
                 print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
 

From 2bb45936727a5ccbc36153ac739592aef766231d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 19:43:28 +0900
Subject: [PATCH 10/14] Compare determineGameType to readSupportedGames

Allows us to parse the header (and test it) and still skip the file.

May produce empty files in autoimport...
---
 pyfpdb/EverleafToFpdb.py       |  2 +-
 pyfpdb/HandHistoryConverter.py | 28 ++++++++++++++++++----------
 pyfpdb/test_fpdb_simple.py     | 14 +++++++-------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index edb61f3d..40b0ab05 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -133,7 +133,7 @@ or None if we fail to get the info """
         
         if not self.debugging and info['base']=='stud':
             logging.warning("Not processing Everleaf Stud hand")
-            return None
+            #return None
             
         return info
 
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 7ed679a4..9afdc2c9 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -202,17 +202,24 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
     def processHand(self, handText):
         gametype = self.determineGameType(handText)
         logging.debug("gametype %s" % gametype)
-        if gametype is None:
-            return
-        
+
+        # See if gametype is supported.
+        type = gametype['type']
+        base = gametype['base']
+        limit = gametype['limitType']
+        l = [type] + [base] + [limit]
         hand = None
-        if gametype['base'] == 'hold':
-            logging.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
-            hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handText)
-        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 l in self.readSupportedGames():
+            hand = None
+            if gametype['base'] == 'hold':
+                logging.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
+                hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handText)
+            elif gametype['base'] == 'stud':
+                hand = Hand.StudHand(self, self.sitename, gametype, handText)
+            elif gametype['base'] == 'draw':
+                hand = Hand.DrawHand(self, self.sitename, gametype, handText)
+        else:
+            logging.info("Unsupported game type: %s" % gametype)
 
         if hand:
             hand.writeHand(self.out_fh)
@@ -221,6 +228,7 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
             # TODO: pity we don't know the HID at this stage. Log the entire hand?
             # From the log we can deduce that it is the hand after the one before :)
 
+
     # These functions are parse actions that may be overridden by the inheriting class
     # This function should return a list of lists looking like:
     # return [["ring", "hold", "nl"], ["tour", "hold", "nl"]]
diff --git a/pyfpdb/test_fpdb_simple.py b/pyfpdb/test_fpdb_simple.py
index bde20b45..e8b51ec2 100755
--- a/pyfpdb/test_fpdb_simple.py
+++ b/pyfpdb/test_fpdb_simple.py
@@ -3,16 +3,16 @@ import fpdb_simple
 import datetime
 import py
 
-def checkDateParse(header, result):
-    assert fpdb_simple.parseHandStartTime(header) == result
+def checkDateParse(header, site, result):
+    assert fpdb_simple.parseHandStartTime(header, site) == result
 
 def testPokerStarsHHDate():
     tuples = (
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]",
+        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]", "ps",
                     datetime.datetime(2008,9,7,11,23,14)),
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)",
+        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)", "ps",
                     datetime.datetime(2008,11,12,15,00,48)),
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET",
+        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET", "ps",
                     datetime.datetime(2008,8,17,6,14,43))
     )
 
@@ -36,5 +36,5 @@ def testPokerStarsHHDate():
 #        self.failUnless(result == "French", "French (deep) parsed incorrectly. Expected 'French' got: " + str(result))
 #        result = ("French (deep) - $0.25/$0.50 - No Limit Hold'em - Logged In As xxxx")
 
-    for (header, result) in tuples:
-        yield checkDateParse header, result
+    for (header, site, result) in tuples:
+        yield checkDateParse, header, site, result

From 63a4d3f6059096e2ed279a4a6d4ef5a8b7963774 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 19:51:03 +0900
Subject: [PATCH 11/14] Fix test_fpdb_simple.py's tests

---
 pyfpdb/test_fpdb_simple.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/test_fpdb_simple.py b/pyfpdb/test_fpdb_simple.py
index e8b51ec2..af741508 100755
--- a/pyfpdb/test_fpdb_simple.py
+++ b/pyfpdb/test_fpdb_simple.py
@@ -9,11 +9,11 @@ def checkDateParse(header, site, result):
 def testPokerStarsHHDate():
     tuples = (
         ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]", "ps",
-                    datetime.datetime(2008,9,7,11,23,14)),
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)", "ps",
                     datetime.datetime(2008,11,12,15,00,48)),
+        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)", "ps",
+                    datetime.datetime(2008,8,17,6,14,43)),
         ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET", "ps",
-                    datetime.datetime(2008,8,17,6,14,43))
+                    datetime.datetime(2008,9,7,11,23,14))
     )
 
 #def testFullTiltHHDate(self):

From 27a0db56bba5fb5cf24f00f91f4eba950831a954 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 12 Mar 2009 20:01:41 +0900
Subject: [PATCH 12/14] Add test file for betfair

---
 pyfpdb/test_Betfair.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 pyfpdb/test_Betfair.py

diff --git a/pyfpdb/test_Betfair.py b/pyfpdb/test_Betfair.py
new file mode 100644
index 00000000..50949e93
--- /dev/null
+++ b/pyfpdb/test_Betfair.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import BetfairToFpdb
+import py
+
+
+def checkGameInfo(hhc, header, info):
+    assert hhc.determineGameType(header) == info
+
+def testGameInfo():
+    hhc = BetfairToFpdb.Betfair(autostart=False)    
+    pairs = (
+    (u"""***** Betfair Poker Hand History for Game 472386869 *****
+NL $0.02/$0.04 Texas Hold'em - Sunday, January 25, 10:10:42 GMT 2009
+Table Rookie 191 6-max (Real Money)
+Seat 1 is the button
+Total number of active players : 6""",
+    {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'0.02', 'bb':'0.04', 'currency':'USD'}),
+    )
+
+    for (header, info) in pairs:
+        yield checkGameInfo, hhc, header, info

From 76e467a5d48cedb9a6298201fab1c2f412078f50 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Thu, 12 Mar 2009 12:24:23 +0000
Subject: [PATCH 13/14] get rid of thread

---
 pyfpdb/EverleafToFpdb.py       |  1 +
 pyfpdb/HandHistoryConverter.py | 16 +++++++---------
 pyfpdb/fpdb_import.py          |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 18466edc..c0ebedfe 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -51,6 +51,7 @@ debugging: if False, pass on partially supported game types. If true, have a go
         self.debugging = debugging
         if autostart:
             self.start()
+            # otherwise you need to call start yourself.
 
     def compilePlayerRegexs(self, hand):
         players = set([player[1] for player in hand.players])
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index a627766e..d9b8a1b5 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -18,7 +18,6 @@
 import Hand
 import re
 import sys
-import threading
 import traceback
 import logging
 from optparse import OptionParser
@@ -72,10 +71,9 @@ letter2names = {
 import gettext
 gettext.install('myapplication')
 
-class HandHistoryConverter(threading.Thread):
+class HandHistoryConverter():
     READ_CHUNK_SIZE = 1000 # bytes to read at a time from file
     def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False):
-        threading.Thread.__init__(self)
         logging.info("HandHistory init called")
         
         # default filetype and codepage. Subclasses should set these properly.
@@ -110,7 +108,7 @@ class HandHistoryConverter(threading.Thread):
         #tmp = tmp + "\tsb/bb:      '%s/%s'\n" % (self.gametype[3], self.gametype[4])
         return tmp
 
-    def run(self):
+    def start(self):
         """process a hand at a time from the input specified by in_path.
 If in follow mode, wait for more data to turn up.
 Otherwise, finish at eof..."""        
@@ -135,9 +133,9 @@ Otherwise, finish at eof..."""
     def tailHands(self):
         """Generator of handTexts from a tailed file:
 Tail the in_path file and yield handTexts separated by re_SplitHands"""
-        if in_path == '-': raise StopIteration
+        if self.in_path == '-': raise StopIteration
         interval = 1.0 # seconds to sleep between reads for new data
-        fd = open(filename,'r')
+        fd = codecs.open(self.in_path,'r', self.codepage)
         data = ''
         while 1:
             where = fd.tell()
@@ -145,15 +143,15 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
             if not newdata:
                 fd_results = os.fstat(fd.fileno())
                 try:
-                    st_results = os.stat(filename)
+                    st_results = os.stat(self.in_path)
                 except OSError:
                     st_results = fd_results
                 if st_results[1] == fd_results[1]:
                     time.sleep(interval)
                     fd.seek(where)
                 else:
-                    print "%s changed inode numbers from %d to %d" % (filename, fd_results[1], st_results[1])
-                    fd = open(filename, 'r')
+                    print "%s changed inode numbers from %d to %d" % (self.in_path, fd_results[1], st_results[1])
+                    fd = codecs.open(self.in_path, 'r', self.codepage)
                     fd.seek(where)
             else:
                 # yield hands
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 15c25ac8..3f23d363 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -241,7 +241,7 @@ class Importer:
                     out_path     = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
                 #out_fh = open(ofile, 'w') # TODO: seek to previous place in input and append output
                 conv = EverleafToFpdb.Everleaf(in_path = file, out_path = out_path)
-                conv.join()
+                #~ conv.join()
             elif filter == "FulltiltToFpdb":
                 print "converting ", file
                 conv = FulltiltToFpdb.FullTilt(in_fh = file, out_fh = out_fh)

From 2d849c69e721f4a51789b13d23bdfa8ee022eed3 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 13 Mar 2009 00:31:29 +0900
Subject: [PATCH 14/14] Refactor HHC call a bit, make sure out_fh gets closed

---
 pyfpdb/HandHistoryConverter.py |  4 ++++
 pyfpdb/fpdb_import.py          | 30 ++++++++++++------------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 26452454..23688700 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -116,6 +116,7 @@ Otherwise, finish at eof..."""
         if not self.sanityCheck():
             print "Cowardly refusing to continue after failed sanity check"
             return
+
         if self.follow:
             numHands = 0
             for handText in self.tailHands():
@@ -129,6 +130,9 @@ Otherwise, finish at eof..."""
             numHands=  len(handsList)
         endtime = time.time()
         print "Processed %d hands in %.3f seconds" % (numHands, endtime - starttime)
+        if self.out_fh != sys.stdout:
+            self.out_fh.close()
+
 
     def tailHands(self):
         """Generator of handTexts from a tailed file:
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 0c51c416..cccba59e 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -229,30 +229,24 @@ class Importer:
             # Load filter, process file, pass returned filename to import_fpdb_file
             
             # TODO: Shouldn't we be able to use some sort of lambda or something to just call a Python object by whatever name we specify? then we don't have to hardcode them,
+            print "converting %s" % file
+            hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
+            hhbase    = os.path.expanduser(hhbase)
+            hhdir     = os.path.join(hhbase,site)
+            try:
+                out_path     = os.path.join(hhdir, file.split(os.path.sep)[-2]+"-"+os.path.basename(file))
+            except:
+                out_path     = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
+
             # someone can just create their own python module for it
             if filter in ("EverleafToFpdb","Everleaf"):
-                print "converting ", file
-                hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
-                hhbase    = os.path.expanduser(hhbase)
-                hhdir     = os.path.join(hhbase,site)
-                try:
-                    out_path     = os.path.join(hhdir, file.split(os.path.sep)[-2]+"-"+os.path.basename(file))
-                except:
-                    out_path     = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
-                #out_fh = open(ofile, 'w') # TODO: seek to previous place in input and append output
                 conv = EverleafToFpdb.Everleaf(in_path = file, out_path = out_path)
-                #~ conv.join()
             elif filter == "FulltiltToFpdb":
-                print "converting ", file
-                conv = FulltiltToFpdb.FullTilt(in_fh = file, out_fh = out_fh)
+                conv = FulltiltToFpdb.FullTilt(in_path = file, out_path = out_path)
             else:
                 print "Unknown filter ", filter
                 return
 
-            supp = conv.readSupportedGames() # Should this be done by HHC on init?
-            #gt = conv.determineGameType()
-            # TODO: Check that gt is in supp - error appropriately if not
-            #conv.processFile()
             if(conv.getStatus()):
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
             else:
@@ -280,7 +274,7 @@ class Importer:
                 loc = self.pos_in_file[file]
             except:
                 pass
-
+        print "DEBUG: XXXXX in import_fpdb_file"
         # Read input file into class and close file
         inputFile.seek(loc)
         self.lines=fpdb_simple.removeTrailingEOL(inputFile.readlines())
@@ -290,7 +284,7 @@ class Importer:
         try: # sometimes we seem to be getting an empty self.lines, in which case, we just want to return.
             firstline = self.lines[0]
         except:
-#           print "import_fpdb_file", file, site, self.lines, "\n"
+            print "DEBUG: import_fpdb_file: failed on self.lines[0]: '%s' '%s' '%s' '%s' " %( file, site, self.lines, loc)
             return (0,0,0,1,0)
 
         if firstline.find("Tournament Summary")!=-1: