evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Blade 2010-09-14 19:19:02 -04:00
commit f8394bccb4
8 changed files with 530 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/CarbonToFpdb.py
View File

@ -23,7 +23,6 @@
# #
# TODO: # TODO:
# #
# -- No siteID assigned
# -- No support for games other than NL hold 'em cash. Hand histories for other # -- No support for games other than NL hold 'em cash. Hand histories for other
# games required # games required
# -- No support for limit hold 'em yet, though this would be easy to add # -- No support for limit hold 'em yet, though this would be easy to add

5
pyfpdb/Hand.py
View File

@ -697,10 +697,7 @@ class HoldemOmahaHand(Hand):
if self.cancelled: if self.cancelled:
return return
try: hhc.readBlinds(self) hhc.readBlinds(self)
except:
print _("*** Parse error reading blinds (check compilePlayerRegexs as a likely culprit)"), self
return
hhc.readAntes(self) hhc.readAntes(self)
hhc.readButton(self) hhc.readButton(self)

33
pyfpdb/PartyPokerToFpdb.py
View File

@ -362,6 +362,39 @@ class PartyPoker(HandHistoryConverter):
hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'),
clearMoneyString(a.group('CASH'))) clearMoneyString(a.group('CASH')))
# detecting new active players without a seat
# and new active players with zero stack
if hand.gametype['type'] == 'ring':
re_JoiningPlayers = re.compile(r"(?P<PLAYERNAME>.*) has joined the table")
re_BBPostingPlayers = re.compile(r"(?P<PLAYERNAME>.*) posts big blind")
seatedPlayers = list([(f[1]) for f in hand.players])
def findFirstEmptySeat(startSeat):
while startSeat in occupiedSeats:
if startSeat >= hand.maxseats:
startSeat = 0
startSeat += 1
return startSeat
match_JoiningPlayers = re_JoiningPlayers.findall(hand.handText)
match_BBPostingPlayers = re_BBPostingPlayers.findall(hand.handText)
ringLimit = self.re_GameInfoRing.search(hand.handText).groupdict()['RINGLIMIT']
unseatedActivePlayers = list(set(match_BBPostingPlayers) - set(seatedPlayers))
for player in seatedPlayers:
if hand.stacks[player] == 0 and player in match_BBPostingPlayers:
hand.stacks[player] = Decimal(ringLimit)
if unseatedActivePlayers:
for player in unseatedActivePlayers:
previousBBPoster = match_BBPostingPlayers[match_BBPostingPlayers.index(player)-1]
previousBBPosterSeat = dict([(f[1], f[0]) for f in hand.players])[previousBBPoster]
occupiedSeats = list([(f[0]) for f in hand.players])
occupiedSeats.sort()
newPlayerSeat = findFirstEmptySeat(previousBBPosterSeat)
hand.addPlayer(newPlayerSeat,player,clearMoneyString(ringLimit))
def markStreets(self, hand): def markStreets(self, hand):
m = re.search( m = re.search(
r"\*{2} Dealing down cards \*{2}" r"\*{2} Dealing down cards \*{2}"

2
pyfpdb/iPokerToFpdb.py
View File

@ -66,7 +66,7 @@ class iPoker(HandHistoryConverter):
siteID = 13 siteID = 13
# Static regexes # Static regexes
re_SplitHands = re.compile(r'</game>\n+(?=<game)') re_SplitHands = re.compile(r'</game>')
re_TailSplitHands = re.compile(r'(</game>)') re_TailSplitHands = re.compile(r'(</game>)')
re_GameInfo = re.compile(r'<gametype>(?P<GAME>[a-zA-Z0-9 ]+) \$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)</gametype>', re.MULTILINE) re_GameInfo = re.compile(r'<gametype>(?P<GAME>[a-zA-Z0-9 ]+) \$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)</gametype>', re.MULTILINE)
re_HandInfo = re.compile(r'gamecode="(?P<HID>[0-9]+)">\s+<general>\s+<startdate>(?P<DATETIME>[-: 0-9]+)</startdate>', re.MULTILINE) re_HandInfo = re.compile(r'gamecode="(?P<HID>[0-9]+)">\s+<general>\s+<startdate>(?P<DATETIME>[-: 0-9]+)</startdate>', re.MULTILINE)

153
pyfpdb/regression-test-files/cash/OnGame/Draw/5-Carddraw-USD-0.05-0.10-201009.Sample.txt Normal file
View File

@ -0,0 +1,153 @@
***** History for hand R5-81962116-232 *****
Start hand: Mon Sep 13 00:21:02 GMT+0100 2010
Table: Suez [81962116] (LIMIT FIVE_CARD_DRAW $0.05/$0.10, Real money)
User: tchazx
Button: seat 3
Players in round: 4
Seat 8: DamonV2 ($0.07)
Seat 10: tchazx ($1)
Seat 1: x Diabolo666 ($11.23)
Seat 3: velabianca ($0.51)
DamonV2 posts small blind ($0.02)
tchazx posts big blind ($0.05)
---
Dealing pocket cards
Dealing to tchazx: [Tc, 9h, 7c, Ah, Jh]
x Diabolo666 raises $0.10 to $0.10
velabianca folds
DamonV2 folds
tchazx calls $0.05
---
tchazx changed 2 cards
New hand for tchazx: [8h, 9h, 6s, Ah, Jh]
x Diabolo666 changed 3 cards
tchazx checks
x Diabolo666 checks
---
Summary:
Main pot: $0.22 won by x Diabolo666 ($0.21)
Rake taken: $0.01
Seat 8: DamonV2 ($0.05), net: -$0.02
Seat 10: tchazx ($0.90), net: -$0.10, [8h, 9h, 6s, Ah, Jh] (HIGH_CARD ACE)
Seat 1: x Diabolo666 ($11.34), net: +$0.11, [2c, Ac, Td, As, Qc] (PAIR ACE)
Seat 3: velabianca ($0.51)
***** End of hand R5-81962116-232 *****
***** History for hand R5-81962116-233 *****
Start hand: Mon Sep 13 00:21:42 GMT+0100 2010
Table: Suez [81962116] (LIMIT FIVE_CARD_DRAW $0.05/$0.10, Real money)
User: tchazx
Button: seat 8
Players in round: 5
Seat 10: tchazx ($0.90)
Seat 1: x Diabolo666 ($11.34)
Seat 3: velabianca ($0.51)
Seat 4: grommek ($9.40)
Seat 8: DamonV2 ($0.05)
tchazx posts small blind ($0.02)
x Diabolo666 posts big blind ($0.05)
grommek posts big blind ($0.05)
grommek posts dead blind ($0.02)
---
Dealing pocket cards
Dealing to tchazx: [Jd, 5s, 8h, 4h, 7d]
velabianca calls $0.05
grommek checks
DamonV2 calls $0.05 [all in]
tchazx calls $0.03
x Diabolo666 checks
---
tchazx changed 1 cards
New hand for tchazx: [Ah, 5s, 8h, 4h, 7d]
x Diabolo666 changed 4 cards
velabianca changed 2 cards
grommek changed 3 cards
DamonV2 changed 2 cards
tchazx checks
x Diabolo666 checks
velabianca bets $0.10
grommek folds
tchazx folds
x Diabolo666 folds
---
---
Summary:
Main pot: $0.27 won by velabianca ($0.26)
Rake taken: $0.01
Seat 10: tchazx ($0.85), net: -$0.05
Seat 1: x Diabolo666 ($11.29), net: -$0.05
Seat 3: velabianca ($0.72), net: +$0.21, [As, 9s, 6s, 6c, 9h] (TWO_PAIR NINE, SIX)
Seat 4: grommek ($9.33), net: -$0.07
Seat 8: DamonV2 ($0), net: -$0.05, [Jh, 2c, Kh, Td, 6h] (HIGH_CARD KING)
***** End of hand R5-81962116-233 *****
***** History for hand R5-81962116-234 *****
Start hand: Mon Sep 13 00:22:36 GMT+0100 2010
Table: Suez [81962116] (LIMIT FIVE_CARD_DRAW $0.05/$0.10, Real money)
User: tchazx
Button: seat 10
Players in round: 4
Seat 1: x Diabolo666 ($11.29)
Seat 3: velabianca ($0.72)
Seat 4: grommek ($9.33)
Seat 10: tchazx ($0.85)
x Diabolo666 posts small blind ($0.02)
velabianca posts big blind ($0.05)
---
Dealing pocket cards
Dealing to tchazx: [Kh, 9d, As, 4s, 7c]
grommek calls $0.05
tchazx folds
x Diabolo666 folds
velabianca checks
velabianca changed 3 cards
grommek changed 3 cards
velabianca checks
grommek bets $0.10
velabianca folds
---
Summary:
Main pot: $0.12 won by grommek ($0.12)
Rake taken: $0
Seat 1: x Diabolo666 ($11.27), net: -$0.02
Seat 3: velabianca ($0.67), net: -$0.05
Seat 4: grommek ($9.40), net: +$0.07
Seat 10: tchazx ($0.85)
***** End of hand R5-81962116-234 *****
***** History for hand R5-81962116-235 *****
Start hand: Mon Sep 13 00:23:04 GMT+0100 2010
Table: Suez [81962116] (LIMIT FIVE_CARD_DRAW $0.05/$0.10, Real money)
User: tchazx
Button: seat 1
Players in round: 4
Seat 3: velabianca ($0.67)
Seat 4: grommek ($9.40)
Seat 10: tchazx ($0.85)
Seat 1: x Diabolo666 ($11.27)
velabianca posts small blind ($0.02)
grommek posts big blind ($0.05)
---
Dealing pocket cards
Dealing to tchazx: [8d, Td, 2s, 3d, Qd]
tchazx calls $0.05
x Diabolo666 raises $0.10 to $0.10
velabianca calls $0.08
grommek calls $0.05
tchazx calls $0.05
---
velabianca changed 2 cards
grommek changed 2 cards
tchazx changed 1 cards
New hand for tchazx: [8d, Td, 8h, 3d, Qd]
x Diabolo666 changed 3 cards
velabianca checks
grommek checks
tchazx checks
x Diabolo666 checks
---
Summary:
Main pot: $0.40 won by velabianca ($0.38)
Rake taken: $0.02
Seat 3: velabianca ($0.95), net: +$0.28
Seat 4: grommek ($9.30), net: -$0.10
Seat 10: tchazx ($0.75), net: -$0.10
Seat 1: x Diabolo666 ($11.17), net: -$0.10, [6d, Qc, 4c, Th, Qs] (PAIR QUEEN)
***** End of hand R5-81962116-235 *****

27
pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-9max-USD-0.05-0.10-201009.Dead.Small.Blind.txt Normal file
View File

@ -0,0 +1,27 @@
***** History for hand R5-79836934-72 *****
Start hand: Sat Sep 4 05:34:19 GMT+0100 2010
Table: Bnei Brak [79836934] (NO_LIMIT TEXAS_HOLDEM $0.05/$0.10, Real money)
User: tchazx
Button: seat 10
Players in round: 2
Seat 1: feradf ($6.86)
Seat 10: tchazx ($15.44)
tchazx posts big blind ($0.10)
tchazx posts dead blind ($0.05)
feradf posts big blind ($0.10)
---
Dealing pocket cards
Dealing to tchazx: [Qh, 4h]
tchazx raises $0.20 to $0.30
feradf calls $0.20
--- Dealing flop [6c, Qs, 7h]
feradf checks
tchazx bets $0.45
feradf folds
---
Summary:
Main pot: $0.65 won by tchazx ($0.62)
Rake taken: $0.03
Seat 1: feradf ($6.56), net: -$0.30
Seat 10: tchazx ($15.71), net: +$0.27
***** End of hand R5-79836934-72 *****

270
pyfpdb/regression-test-files/cash/OnGame/Stud/7-Stud-USD-0.10-0.20-201009.Sample.txt Normal file
View File

@ -0,0 +1,270 @@
***** History for hand R5-82086688-607 *****
Start hand: Mon Sep 13 22:31:30 GMT+0100 2010
Table: Milwaukee [82086688] (LIMIT SEVEN_CARD_STUD $0.10/$0.20, ante: $0.02, Real money)
User: tchazx
Players in round: 5
Seat 1: the bAAr ($6.53)
Seat 2: tchazx ($2)
Seat 6: kueto ($6.30)
Seat 8: E6y Ko3y ($2.70)
Seat 10: telozver123 ($6.49)
the bAAr posts ante $0.02
kueto posts ante $0.02
E6y Ko3y posts ante $0.02
telozver123 posts ante $0.02
tchazx posts ante $0.02
---
Dealing pocket cards
Dealing to the bAAr: [-, -, Kh]
Dealing to tchazx: [Jh, 9d, Ac]
Dealing to kueto: [-, -, 4h]
Dealing to E6y Ko3y: [-, -, Ad]
Dealing to telozver123: [-, -, 6h]
kueto small bring in $0.05
E6y Ko3y calls $0.05
telozver123 calls $0.05
the bAAr calls $0.05
tchazx calls $0.05
---
Dealing 4th street
Dealing to the bAAr: [3h]
Dealing to tchazx: [7h]
Dealing to kueto: [3d]
Dealing to E6y Ko3y: [Qs]
Dealing to telozver123: [Ts]
E6y Ko3y bets $0.10
telozver123 calls $0.10
the bAAr calls $0.10
tchazx calls $0.10
kueto folds
---
Dealing 5th street
Dealing to the bAAr: [9s]
Dealing to tchazx: [Js]
Dealing to E6y Ko3y: [6c]
Dealing to telozver123: [Kd]
E6y Ko3y checks
telozver123 checks
the bAAr bets $0.20
tchazx calls $0.20
E6y Ko3y calls $0.20
telozver123 folds
---
Dealing 6th street
Dealing to the bAAr: [8s]
Dealing to tchazx: [5c]
Dealing to E6y Ko3y: [5d]
E6y Ko3y checks
the bAAr bets $0.20
tchazx calls $0.20
E6y Ko3y calls $0.20
---
Dealing river
Dealing to tchazx: [9h]
E6y Ko3y checks
the bAAr checks
tchazx bets $0.20
E6y Ko3y folds
the bAAr calls $0.20
---
Summary:
Main pot: $2.35 won by tchazx ($2.24)
Rake taken: $0.11
Seat 1: the bAAr ($5.76), net: -$0.77
Seat 2: tchazx ($3.47), net: +$1.47, [Jh, 9d, Ac, 7h, Js, 5c, 9h] (TWO_PAIR JACK, NINE)
Seat 6: kueto ($6.23), net: -$0.07
Seat 8: E6y Ko3y ($2.13), net: -$0.57
Seat 10: telozver123 ($6.32), net: -$0.17
***** End of hand R5-82086688-607 *****
***** History for hand R5-82086688-608 *****
Start hand: Mon Sep 13 22:32:47 GMT+0100 2010
Table: Milwaukee [82086688] (LIMIT SEVEN_CARD_STUD $0.10/$0.20, ante: $0.02, Real money)
User: tchazx
Players in round: 5
Seat 1: the bAAr ($5.76)
Seat 2: tchazx ($3.47)
Seat 6: kueto ($6.23)
Seat 8: E6y Ko3y ($2.13)
Seat 10: telozver123 ($6.32)
the bAAr posts ante $0.02
tchazx posts ante $0.02
kueto posts ante $0.02
E6y Ko3y posts ante $0.02
telozver123 posts ante $0.02
---
Dealing pocket cards
Dealing to the bAAr: [-, -, 4s]
Dealing to tchazx: [8h, Ks, Qd]
Dealing to kueto: [-, -, 5h]
Dealing to E6y Ko3y: [-, -, 2h]
Dealing to telozver123: [-, -, 3c]
E6y Ko3y small bring in $0.05
telozver123 folds
the bAAr calls $0.05
tchazx calls $0.05
kueto folds
---
Dealing 4th street
Dealing to the bAAr: [Ad]
Dealing to tchazx: [8d]
Dealing to E6y Ko3y: [Qh]
the bAAr bets $0.10
tchazx calls $0.10
E6y Ko3y folds
---
Dealing 5th street
Dealing to the bAAr: [4c]
Dealing to tchazx: [Ah]
the bAAr bets $0.20
tchazx calls $0.20
---
Dealing 6th street
Dealing to the bAAr: [3d]
Dealing to tchazx: [Jh]
the bAAr checks
tchazx checks
---
Dealing river
Dealing to tchazx: [Kh]
the bAAr bets $0.20
tchazx calls $0.20
---
Summary:
Main pot: $1.25 won by tchazx ($1.19)
Rake taken: $0.06
Seat 1: the bAAr ($5.19), net: -$0.57, [6s, 9s, 4s, Ad, 4c, 3d, 3h] (TWO_PAIR FOUR, THREE)
Seat 2: tchazx ($4.09), net: +$0.62, [8h, Ks, Qd, 8d, Ah, Jh, Kh] (TWO_PAIR KING, EIGHT)
Seat 6: kueto ($6.21), net: -$0.02
Seat 8: E6y Ko3y ($2.06), net: -$0.07
Seat 10: telozver123 ($6.30), net: -$0.02
***** End of hand R5-82086688-608 *****
***** History for hand R5-82086688-609 *****
Start hand: Mon Sep 13 22:33:42 GMT+0100 2010
Table: Milwaukee [82086688] (LIMIT SEVEN_CARD_STUD $0.10/$0.20, ante: $0.02, Real money)
User: tchazx
Players in round: 5
Seat 1: the bAAr ($5.19)
Seat 2: tchazx ($4.09)
Seat 6: kueto ($6.21)
Seat 8: E6y Ko3y ($2.06)
Seat 10: telozver123 ($6.30)
the bAAr posts ante $0.02
tchazx posts ante $0.02
kueto posts ante $0.02
E6y Ko3y posts ante $0.02
telozver123 posts ante $0.02
---
Dealing pocket cards
Dealing to the bAAr: [-, -, 5c]
Dealing to tchazx: [Ad, As, Kh]
Dealing to kueto: [-, -, Qs]
Dealing to E6y Ko3y: [-, -, 8s]
Dealing to telozver123: [-, -, Tc]
the bAAr small bring in $0.05
tchazx bets $0.10
kueto calls $0.10
E6y Ko3y folds
telozver123 folds
the bAAr folds
---
Dealing 4th street
Dealing to tchazx: [Ks]
Dealing to kueto: [Qd]
tchazx bets $0.10
kueto calls $0.10
---
Dealing 5th street
Dealing to tchazx: [8c]
Dealing to kueto: [7s]
tchazx bets $0.20
kueto calls $0.20
---
Dealing 6th street
Dealing to tchazx: [7d]
Dealing to kueto: [5s]
tchazx bets $0.20
kueto calls $0.20
---
Dealing river
Dealing to tchazx: [7h]
tchazx bets $0.20
kueto calls $0.20
---
Summary:
Main pot: $1.75 won by kueto ($1.67)
Rake taken: $0.08
Seat 1: the bAAr ($5.12), net: -$0.07
Seat 2: tchazx ($3.27), net: -$0.82, [Ad, As, Kh, Ks, 8c, 7d, 7h] (TWO_PAIR ACE, KING)
Seat 6: kueto ($7.06), net: +$0.85, [Qc, 6c, Qs, Qd, 7s, 5s, 3c] (THREE_OF_A_KIND QUEEN)
Seat 8: E6y Ko3y ($2.04), net: -$0.02
Seat 10: telozver123 ($6.28), net: -$0.02
***** End of hand R5-82086688-609 *****
***** History for hand R5-82086688-610 *****
Start hand: Mon Sep 13 22:34:25 GMT+0100 2010
Table: Milwaukee [82086688] (LIMIT SEVEN_CARD_STUD $0.10/$0.20, ante: $0.02, Real money)
User: tchazx
Players in round: 5
Seat 1: the bAAr ($5.12)
Seat 2: tchazx ($3.27)
Seat 6: kueto ($7.06)
Seat 8: E6y Ko3y ($2.04)
Seat 10: telozver123 ($6.28)
the bAAr posts ante $0.02
tchazx posts ante $0.02
kueto posts ante $0.02
E6y Ko3y posts ante $0.02
telozver123 posts ante $0.02
---
Dealing pocket cards
Dealing to the bAAr: [-, -, Ts]
Dealing to tchazx: [9s, 6s, 7s]
Dealing to kueto: [-, -, Qs]
Dealing to E6y Ko3y: [-, -, 3s]
Dealing to telozver123: [-, -, 9d]
E6y Ko3y small bring in $0.05
telozver123 folds
the bAAr calls $0.05
tchazx calls $0.05
kueto calls $0.05
---
Dealing 4th street
Dealing to the bAAr: [Qd]
Dealing to tchazx: [Ah]
Dealing to kueto: [7h]
Dealing to E6y Ko3y: [Th]
tchazx checks
kueto checks
E6y Ko3y checks
the bAAr bets $0.10
tchazx calls $0.10
kueto folds
E6y Ko3y folds
---
Dealing 5th street
Dealing to the bAAr: [Jh]
Dealing to tchazx: [5c]
tchazx checks
the bAAr bets $0.20
tchazx calls $0.20
---
Dealing 6th street
Dealing to the bAAr: [7d]
Dealing to tchazx: [7c]
tchazx checks
the bAAr bets $0.20
tchazx calls $0.20
---
Dealing river
Dealing to tchazx: [5h]
tchazx checks
the bAAr checks
---
Summary:
Main pot: $1.30 won by the bAAr ($1.24)
Rake taken: $0.06
Seat 1: the bAAr ($5.79), net: +$0.67, [Tc, 9h, Ts, Qd, Jh, 7d, 9c] (TWO_PAIR TEN, NINE)
Seat 2: tchazx ($2.70), net: -$0.57, [9s, 6s, 7s, Ah, 5c, 7c, 5h] (TWO_PAIR SEVEN, FIVE)
Seat 6: kueto ($6.99), net: -$0.07
Seat 8: E6y Ko3y ($1.97), net: -$0.07
Seat 10: telozver123 ($6.26), net: -$0.02
***** End of hand R5-82086688-610 *****

45
pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-20100807.newPlayerWithZeroStack.txt Normal file
View File

@ -0,0 +1,45 @@
Game #9507514114 starts.
#Game No : 9507514114
***** Hand History for Game 9507514114 *****
$2 USD NL Texas Hold'em - Saturday, August 07, 17:05:05 CEST 2010
Table Table 178053 (Real Money)
Seat 3 is the button
Total number of players : 9/9
Seat 9: Player1 ( $1.60 USD )
Seat 4: Player2 ( $1.98 USD )
Seat 7: Player3 ( $2.90 USD )
Seat 3: Player4 ( $1.97 USD )
Seat 8: Player5 ( $2.43 USD )
Seat 6: Player6 ( $2 USD )
Seat 5: Player7 ( $2 USD )
Seat 2: Player8 ( $0 USD )
Seat 1: Player9 ( $1.83 USD )
Player8 has joined the table.
Player2 posts small blind [$0.01 USD].
Player7 posts big blind [$0.02 USD].
Player8 posts big blind [$0.02 USD].
** Dealing down cards **
Dealt to Player3 [ 7c 6c ]
Player6 calls [$0.02 USD]
Player3 calls [$0.02 USD]
Player5 calls [$0.02 USD]
Player1 folds
Player9 folds
Player8 checks
Player4 folds
Player2 calls [$0.01 USD]
Player7 checks
** Dealing Flop ** [ 5d, 2s, 8h ]
Player2 checks
Player7 bets [$0.09 USD]
Player6 folds
Player3 calls [$0.09 USD]
Player5 folds
Player8 folds
Player2 folds
** Dealing Turn ** [ Kd ]
Player7 bets [$0.21 USD]
Player3 folds
Player7 does not show cards.
Player7 wins $0.50 USD