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

Repair missing line in regex, comment out skipping tournaments.

Browse Source
This commit is contained in:
Ray 2009-08-15 13:30:31 -04:00
parent 116141b833
commit 46085cba5d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyfpdb/FulltiltToFpdb.py
View File

@ -33,7 +33,8 @@ class Fulltilt(HandHistoryConverter):
siteId = 1 # Needs to match id entry in Sites database siteId = 1 # Needs to match id entry in Sites database
# Static regexes # Static regexes
re_GameInfo = re.compile('''(?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)? re_GameInfo = re.compile('''.*\#(?P<HID>[0-9]+):\s
(?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
.+ .+
-\s(?P<CURRENCY>\$|)? -\s(?P<CURRENCY>\$|)?
(?P<SB>[.0-9]+)/ (?P<SB>[.0-9]+)/
@ -110,7 +111,7 @@ class Fulltilt(HandHistoryConverter):
if not m: if not m:
return None return None
mg = m.groupdict() mg = m.groupdict()
print mg
# translations from captured groups to our info strings # translations from captured groups to our info strings
limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' } limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
games = { # base, category games = { # base, category
@ -132,7 +133,7 @@ class Fulltilt(HandHistoryConverter):
if mg['TOURNO'] == None: info['type'] = "ring" if mg['TOURNO'] == None: info['type'] = "ring"
else: info['type'] = "tour" else: info['type'] = "tour"
# NB: SB, BB must be interpreted as blinds or bets depending on limit type. # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting # if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting
return info return info
#Following function is a hack, we should be dealing with this in readFile (i think correct codepage....) #Following function is a hack, we should be dealing with this in readFile (i think correct codepage....)