From f5b52190ab523054290595156ef673e0fa9d85ac Mon Sep 17 00:00:00 2001 From: grindi Date: Wed, 3 Nov 2010 19:54:03 +0300 Subject: [PATCH] Make Party hhc to regonize non-english hh --- pyfpdb/PartyPokerToFpdb.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index a80810c7..cf29fb31 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -21,6 +21,7 @@ import sys from collections import defaultdict +from Configuration import LOCALE_ENCODING from Exceptions import FpdbParseError from HandHistoryConverter import * @@ -38,7 +39,7 @@ class FpdbParseError(FpdbParseError): class PartyPoker(HandHistoryConverter): sitename = "PartyPoker" - codepage = "cp1252" + codepage = "utf8" siteId = 9 filetype = "text" sym = {'USD': "\$", } @@ -52,7 +53,7 @@ class PartyPoker(HandHistoryConverter): (?P(Texas\ Hold\'em|Omaha)) \s*\-\s* (?P.+) - """, re.VERBOSE) + """, re.VERBOSE | re.UNICODE) re_GameInfoTrny = re.compile(""" (?P(NL|PL|))\s* (?P(Texas\ Hold\'em|Omaha))\s+ @@ -66,7 +67,7 @@ class PartyPoker(HandHistoryConverter): \) \s*\-\s* (?P.+) - """, re.VERBOSE) + """, re.VERBOSE | re.UNICODE) re_Hid = re.compile("^Game \#(?P\d+) starts.") re_PlayerInfo = re.compile(""" @@ -178,6 +179,10 @@ class PartyPoker(HandHistoryConverter): return self._gameType return self._gameType + @staticmethod + def decode_hand_text(handText): + return handText.encode("latin1").decode(LOCALE_ENCODING) + def determineGameType(self, handText): """inspect the handText and return the gametype dict @@ -185,6 +190,7 @@ class PartyPoker(HandHistoryConverter): {'limitType': xxx, 'base': xxx, 'category': xxx}""" info = {} + handText = self.decode_hand_text(handText) m = self._getGameType(handText) m_sb = self.re_ringSB.search(handText) m_bb = self.re_ringBB.search(handText) @@ -231,6 +237,10 @@ class PartyPoker(HandHistoryConverter): def readHandInfo(self, hand): + # we should redecode handtext here (as it imposible to it above) + # if you know more accurate way to do it - tell me + hand.handText = self.decode_hand_text(hand.handText) + info = {} try: info.update(self.re_Hid.search(hand.handText).groupdict()) @@ -279,10 +289,15 @@ class PartyPoker(HandHistoryConverter): #Saturday, July 25, 07:53:52 EDT 2009 #Thursday, July 30, 21:40:41 MSKS 2009 #Sunday, October 25, 13:39:07 MSK 2009 - m2 = re.search("\w+, (?P\w+) (?P\d+), (?P\d+):(?P\d+):(?P\d+) (?P[A-Z]+) (?P\d+)", info[key]) - # we cant use '%B' due to locale problems + m2 = re.search( + r"\w+,\s+(?P\w+)\s+(?P\d+),\s+(?P\d+):(?P\d+):(?P\d+)\s+(?P[A-Z]+)\s+(?P\d+)", + info[key], + re.UNICODE + ) months = ['January', 'February', 'March', 'April','May', 'June', 'July','August','September','October','November','December'] + if m2.group('M') not in months: + raise FpdbParseError("Only english hh is supported", hid=info["HID"]) month = months.index(m2.group('M')) + 1 datetimestr = "%s/%s/%s %s:%s:%s" % (m2.group('Y'), month,m2.group('D'),m2.group('H'),m2.group('MIN'),m2.group('S')) hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S") @@ -481,10 +496,8 @@ class PartyPoker(HandHistoryConverter): "Returns string to search in windows titles" if type=="tour": TableName = table_name.split(" ") - print 'party', 'getTableTitleRe', "%s.+Table\s#%s" % (TableName[0], table_number) return "%s.+Table\s#%s" % (TableName[0], table_number) else: - print 'party', 'getTableTitleRe', table_number return table_name def clearMoneyString(money):