FTP: Minor updates.
Was sent an old file that has 'Omaha' instead of 'Omaha Hi' in the gametype line. Was also sent a hand history that contain no player stack information at all.
This commit is contained in:
parent
02e6ead5f8
commit
e11e66c3e6
|
@ -74,7 +74,7 @@ class Fulltilt(HandHistoryConverter):
|
||||||
(Ante\s\$?(?P<ANTE>[%(NUM)s]+)\s)?-\s
|
(Ante\s\$?(?P<ANTE>[%(NUM)s]+)\s)?-\s
|
||||||
[%(LS)s]?(?P<CAP>[%(NUM)s]+\sCap\s)?
|
[%(LS)s]?(?P<CAP>[%(NUM)s]+\sCap\s)?
|
||||||
(?P<LIMIT>(No\sLimit|Pot\sLimit|Limit))?\s
|
(?P<LIMIT>(No\sLimit|Pot\sLimit|Limit))?\s
|
||||||
(?P<GAME>(Hold\'em|Omaha\sHi|Omaha\sH/L|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi|2-7\sTriple\sDraw|5\sCard\sDraw|Badugi))
|
(?P<GAME>(Hold\'em|Omaha\sHi|Omaha\sH/L|Omaha|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi|2-7\sTriple\sDraw|5\sCard\sDraw|Badugi))
|
||||||
''' % substitutions, re.VERBOSE)
|
''' % substitutions, re.VERBOSE)
|
||||||
re_SplitHands = re.compile(r"\n\n\n+")
|
re_SplitHands = re.compile(r"\n\n\n+")
|
||||||
re_TailSplitHands = re.compile(r"(\n\n+)")
|
re_TailSplitHands = re.compile(r"(\n\n+)")
|
||||||
|
@ -114,7 +114,7 @@ class Fulltilt(HandHistoryConverter):
|
||||||
(\((?P<TURBO1>Turbo)\)\s)?
|
(\((?P<TURBO1>Turbo)\)\s)?
|
||||||
\((?P<TOURNO>\d+)\)\s
|
\((?P<TOURNO>\d+)\)\s
|
||||||
((?P<MATCHNO>Match\s\d)\s)?
|
((?P<MATCHNO>Match\s\d)\s)?
|
||||||
(?P<GAME>(Hold\'em|Omaha\sHi|Omaha\sH/L|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi))\s
|
(?P<GAME>(Hold\'em|Omaha\sHi|Omaha\sH/L|Omaha|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi))\s
|
||||||
(\((?P<TURBO2>Turbo)\)\s)?
|
(\((?P<TURBO2>Turbo)\)\s)?
|
||||||
(?P<LIMIT>(No\sLimit|Pot\sLimit|Limit))?
|
(?P<LIMIT>(No\sLimit|Pot\sLimit|Limit))?
|
||||||
''' % substitutions, re.VERBOSE)
|
''' % substitutions, re.VERBOSE)
|
||||||
|
@ -218,6 +218,7 @@ class Fulltilt(HandHistoryConverter):
|
||||||
games = { # base, category
|
games = { # base, category
|
||||||
"Hold'em" : ('hold','holdem'),
|
"Hold'em" : ('hold','holdem'),
|
||||||
'Omaha Hi' : ('hold','omahahi'),
|
'Omaha Hi' : ('hold','omahahi'),
|
||||||
|
'Omaha' : ('hold','omahahi'),
|
||||||
'Omaha H/L' : ('hold','omahahilo'),
|
'Omaha H/L' : ('hold','omahahilo'),
|
||||||
'Razz' : ('stud','razz'),
|
'Razz' : ('stud','razz'),
|
||||||
'Stud Hi' : ('stud','studhi'),
|
'Stud Hi' : ('stud','studhi'),
|
||||||
|
@ -362,6 +363,10 @@ class Fulltilt(HandHistoryConverter):
|
||||||
seat, stack = plist[a]
|
seat, stack = plist[a]
|
||||||
hand.addPlayer(seat, a, stack)
|
hand.addPlayer(seat, a, stack)
|
||||||
|
|
||||||
|
if plist == {}:
|
||||||
|
#No players! The hand is either missing stacks or everyone is sitting out
|
||||||
|
raise FpdbParseError(_("FTP: readPlayerStacks: No players detected (hand #%s)") % hand.handid)
|
||||||
|
|
||||||
|
|
||||||
def markStreets(self, hand):
|
def markStreets(self, hand):
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user