diff --git a/pyfpdb/HUD_config.test.xml b/pyfpdb/HUD_config.test.xml index 5ec16a56..5f9c62cf 100644 --- a/pyfpdb/HUD_config.test.xml +++ b/pyfpdb/HUD_config.test.xml @@ -578,6 +578,7 @@ Left-Drag to Move" + diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index cb2c8d2a..ba565609 100755 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -152,7 +152,6 @@ class Winamax(HandHistoryConverter): ["ring", "hold", "fl"], ["ring", "hold", "nl"], ["ring", "hold", "pl"], - ["ring", "stud", "fl"], ] def determineGameType(self, handText): @@ -233,7 +232,6 @@ class Winamax(HandHistoryConverter): log.info("readplayerstacks: re is '%s'" % self.re_PlayerInfo) m = self.re_PlayerInfo.finditer(hand.handText) for a in m: - print "DEBUG: found '%s' with '%s'" %(a.group('PNAME'), a.group('CASH')) hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH')) @@ -280,8 +278,8 @@ class Winamax(HandHistoryConverter): # Total pot 0.71€ | Rake 0.04€ m = re.search(r"\*\*\* ANTE\/BLINDS \*\*\*(?P.+(?=\*\*\* FLOP \*\*\*)|.+)" r"(\*\*\* FLOP \*\*\*(?P \[\S\S \S\S \S\S\].+(?=\*\*\* TURN \*\*\*)|.+))?" - r"(\*\*\* TURN \*\*\* \[\S\S \S\S \S\S] (?P\[\S\S\].+(?=\*\*\* RIVER \*\*\*)|.+))?" - r"(\*\*\* RIVER \*\*\* \[\S\S \S\S \S\S \S\S] (?P\[\S\S\].+))?", hand.handText,re.DOTALL) + r"(\*\*\* TURN \*\*\* \[\S\S \S\S \S\S](?P\[\S\S\].+(?=\*\*\* RIVER \*\*\*)|.+))?" + r"(\*\*\* RIVER \*\*\* \[\S\S \S\S \S\S \S\S](?P\[\S\S\].+))?", hand.handText,re.DOTALL) try: hand.addStreets(m)