Merge branch 'master' of git://git.assembla.com/fpdboz

pyfpdb/BetfairToFpdb.py

@@ -105,7 +105,7 @@ class Betfair(HandHistoryConverter):
         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'), "%A, %B %d, %H:%M:%S GMT %Y")
+        hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%A, %B %d, %H:%M:%S GMT %Y")
         #hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
@@ -144,6 +144,7 @@ class Betfair(HandHistoryConverter):
 
     def readAntes(self, hand):
         logging.debug("reading antes")
+        m = self.re_Antes.finditer(hand.handText)
         for player in m:
             logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
             hand.addAnte(player.group('PNAME'), player.group('ANTE'))
@@ -160,17 +161,15 @@ class Betfair(HandHistoryConverter):
         hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
 
     def readHeroCards(self, hand):
-        m = self.re_HeroCards.search(hand.handText)
+        #    streets PREFLOP, PREDRAW, and THIRD are special cases beacause
-        if(m == None):
+        #    we need to grab hero's cards
-            #Not involved in hand
+        for street in ('PREFLOP', 'DEAL'):
-            hand.involved = False
+            if street in hand.streets.keys():
-        else:
+                m = self.re_HeroCards.finditer(hand.streets[street])
-            hand.hero = m.group('PNAME')
+                for found in m:
-            # "2c, qh" -> set(["2c","qc"])
+                    hand.hero = found.group('PNAME')
-            # Also works with Omaha hands.
+                    newcards = [c.strip() for c in found.group('CARDS').split(',')]
-            cards = m.group('CARDS')
+                    hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
-            cards = [c.strip() for c in cards.split(',')]
-            hand.addHoleCards(cards, m.group('PNAME'))
 
     def readStudPlayerCards(self, hand, street):
         # balh blah blah

pyfpdb/HUD_config.xml.example

@@ -385,6 +385,51 @@ Left-Drag to Move"
                 <location seat="9" x="70" y="53">  </location>
             </layout>
         </site>
+
+
+        <site enabled="False"
+              site_name="Betfair"
+              table_finder="Betfair Poker.exe"
+              screen_name="YOUR SCREEN NAME HERE"
+              site_path="C:/Program Files/Betfair/Betfair Poker/"
+              HH_path="C:/Program Files/Betfair/Betfair Poker/HandHistory/YOUR SCREEN NAME HERE/"
+              decoder="everleaf_decode_table"
+              converter="BetfairToFpdb"
+              supported_games="holdem">
+            <layout fav_seat="0" height="547" max="8" width="794">
+                <location seat="1" x="640" y="64">  </location>
+                <location seat="2" x="650" y="230"> </location>
+                <location seat="3" x="650" y="385"> </location>
+                <location seat="4" x="588" y="425"> </location>
+                <location seat="5" x="92" y="425"> </location>
+                <location seat="6" x="0" y="373"> </location>
+                <location seat="7" x="0" y="223"> </location>
+                <location seat="8" x="25" y="50">  </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="6" width="794">
+                <location seat="1" x="640" y="58"> </location>
+                <location seat="2" x="654" y="288"> </location>
+                <location seat="3" x="615" y="424"> </location>
+                <location seat="4" x="70" y="421"> </location>
+                <location seat="5" x="0" y="280"> </location>
+                <location seat="6" x="70" y="58"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="2" width="794">
+                <location seat="1" x="651" y="288"> </location>
+                <location seat="2" x="10"  y="288"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="9" width="794">
+                <location seat="1" x="634" y="38">  </location>
+                <location seat="2" x="667" y="184"> </location>
+                <location seat="3" x="667" y="321"> </location>
+                <location seat="4" x="667" y="445"> </location>
+                <location seat="5" x="337" y="459"> </location>
+                <location seat="6" x="0" y="400"> </location>
+                <location seat="7" x="0" y="322"> </location>
+                <location seat="8" x="0" y="181">  </location>
+                <location seat="9" x="70" y="53">  </location>
+            </layout>
+        </site>
     </supported_sites>
 
     <supported_games>
@@ -521,6 +566,7 @@ Left-Drag to Move"
         <hhc site="Win2day" converter="Win2dayToFpdb"/>
         <hhc site="Absolute" converter="AbsoluteToFpdb"/>
         <hhc site="PartyPoker" converter="PartyPokerToFpdb"/>
+        <hhc site="Betfair" converter="BetfairToFpdb"/>
     </hhcs>
 
     <supported_databases>