diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index c1954140..290f2f42 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -54,7 +54,7 @@ class Fulltilt(HandHistoryConverter): \$?(?P[.0-9]+)/\$?(?P[.0-9]+)\s(Ante\s\$?(?P[.0-9]+)\s)?-\s \$?(?P[.0-9]+\sCap\s)? (?P[a-zA-Z\/\'\s]+)\s-\s - (?P\d+:\d+:\d+\s\w+\s-\s\d+/\d+/\d+)\s? + (?P\d+:\d+:\d+\s\w+\s-\s\d+/\d+/\d+|\d+:\d+\s\w+\s-\s\w+\,\s\w+\s\d+\,\s\d+) (?P\(partial\))?\n (?:.*?\n(?PHand\s\#(?P=HID)\shas\sbeen\scanceled))? ''', re.VERBOSE|re.DOTALL) @@ -201,8 +201,14 @@ class Fulltilt(HandHistoryConverter): return None hand.handid = m.group('HID') hand.tablename = m.group('TABLE') - hand.startTime = HandHistoryConverter.changeTimezone(datetime.datetime.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d"), "ET", "UTC") - + + try: + hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d") + except: + hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%H:%M ET - %a, %B %d, %Y") + + hand.startTime = HandHistoryConverter.changeTimezone(hand.startTime, "ET", "UTC") + if m.group("CANCELLED") or m.group("PARTIAL"): raise FpdbParseError(hid=m.group('HID'))