From 20bb51145b43389449bafa5d8ad394c41105f8e2 Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 16:30:43 +0800 Subject: [PATCH 1/6] Options: add generic usage option --- pyfpdb/Options.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py index 11ef9d43..19139278 100644 --- a/pyfpdb/Options.py +++ b/pyfpdb/Options.py @@ -60,6 +60,9 @@ def fpdb_options(): default = 'EMPTY') parser.add_option("-v", "--version", action = "store_true", help = _("Print version information and exit.")) + parser.add_option("-u", "--usage", action="store_true", dest="usage", default=False, + help=_("Print some useful one liners")) + (options, argv) = parser.parse_args() return (options, argv) From 10a48240dbbc4a98a4d09beead1af999564c03f1 Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 16:31:39 +0800 Subject: [PATCH 2/6] PSSummary: Add new parseSummary method --- pyfpdb/PokerStarsSummary.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index 14b9cadc..bd8cbe4e 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -53,6 +53,8 @@ class PokerStarsSummary(TourneySummary): 'Triple Draw 2-7 Lowball' : ('draw','27_3draw'), '5 Card Draw' : ('draw','fivedraw') } + + re_SplitGames = re.compile("^PokerStars") re_TourNo = re.compile("\#[0-9]+,") re_Entries = re.compile("[0-9]+") @@ -167,4 +169,7 @@ class PokerStarsSummary(TourneySummary): self.addPlayer(rank, name, winnings, self.currency, None, None, None)#TODO: currency, ko/addon/rebuy count -> need examples! #end def parseSummary + def parseSummaryFile(self): + lines=self.summaryText.splitlines() + print lines #end class PokerStarsSummary From 04849775d7f33d46422ded5b99fc35677323db7a Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 16:32:46 +0800 Subject: [PATCH 3/6] TS: add new builtFrom option --- pyfpdb/TourneySummary.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index 105141d5..8fe7ceaa 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -127,6 +127,9 @@ class TourneySummary(object): if builtFrom=="IMAP": self.parseSummary() self.insertOrUpdate() + elif builtFrom == "file": + self.parseSummaryFile() + self.insertOrUpdate() #end def __init__ def __str__(self): From 1dda0848d32d7d0f04a2bb13491befe6f39dfc95 Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 16:33:16 +0800 Subject: [PATCH 4/6] ImapFetcher: Make it run from command line with -i --- pyfpdb/ImapFetcher.py | 62 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/pyfpdb/ImapFetcher.py b/pyfpdb/ImapFetcher.py index befecd6f..4c0422e1 100755 --- a/pyfpdb/ImapFetcher.py +++ b/pyfpdb/ImapFetcher.py @@ -20,8 +20,17 @@ #see http://tools.ietf.org/html/rfc2060#section-6.4.4 for IMAP4 search criteria from imaplib import IMAP4, IMAP4_SSL +import sys +import codecs +import re + +import Configuration +import Database +import SQL +import Options import PokerStarsSummary + import locale lang=locale.getdefaultlocale()[0][0:2] if lang=="en": @@ -89,4 +98,55 @@ def run(config, db): # finally: # pass server.logout() - \ No newline at end of file + +def readFile(filename): + kodec = "utf8" + in_fh = codecs.open(filename, 'r', kodec) + whole_file = in_fh.read() + in_fh.close() + return whole_file + + + +def runFake(db, config, infile): + summaryText = readFile(infile) + # This regex should be part of PokerStarsSummary + re_SplitGames = re.compile("PokerStars Tournament #") + summaryList = re.split(re_SplitGames, summaryText) + + if len(summaryList) <= 1: + print "DEBUG: re_SplitGames isn't matching" + + for summary in summaryList[1:]: + result = PokerStarsSummary.PokerStarsSummary(db=db, config=config, siteName=u"PokerStars", summaryText=summary, builtFrom = "file") + +def splitPokerStarsSummaries(emailText): + splitSummaries=emailText.split("\nPokerStars Tournament #")[1:] + + +def main(argv=None): + if argv is None: + argv = sys.argv[1:] + + (options, argv) = Options.fpdb_options() + + if options.usage == True: + #Print usage examples and exit + print _("USAGE:") + sys.exit(0) + + # These options should really come from the OptionsParser + config = Configuration.Config(file = "HUD_config.test.xml") + db = Database.Database(config) + sql = SQL.Sql(db_server = 'sqlite') + settings = {} + settings.update(config.get_db_parameters()) + settings.update(config.get_import_parameters()) + settings.update(config.get_default_paths()) + db.recreate_tables() + + runFake(db, config, options.infile) + +if __name__ == '__main__': + sys.exit(main()) + From e66b98b3451f79b34390afda2efaf8b84872ab06 Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 18:10:25 +0800 Subject: [PATCH 5/6] PSSummary: add function parseSummaryFile This parses the summary file without requiring state. Hope to merge parseSummary and parseSummaryFile at some point soon --- pyfpdb/ImapFetcher.py | 2 +- pyfpdb/PokerStarsSummary.py | 101 ++++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 12 deletions(-) diff --git a/pyfpdb/ImapFetcher.py b/pyfpdb/ImapFetcher.py index 4c0422e1..01d75a54 100755 --- a/pyfpdb/ImapFetcher.py +++ b/pyfpdb/ImapFetcher.py @@ -111,7 +111,7 @@ def readFile(filename): def runFake(db, config, infile): summaryText = readFile(infile) # This regex should be part of PokerStarsSummary - re_SplitGames = re.compile("PokerStars Tournament #") + re_SplitGames = re.compile("PokerStars Tournament ") summaryList = re.split(re_SplitGames, summaryText) if len(summaryList) <= 1: diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index bd8cbe4e..732e8a85 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -37,8 +37,6 @@ else: except IOError: def _(string): return string - - class PokerStarsSummary(TourneySummary): limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl', 'LIMIT':'fl' } games = { # base, category @@ -54,17 +52,38 @@ class PokerStarsSummary(TourneySummary): '5 Card Draw' : ('draw','fivedraw') } + substitutions = { + 'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP", # legal ISO currency codes + 'LS' : "\$|\xe2\x82\xac|" # legal currency symbols - Euro(cp1252, utf-8) + } + re_SplitGames = re.compile("^PokerStars") - re_TourNo = re.compile("\#[0-9]+,") + re_TourNo = re.compile("\#(?P[0-9]+),") + + re_TourneyInfo = re.compile(u""" + \#(?P[0-9]+),\s + (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s + (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s + Buy-In:\s\$(?P[.0-9]+)\/\$(?P[.0-9]+)\s + (?P[0-9]+)\splayers\s + Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s + Tournament\sstarted\s-\s + (?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\-\s]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)\s?\(?(?P[A-Z]+)\)\s + """ % substitutions ,re.VERBOSE|re.MULTILINE) + + re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) + + re_Player = re.compile(u"""(?P[0-9]+):\s(?P.*)\s\(.*\),(\s)?(\$(?P[0-9]+\.[0-9]+))?(?Pstill\splaying)?""") + + re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)") + re_Entries = re.compile("[0-9]+") re_Prizepool = re.compile("\$[0-9]+\.[0-9]+") - re_Player = re.compile(u"""(?P[0-9]+):\s(?P.*)\s\(.*\),(\s)?(\$(?P[0-9]+\.[0-9]+))?(?Pstill\splaying)?""") re_BuyInFee = re.compile("(?P[0-9]+\.[0-9]+).*(?P[0-9]+\.[0-9]+)") re_FPP = re.compile("(?P[0-9]+)\sFPP") #note: the dollar and cent in the below line are currency-agnostic re_Added = re.compile("(?P[0-9]+)\.(?P[0-9]+)\s(?P[A-Z]+)(\sadded\sto\sthe\sprize\spool\sby\sPokerStars)") - re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)") re_DateTimeET = re.compile("(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)") re_GameInfo = re.compile(u""".+(?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s(?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)""") @@ -103,7 +122,7 @@ class PokerStarsSummary(TourneySummary): currentLine+=1 #note that I chose to make the code keep state (the current line number) #as that means it'll fail rather than silently skip potentially valuable information #print "after entries lines[currentLine]", lines[currentLine] - + result=self.re_Added.search(lines[currentLine]) if result: result=result.groupdict() @@ -114,7 +133,7 @@ class PokerStarsSummary(TourneySummary): self.added=0 self.addedCurrency="NA" #print "after added/entries lines[currentLine]", lines[currentLine] - + result=self.re_Prizepool.findall(lines[currentLine]) if result: self.prizepool = result[0] @@ -133,7 +152,7 @@ class PokerStarsSummary(TourneySummary): self.startTime= datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S") # also timezone at end, e.g. " ET" self.startTime = HandHistoryConverter.changeTimezone(self.startTime, "ET", "UTC") currentLine+=1 - + if useET: result=self.re_DateTimeET.search(lines[currentLine]) else: @@ -156,7 +175,7 @@ class PokerStarsSummary(TourneySummary): rank=result['RANK'] name=result['NAME'] winnings=result['WINNINGS'] - + if winnings: winnings=int(100*Decimal(winnings)) else: @@ -169,7 +188,67 @@ class PokerStarsSummary(TourneySummary): self.addPlayer(rank, name, winnings, self.currency, None, None, None)#TODO: currency, ko/addon/rebuy count -> need examples! #end def parseSummary + def parseSummaryFile(self): - lines=self.summaryText.splitlines() - print lines + print self.summaryText + m = self.re_TourneyInfo.search(self.summaryText) + if m: + print "DEBUG: m.groupdict(): %s" % m.groupdict() + else: + tmp = self.summaryText[0:100] + log.error(_("parseSummaryFile: Unable to recognise Tourney Info: '%s'") % tmp) + log.error(_("parseSummaryFile: Raising FpdbParseError")) + raise FpdbParseError(_("Unable to recognise Tourney Info: '%s'") % tmp) + + mg = m.groupdict() + if 'TOURNO' in mg: self.tourNo = mg['TOURNO'] + if 'LIMIT' in mg: self.gametype['limitType'] = self.limits[mg['LIMIT']] + if 'GAME' in mg: self.gametype['category'] = self.games[mg['GAME']][1] + if 'BUYIN' in mg: self.buyin = int(100*Decimal(mg['BUYIN'])) + if 'FEE' in mg: self.fee = int(100*Decimal(mg['FEE'])) + if 'PRIZEPOOL' in mg: self.prizepool = mg['PRIZEPOOL'] + if 'ENTRIES' in mg: self.entries = mg['ENTRIES'] + + datetimestr = "%s/%s/%s %s:%s:%s" % (mg['Y'], mg['M'], mg['D'], mg['H'], mg['MIN'], mg['S']) + self.startTime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S") + + if 'TZ' in mg: + self.startTime = HandHistoryConverter.changeTimezone(self.startTime, mg['TZ'], "UTC") + + + m = self.re_Currency.search(self.summaryText) + if m: + print "DEBUG: m.groupdict(): %s" % m.groupdict() + else: + log.error(_("parseSummaryFile: Unable to locate currency")) + log.error(_("parseSummaryFile: Raising FpdbParseError")) + raise FpdbParseError(_("Unable to locate currency")) + + mg = m.groupdict() + if mg['CURRENCY'] == "$": self.currency = "USD" + elif mg['CURRENCY'] == u"€": self.currency="EUR" + elif mg['CURRENCY'] == "FPP": self.currency="PSFP" + + m = self.re_Player.finditer(self.summaryText) + for a in m: + mg = a.groupdict() + print "DEBUG: a.groupdict(): %s" % mg + name = mg['NAME'] + rank = mg['RANK'] + winnings = 0 + + if 'WINNINGS' in mg and mg['WINNINGS'] != None: + winnings = int(100*Decimal(mg['WINNINGS'])) + + if 'STILLPLAYING' in mg: + #print "stillplaying" + rank=None + winnings=None + + #TODO: currency, ko/addon/rebuy count -> need examples! + self.addPlayer(rank, name, winnings, self.currency, None, None, None) + + print self + sys.exit(0) + #end class PokerStarsSummary From 016b0ed48f15b8b92b2e15b997a296ce1fe7a7a1 Mon Sep 17 00:00:00 2001 From: Worros Date: Sat, 4 Sep 2010 20:06:24 +0800 Subject: [PATCH 6/6] Tourney Graphing and Summary import update It now gets through my 200 tourney torture test. --- pyfpdb/GuiTourneyGraphViewer.py | 2 +- pyfpdb/ImapFetcher.py | 3 ++- pyfpdb/PokerStarsSummary.py | 38 ++++++++++++++++++--------------- pyfpdb/SQL.py | 2 +- pyfpdb/TourneySummary.py | 4 ++-- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/pyfpdb/GuiTourneyGraphViewer.py b/pyfpdb/GuiTourneyGraphViewer.py index e213e1f4..e8a3d41e 100644 --- a/pyfpdb/GuiTourneyGraphViewer.py +++ b/pyfpdb/GuiTourneyGraphViewer.py @@ -268,7 +268,7 @@ class GuiTourneyGraphViewer (threading.Thread): if len(winnings) == 0: return None - green = map(lambda x:float(x[0]), winnings) + green = map(lambda x:float(x[1]), winnings) #blue = map(lambda x: float(x[1]) if x[2] == True else 0.0, winnings) #red = map(lambda x: float(x[1]) if x[2] == False else 0.0, winnings) greenline = cumsum(green) diff --git a/pyfpdb/ImapFetcher.py b/pyfpdb/ImapFetcher.py index 01d75a54..b3b5785f 100755 --- a/pyfpdb/ImapFetcher.py +++ b/pyfpdb/ImapFetcher.py @@ -119,6 +119,7 @@ def runFake(db, config, infile): for summary in summaryList[1:]: result = PokerStarsSummary.PokerStarsSummary(db=db, config=config, siteName=u"PokerStars", summaryText=summary, builtFrom = "file") + print "DEBUG: Processed: %s: tournNo: %s" % (result.tourneyId, result.tourNo) def splitPokerStarsSummaries(emailText): splitSummaries=emailText.split("\nPokerStars Tournament #")[1:] @@ -136,7 +137,7 @@ def main(argv=None): sys.exit(0) # These options should really come from the OptionsParser - config = Configuration.Config(file = "HUD_config.test.xml") + config = Configuration.Config() db = Database.Database(config) sql = SQL.Sql(db_server = 'sqlite') settings = {} diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index 732e8a85..36ceae48 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -65,12 +65,15 @@ class PokerStarsSummary(TourneySummary): \#(?P[0-9]+),\s (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s - Buy-In:\s\$(?P[.0-9]+)\/\$(?P[.0-9]+)\s + (?P[ a-zA-Z]+\s)? + (Buy-In:\s\$(?P[.0-9]+)(\/\$(?P[.0-9]+))?\s)? (?P[0-9]+)\splayers\s - Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s + (\$?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s)? + (Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s)? + (Target\sTournament\s.*)? Tournament\sstarted\s-\s (?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\-\s]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)\s?\(?(?P[A-Z]+)\)\s - """ % substitutions ,re.VERBOSE|re.MULTILINE) + """ % substitutions ,re.VERBOSE|re.MULTILINE|re.DOTALL) re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) @@ -190,22 +193,23 @@ class PokerStarsSummary(TourneySummary): #end def parseSummary def parseSummaryFile(self): - print self.summaryText m = self.re_TourneyInfo.search(self.summaryText) - if m: - print "DEBUG: m.groupdict(): %s" % m.groupdict() - else: - tmp = self.summaryText[0:100] + if m == None: + tmp = self.summaryText[0:200] log.error(_("parseSummaryFile: Unable to recognise Tourney Info: '%s'") % tmp) log.error(_("parseSummaryFile: Raising FpdbParseError")) raise FpdbParseError(_("Unable to recognise Tourney Info: '%s'") % tmp) + #print "DEBUG: m.groupdict(): %s" % m.groupdict() + mg = m.groupdict() if 'TOURNO' in mg: self.tourNo = mg['TOURNO'] if 'LIMIT' in mg: self.gametype['limitType'] = self.limits[mg['LIMIT']] if 'GAME' in mg: self.gametype['category'] = self.games[mg['GAME']][1] - if 'BUYIN' in mg: self.buyin = int(100*Decimal(mg['BUYIN'])) - if 'FEE' in mg: self.fee = int(100*Decimal(mg['FEE'])) + if mg['BUYIN'] != None: + self.buyin = int(100*Decimal(mg['BUYIN'])) + if mg['FEE'] != None: + self.fee = int(100*Decimal(mg['FEE'])) if 'PRIZEPOOL' in mg: self.prizepool = mg['PRIZEPOOL'] if 'ENTRIES' in mg: self.entries = mg['ENTRIES'] @@ -217,12 +221,11 @@ class PokerStarsSummary(TourneySummary): m = self.re_Currency.search(self.summaryText) - if m: - print "DEBUG: m.groupdict(): %s" % m.groupdict() - else: + if m == None: log.error(_("parseSummaryFile: Unable to locate currency")) log.error(_("parseSummaryFile: Raising FpdbParseError")) raise FpdbParseError(_("Unable to locate currency")) + #print "DEBUG: m.groupdict(): %s" % m.groupdict() mg = m.groupdict() if mg['CURRENCY'] == "$": self.currency = "USD" @@ -232,7 +235,7 @@ class PokerStarsSummary(TourneySummary): m = self.re_Player.finditer(self.summaryText) for a in m: mg = a.groupdict() - print "DEBUG: a.groupdict(): %s" % mg + #print "DEBUG: a.groupdict(): %s" % mg name = mg['NAME'] rank = mg['RANK'] winnings = 0 @@ -240,15 +243,16 @@ class PokerStarsSummary(TourneySummary): if 'WINNINGS' in mg and mg['WINNINGS'] != None: winnings = int(100*Decimal(mg['WINNINGS'])) - if 'STILLPLAYING' in mg: + if 'STILLPLAYING' in mg and mg['STILLPLAYING'] != None: #print "stillplaying" rank=None winnings=None #TODO: currency, ko/addon/rebuy count -> need examples! + #print "DEBUG: addPlayer(%s, %s, %s, %s, None, None, None)" %(rank, name, winnings, self.currency) + #print "DEBUG: self.buyin: %s self.fee %s" %(self.buyin, self.fee) self.addPlayer(rank, name, winnings, self.currency, None, None, None) - print self - sys.exit(0) + #print self #end class PokerStarsSummary diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 87857908..fff3f07e 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -3050,7 +3050,7 @@ class Sql: # Tourney Results query #################################### self.query['tourneyResults'] = """ - SELECT (tp.winnings - tt.buyIn - tt.fee) as profit, tp.koCount, tp.rebuyCount, tp.addOnCount, tt.buyIn, tt.fee + SELECT tp.tourneyId, (tp.winnings - tt.buyIn - tt.fee) as profit, tp.koCount, tp.rebuyCount, tp.addOnCount, tt.buyIn, tt.fee, t.siteTourneyNo FROM TourneysPlayers tp INNER JOIN Players pl ON (pl.id = tp.playerId) INNER JOIN Tourneys t ON (t.id = tp.tourneyId) diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index 8fe7ceaa..f78d96de 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -74,8 +74,8 @@ class TourneySummary(object): self.endTime = None self.tourNo = None self.currency = None - self.buyin = None - self.fee = None + self.buyin = 0 + self.fee = 0 self.hero = None self.maxseats = 0 self.entries = 0