From 005dc9ba4cf8ff222f1148c5dda0c61d1a22f3e8 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 7 Feb 2011 23:22:17 +0800
Subject: [PATCH] FTP: Handle partial hhs in date function

---
 pyfpdb/FulltiltToFpdb.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index f520d079..30444353 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -89,7 +89,7 @@ class Fulltilt(HandHistoryConverter):
                                     [%(LS)s]?(?P<CAP>[.0-9]+\sCap\s)?
                                     (?P<GAMETYPE>[-\da-zA-Z\/\'\s]+)\s-\s
                                     (?P<DATETIME>.*$)
-                                    (?P<PARTIAL>\(partial\))?\n
+                                    (?P<PARTIAL>\(partial\))?\s
                                     (?:.*?\n(?P<CANCELLED>Hand\s\#(?P=HID)\shas\sbeen\scanceled))?
                                  ''' % substitutions, re.MULTILINE|re.VERBOSE)
     re_TourneyExtraInfo  = re.compile('''(((?P<TOURNEY_NAME>[^$]+)?
@@ -148,7 +148,7 @@ class Fulltilt(HandHistoryConverter):
     re_Mixed        = re.compile(r'\s\-\s(?P<MIXED>HA|HORSE|HOSE)\s\-\s', re.VERBOSE)
     re_Max          = re.compile("(?P<MAX>\d+)( max)?", re.MULTILINE)
     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports.
-    re_DateTime     = re.compile("""((?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)\s(?P<TZ>\w+)\s-\s(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})|(?P<H2>[0-9]+):(?P<MIN2>[0-9]+)\s(?P<TZ2>\w+)\s-\s\w+\,\s(?P<M2>\w+)\s(?P<D2>\d+)\,\s(?P<Y2>[0-9]{4}))""", re.MULTILINE)
+    re_DateTime     = re.compile("""((?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)\s(?P<TZ>\w+)\s-\s(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})|(?P<H2>[0-9]+):(?P<MIN2>[0-9]+)\s(?P<TZ2>\w+)\s-\s\w+\,\s(?P<M2>\w+)\s(?P<D2>\d+)\,\s(?P<Y2>[0-9]{4}))(?P<PARTIAL>\s\(partial\))?""", re.MULTILINE)
 
 
 
@@ -284,10 +284,13 @@ class Fulltilt(HandHistoryConverter):
                     datetimestr = "%s/%s/%s %s:%s" % (a.group('Y2'), a.group('M2'),a.group('D2'),a.group('H2'),a.group('MIN2'))
                     timezone = a.group('TZ2')
                     hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%B/%d %H:%M")
+                if a.group('PARTIAL'):
+                    raise FpdbParseError(hid=m.group('HID'))
 
             hand.startTime = HandHistoryConverter.changeTimezone(hand.startTime, timezone, "UTC")
 
         if m.group("CANCELLED") or m.group("PARTIAL"):
+            # It would appear this can't be triggered as DATETIME is a bit greedy
             raise FpdbParseError(hid=m.group('HID'))
 
         if m.group('TABLEATTRIBUTES'):