diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index 299ff669..c31a52ab 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -55,8 +55,9 @@ class Absolute(HandHistoryConverter): (?PNo\ Limit|Pot\ Limit|Normal|)\s? (?P\$|\s€|) (?P[.,0-9]+)/?(?:\$|\s€|)(?P[.,0-9]+)? - \s+-\s+ - (?P\d\d\d\d-\d\d-\d\d\ \d\d:\d\d:\d\d)\s+ + \s+ + ((?P(Turbo))\s+)?-\s+ + ((?P\d\d\d\d-\d\d-\d\d\ \d\d:\d\d:\d\d)(\.\d+)?)\s+ (?: \( (?P[A-Z]+) \)\s+ )? .*? (Table:\ (?P.*?)\ \(Real\ Money\))? diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py index fcabf379..1bcc8dd5 100755 --- a/pyfpdb/Card.py +++ b/pyfpdb/Card.py @@ -98,7 +98,7 @@ def twoStartCardString(card): if x == y: ret = s[x] + s[y] elif x > y: ret = s[x] + s[y] + 's' else: ret = s[y] + s[x] + 'o' - print "twoStartCardString(", card ,") = " + ret + #print "twoStartCardString(", card ,") = " + ret return ret def fourStartCards(value1, suit1, value2, suit2, value3, suit3, value4, suit4): diff --git a/pyfpdb/Cards02.png b/pyfpdb/Cards02.png new file mode 100644 index 00000000..63fa6fdf Binary files /dev/null and b/pyfpdb/Cards02.png differ diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 35841213..4efc832f 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -2359,8 +2359,9 @@ class Database: def createOrUpdateTourney(self, hand, source):#note: this method is used on Hand and TourneySummary objects cursor = self.get_cursor() - cursor.execute (self.sql.query['getTourneyByTourneyNo'].replace('%s', self.sql.query['placeholder']), - (hand.siteId, hand.tourNo)) + q = self.sql.query['getTourneyByTourneyNo'].replace('%s', self.sql.query['placeholder']) + cursor.execute(q, (hand.siteId, hand.tourNo)) + columnNames=[desc[0] for desc in cursor.description] result=cursor.fetchone() @@ -2385,9 +2386,12 @@ class Database: # if (resultDict[ev] < hand.startTime): # hand.startTime=resultDict[ev] if updateDb: - cursor.execute (self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']), - (hand.entries, hand.prizepool, hand.startTime, hand.endTime, hand.tourneyName, - hand.matrixIdProcessed, hand.totalRebuyCount, hand.totalAddOnCount, hand.comment, hand.commentTs, tourneyId)) + q = self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']) + row = (hand.entries, hand.prizepool, hand.startTime, hand.endTime, hand.tourneyName, + hand.matrixIdProcessed, hand.totalRebuyCount, hand.totalAddOnCount, hand.comment, + hand.commentTs, tourneyId + ) + cursor.execute(q, row) else: if source=="HHC": cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']), @@ -2436,9 +2440,19 @@ class Database: elif getattr(hand, handAttribute)[player]!=None and resultDict[ev]==None:#object has this value but DB doesnt, so update DB updateDb=True if updateDb: - cursor.execute (self.sql.query['updateTourneysPlayer'].replace('%s', self.sql.query['placeholder']), - (hand.ranks[player], hand.winnings[player], hand.winningsCurrency[player], - hand.rebuyCounts[player], hand.addOnCounts[player], hand.koCounts[player], tourneysPlayersIds[player[1]])) + q = self.sql.query['updateTourneysPlayer'].replace('%s', self.sql.query['placeholder']) + inputs = (hand.ranks[player], + hand.winnings[player], + hand.winningsCurrency[player], + hand.rebuyCounts[player], + hand.addOnCounts[player], + hand.koCounts[player], + tourneysPlayersIds[player[1]] + ) + #print q + #pp = pprint.PrettyPrinter(indent=4) + #pp.pprint(inputs) + cursor.execute(q, inputs) else: if source=="HHC": cursor.execute (self.sql.query['insertTourneysPlayer'].replace('%s', self.sql.query['placeholder']), diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 2338c8a0..380c5077 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -74,7 +74,7 @@ class Fulltilt(HandHistoryConverter): (Ante\s\$?(?P[%(NUM)s]+)\s)?-\s [%(LS)s]?(?P[%(NUM)s]+\sCap\s)? (?P(No\sLimit|Pot\sLimit|Limit))?\s - (?P(Hold\'em|Omaha\sHi|Omaha\sH/L|Omaha|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi|2-7\sTriple\sDraw|5\sCard\sDraw|Badugi)) + (?P(Hold\'em|Omaha(\sH/L|\sHi/Lo|\sHi|)|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi|2-7\sTriple\sDraw|5\sCard\sDraw|Badugi)) ''' % substitutions, re.VERBOSE) re_SplitHands = re.compile(r"\n\n\n+") re_TailSplitHands = re.compile(r"(\n\n+)") @@ -114,7 +114,7 @@ class Fulltilt(HandHistoryConverter): (\((?PTurbo)\)\s)? \((?P\d+)\)\s ((?PMatch\s\d)\s)? - (?P(Hold\'em|Omaha\sHi|Omaha\sH/L|Omaha|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi))\s + (?P(Hold\'em|Omaha(\sHi/Lo|\sH/L|\sHi|)|7\sCard\sStud|Stud\sH/L|Razz|Stud\sHi))\s (\((?PTurbo)\)\s)? (?P(No\sLimit|Pot\sLimit|Limit))? ''' % substitutions, re.VERBOSE) @@ -198,11 +198,6 @@ class Fulltilt(HandHistoryConverter): ] def determineGameType(self, handText): - # Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22 - # Full Tilt Poker Game #10773265574: Table Butte (6 max) - $0.01/$0.02 - Pot Limit Hold'em - 21:33:46 ET - 2009/02/21 - # Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09 - # Full Tilt Poker Game #10809877615: Table Danville - $0.50/$1 Ante $0.10 - Limit Razz - 21:47:27 ET - 2009/02/23 - # Full Tilt Poker.fr Game #23057874034: Table Douai–Lens (6 max) - €0.01/€0.02 - No Limit Hold'em - 21:59:17 CET - 2010/08/13 info = {'type':'ring'} m = self.re_GameInfo.search(handText) @@ -220,6 +215,7 @@ class Fulltilt(HandHistoryConverter): 'Omaha Hi' : ('hold','omahahi'), 'Omaha' : ('hold','omahahi'), 'Omaha H/L' : ('hold','omahahilo'), + 'Omaha Hi/Lo' : ('hold','omahahilo'), 'Razz' : ('stud','razz'), 'Stud Hi' : ('stud','studhi'), 'Stud H/L' : ('stud','studhilo'), diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index 903a344c..69265fbf 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -335,7 +335,7 @@ class PartyPoker(HandHistoryConverter): hand.fee = 0 hand.buyinCurrency = "FREE" hand.isKO = False - if hand.tourNo != None: + elif hand.tourNo != None: hand.buyin = 0 hand.fee = 0 hand.buyinCurrency = "FREE" diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 7b1add77..8807bf7b 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -115,7 +115,7 @@ class PokerStars(HandHistoryConverter): re.MULTILINE|re.VERBOSE) re_HandInfo = re.compile(""" - ^Table\s\'(?P
[-\ \#a-zA-Z\d]+)\'\s + ^Table\s\'(?P
[-\ \#a-zA-Z\d\']+)\'\s ((?P\d+)-max\s)? (?P\(Play\sMoney\)\s)? (Seat\s\#(?P