From bf18295eb79e0050de9da83a1df3c45afc264bab Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 27 Dec 2010 17:51:15 +0800
Subject: [PATCH 1/3] HHC: Add timezone reference for CCT

Made it the same as Perth for the moment.
---
 pyfpdb/HandHistoryConverter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 34760664..8091b93a 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -632,7 +632,7 @@ or None if we fail to get the info """
         elif givenTimezone == 'IST': # India Standard Time
             pass
         elif givenTimezone == 'CCT': # China Coast Time
-            pass
+            givenTZ = timezone('Australia/West')
         elif givenTimezone == 'JST': # Japan Standard Time
             pass
         elif givenTimezone == 'AWST': # Australian Western Standard Time

From 3fdab4a8c38b0e13c6e3ce1b863333bec067c8a6 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 27 Dec 2010 18:28:00 +0800
Subject: [PATCH 2/3] FTPSummary: Minor regex change for failing summary file

---
 pyfpdb/FullTiltPokerSummary.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py
index 6ad7560e..56cf3532 100644
--- a/pyfpdb/FullTiltPokerSummary.py
+++ b/pyfpdb/FullTiltPokerSummary.py
@@ -46,7 +46,9 @@ class FullTiltPokerSummary(TourneySummary):
 
     substitutions = {
                      'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP",    # legal ISO currency codes
-                            'LS' : "\$|\xe2\x82\xac|"        # legal currency symbols - Euro(cp1252, utf-8)
+                            'LS' : "\$|\xe2\x82\xac|",       # legal currency symbols - Euro(cp1252, utf-8)
+                           'TAB' : u"-\u2013'\s\da-zA-Z",    # legal characters for tablename
+                           'NUM' : u".,\d",                  # legal characters in number format
                     }
 
     re_SplitTourneys = re.compile("^Full Tilt Poker Tournament Summary")
@@ -62,7 +64,7 @@ class FullTiltPokerSummary(TourneySummary):
                         (Buy-In\sChips:\s(?P<CHIPS>\d+)\s+)?
                         (?P<ENTRIES>[0-9]+)\sEntries\s+
                         (\$?(?P<ADDED>[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)?
-                        (Total\sPrize\sPool:\s\$?(?P<PRIZEPOOL>[.0-9]+)\s+)?
+                        (Total\sPrize\sPool:\s\$?(?P<PRIZEPOOL>[%(NUM)s]+)\s+)?
                         (Target\sTournament\s.*)?
                         Tournament\sstarted:\s
                         (?P<Y>[\d]{4})\/(?P<M>[\d]{2})\/(?P<D>[\d]+)\s+(?P<H>[\d]+):(?P<MIN>[\d]+):(?P<S>[\d]+)\s??(?P<TZ>[A-Z]+)\s

From 0e33f0f29bf58c9d849717c71580906544e815f2 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 27 Dec 2010 19:24:54 +0800
Subject: [PATCH 3/3] FTPSummary: Expand regex to deal with rebuy info

New fields:
ADDON - cost of addon
REBUYAMT - cost of rebuy
PNAME - Hero name
PREBUYS - No of Hero rebuys
ADDONCHIPS - How many chips the addon purchased
REBUYCHIPS - How many chips a rebuy purchased
ADDONS - Total # of tourney addons
REBUYS - Total # of tourney rebuys
---
 pyfpdb/FullTiltPokerSummary.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py
index 56cf3532..d3bcf191 100644
--- a/pyfpdb/FullTiltPokerSummary.py
+++ b/pyfpdb/FullTiltPokerSummary.py
@@ -57,12 +57,19 @@ class FullTiltPokerSummary(TourneySummary):
 
     re_TourneyInfo = re.compile(u"""
                         \s.*
-                        (?P<TYPE>Tournament|Sit\s\&\sGo)\s\((?P<TOURNO>[0-9]+)\)(\s+)?
+                        (?P<TYPE>Tournament|Sit\s\&\sGo|\(Rebuy\))\s\((?P<TOURNO>[0-9]+)\)(\s+)?
                         (?P<GAME>Hold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s+
                         (?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\s+
                         (Buy-In:\s\$(?P<BUYIN>[.\d]+)(\s\+\s\$(?P<FEE>[.\d]+))?\s+)?
+                        (Add-On:\s\$(?P<ADDON>[.\d]+)\s+)?
+                        (Rebuy:\s\$(?P<REBUYAMT>[.\d]+)\s+)?
+                        ((?P<PNAME>.{2,15})\sperformed\s(?P<PREBUYS>\d+)\sRebuys\s+)?
                         (Buy-In\sChips:\s(?P<CHIPS>\d+)\s+)?
+                        (Add-On\sChips:\s(?P<ADDONCHIPS>\d+)\s+)?
+                        (Rebuy\sChips:\s(?P<REBUYCHIPS>\d+)\s+)?
                         (?P<ENTRIES>[0-9]+)\sEntries\s+
+                        (Total\sAdd-Ons:\s(?P<ADDONS>\d+)\s+)?
+                        (Total\sRebuys:\s(?P<REBUYS>\d+)\s+)?
                         (\$?(?P<ADDED>[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)?
                         (Total\sPrize\sPool:\s\$?(?P<PRIZEPOOL>[%(NUM)s]+)\s+)?
                         (Target\sTournament\s.*)?