From ab20e28dc417952cc914a75492871d6a0c5a48e6 Mon Sep 17 00:00:00 2001
From: Erki Ferenc <erkiferenc@gmail.com>
Date: Mon, 6 Sep 2010 00:34:02 +0200
Subject: [PATCH 01/11] Anonymised players in a sample file

---
 .../NLHE-USD-0.02-0.04-20100811.unseatedPlayerActions.txt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.02-0.04-20100811.unseatedPlayerActions.txt b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.02-0.04-20100811.unseatedPlayerActions.txt
index 9b04cee0..795165e5 100644
--- a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.02-0.04-20100811.unseatedPlayerActions.txt
+++ b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.02-0.04-20100811.unseatedPlayerActions.txt
@@ -19,9 +19,9 @@ Player2 posts big blind [$0.04 USD].
 Player7 posts big blind [$0.04 USD].
 ** Dealing down cards **
 Dealt to Player1 [  Ad 4c ]
-marmitt84 has joined the table.
+Player8 has joined the table.
 Player2 checks
-samvel1976 has joined the table.
+Player9 has joined the table.
 Player7 checks
 Player5 folds
 Player3 calls [$0.02 USD]

From bc4a53d754c998ca03ed47c36b5e2708410c6f83 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 15:14:54 +0800
Subject: [PATCH 02/11] FTP: Fix re_PlayerInfo to find ', is sitting out' for
 cash games

Turns out that a player sitting out at the start of a cash game hand can (in what i hope is a small set of hands) be dealt cards and act in a hand
---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index f94903c5..2c823dd1 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -84,7 +84,7 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''' % substitutions, re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s](?P<CASH>[,.0-9]+)\)$' % substitutions, re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s](?P<CASH>[,.0-9]+)\)(, is sitting out)?$' % substitutions, re.MULTILINE)
     re_TourneysPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s]?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$' % substitutions, re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 

From cb90147303fd831378c8cc3bed0af14d4a831244 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 16:26:37 +0800
Subject: [PATCH 03/11] iPoker: Minor update to determineGameType

---
 pyfpdb/iPokerToFpdb.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/iPokerToFpdb.py b/pyfpdb/iPokerToFpdb.py
index 400de2fa..a2b2b829 100644
--- a/pyfpdb/iPokerToFpdb.py
+++ b/pyfpdb/iPokerToFpdb.py
@@ -71,12 +71,13 @@ class iPoker(HandHistoryConverter):
     sitename = "iPoker"
     filetype = "text"
     codepage = "cp1252"
-    siteID   = 11
+    siteID   = 13
 
     # Static regexes
     re_SplitHands = re.compile(r'</game>\n+(?=<game)')
     re_TailSplitHands = re.compile(r'(</game>)')
-    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)\)"/>', re.MULTILINE)
+    re_GameInfo = re.compile(r'<gametype>(?P<GAME>[a-zA-Z0-9 ]+) \$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)</gametype>', re.MULTILINE)
+# \$(?P<SB>[.0-9]+)\/\$(?P<BB>[.0-9]+)<\/gametype>', re.MULTILINE)
     re_HandInfo = re.compile(r'<game id="(?P<HID1>[0-9]+)-(?P<HID2>[0-9]+)" starttime="(?P<DATETIME>[0-9]+)" numholecards="2" gametype="2" realmoney="true" data="[0-9]+\|(?P<TABLE>[^\(]+)', re.MULTILINE)
     re_Button = re.compile(r'<players dealer="(?P<BUTTON>[0-9]+)">')
     re_PlayerInfo = re.compile(r'<player seat="(?P<SEAT>[0-9]+)" nickname="(?P<PNAME>.+)" balance="\$(?P<CASH>[.0-9]+)" dealtin="(?P<DEALTIN>(true|false))" />', re.MULTILINE)

From ccfc55eec37f7516bd61f850e58ea7020749909c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 16:27:31 +0800
Subject: [PATCH 04/11] iPoker: Another minot update to determineGameType

---
 pyfpdb/iPokerToFpdb.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/iPokerToFpdb.py b/pyfpdb/iPokerToFpdb.py
index a2b2b829..900b28ed 100644
--- a/pyfpdb/iPokerToFpdb.py
+++ b/pyfpdb/iPokerToFpdb.py
@@ -147,11 +147,12 @@ or None if we fail to get the info """
 
         limits = { 'No Limit':'nl', 'Limit':'fl' }
         games = {              # base, category
-                    'Holdem' : ('hold','holdem'),
-         'Holdem Tournament' : ('hold','holdem') }
+                    '7 Card Stud L' : ('stud','studhilo'),
+                }
 
         if 'LIMIT' in mg:
             self.info['limitType'] = limits[mg['LIMIT']]
+        self.info['limitType'] = 'fl'
         if 'GAME' in mg:
             (self.info['base'], self.info['category']) = games[mg['GAME']]
         if 'SB' in mg:

From ef99f7026f62f8de89a78907322efbd783c070c7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 16:28:18 +0800
Subject: [PATCH 05/11] Regression: Add new FTP test file

---
 ...0.10-201006.Player.sitting.out.but.acting.txt | Bin 0 -> 2858 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-USD-0.05-0.10-201006.Player.sitting.out.but.acting.txt

diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-USD-0.05-0.10-201006.Player.sitting.out.but.acting.txt b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-USD-0.05-0.10-201006.Player.sitting.out.but.acting.txt
new file mode 100644
index 0000000000000000000000000000000000000000..03ff80f2fd7898c5fe6903f67595717010c75d8a
GIT binary patch
literal 2858
zcmbtW*>2N76ur+#{DY+;brG~Uiyik3Xv5k?X^Mmp56)7k+9Xxtf{^%j;G9|NWoC#J
zWQ{ZN_}ul}d;RBkU+(1=S0qEZ#&3b$xh&*Hrn1ETwd69xK9VhI$#ZjM54%_n6*iX<
z(0uO%h_QUbF2-AtJi~f|-9A=V4$QthJB7ALK0x~ni~8T-$*oLe8}epGLM$C<q6LRo
zlzR+|wRAqEyaTL6-D7zykK_XQTuIbco<nLbKk;;l_aoVXEeY(RH@gi)OZinrv<xCu
zh^~WZJBYSHbb;te>LBP5qg`6nF^D!0EkvtnRo6ju4I+kyeRz{Nn8d+k21DOdkMF62
zNDP9Ww2+CWT|Ebp8U(Fk-kXTbLG%ow14O3$c#0?2vci3(m{H(9m#_H00BZ}Cv1at{
zaJIr3Q3Y5?My|l398o6A$x=$0C@ELCm)s<0s`40HpS%$y(29^Oa*?uzM*m1zTfnk8
zP}(EfK+7ycx1_Bwd%}w~aE6*V#_pB8kbxY5&5=6WQ|}!qq^?&=uJee@`;4fw3KLZ0
z7bjNaz!FiRHB%EUO3~418xN|{AP26XiIur><T2mjQ|5MTa=^@lwXiP3a#(}mQ+gdf
zWo?B|nd|zg%|su0I0G+i^cmTAia+mF+%oL_@nsjB!tWbTymUnB=T_rTE|KxmH5zG0
z3Jsg-9>FqQB{~<Dv(=1~BW~90o7UQayp@k&>foRDM#ffJ-3c;sUBsGJCmx>C>Ut(G
zQES$Zsmh#|!#+}W0Lo%bFfRA_onyx?;Z|4AVL!7u11g;BAFAt+`?f2wvvAsR3UNC2
z(Dihew2{344^D8g{y*VO{akkzV%gJlhoT%UB}3Im@(XK#b53!4!r4gdOX$tv-$Zp_
zm&-a+Q6)?3=I8{zO%Shb<&TZ+&O;U$$7cWc&(}>Ph30Ox>+T{7o5&7LX#Yf^7R$Vn
zXM93dm6`7&ZwpKoW}}R4Xtul4=Ku8gzX$4e>q%vqIzWEE!-HkRV*hu-CUN$EKWrk&
d|6MUgygC2bjSJja*Y&#Nw}!1?o-;Sq^%p!Rpb-E7

literal 0
HcmV?d00001


From 6f0c94a1197a3f0be3b5d8a010c9ab9d2056a47b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 16:36:37 +0800
Subject: [PATCH 06/11] Revert "FTP: Fix re_PlayerInfo to find ', is sitting
 out' for cash games"

This reverts commit bc4a53d754c998ca03ed47c36b5e2708410c6f83.
---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 2c823dd1..f94903c5 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -84,7 +84,7 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''' % substitutions, re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s](?P<CASH>[,.0-9]+)\)(, is sitting out)?$' % substitutions, re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s](?P<CASH>[,.0-9]+)\)$' % substitutions, re.MULTILINE)
     re_TourneysPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s]?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$' % substitutions, re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 

From f9e4eef2d3937197797756a74623efb0f73507e7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 16:37:18 +0800
Subject: [PATCH 07/11] Add copyright notice

---
 pyfpdb/HHReplayer.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pyfpdb/HHReplayer.py b/pyfpdb/HHReplayer.py
index 4eba02b4..5f2cb8ad 100644
--- a/pyfpdb/HHReplayer.py
+++ b/pyfpdb/HHReplayer.py
@@ -1,4 +1,19 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#Copyright 2008-2010 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in agpl-3.0.txt.
 
 import os, pygame
 import time

From 3158c85d4f03bbde8577e7a754f55ab5e0a2cb2c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 17:48:19 +0800
Subject: [PATCH 08/11] PSSummary: make space in Player regex optional again

---
 pyfpdb/PokerStarsSummary.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py
index 87505f00..cda1de40 100644
--- a/pyfpdb/PokerStarsSummary.py
+++ b/pyfpdb/PokerStarsSummary.py
@@ -77,7 +77,7 @@ class PokerStarsSummary(TourneySummary):
 
     re_Currency = re.compile(u"""(?P<CURRENCY>[%(LS)s]|FPP)""" % substitutions)
 
-    re_Player = re.compile(u"""(?P<RANK>[0-9]+):\s(?P<NAME>.*)\s\(.*\),(\s)(\$(?P<WINNINGS>[0-9]+\.[0-9]+))?(?P<STILLPLAYING>still\splaying)?((?P<TICKET>Tournament\sTicket)\s\(WSOP\sStep\s(?P<LEVEL>\d)\))?\s+?""")
+    re_Player = re.compile(u"""(?P<RANK>[0-9]+):\s(?P<NAME>.*)\s\(.*\),(\s)?(\$(?P<WINNINGS>[0-9]+\.[0-9]+))?(?P<STILLPLAYING>still\splaying)?((?P<TICKET>Tournament\sTicket)\s\(WSOP\sStep\s(?P<LEVEL>\d)\))?\s+?""")
 
     re_DateTime = re.compile("\[(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)")
 

From acd512d9c3dd627cb4ea03c0751179af2ecf08f9 Mon Sep 17 00:00:00 2001
From: steffen123 <steffen@schaumburger.info>
Date: Thu, 9 Sep 2010 12:00:28 +0200
Subject: [PATCH 09/11] make imapfetcher work on imap again

---
 pyfpdb/PokerStarsSummary.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py
index 87505f00..a748b61a 100644
--- a/pyfpdb/PokerStarsSummary.py
+++ b/pyfpdb/PokerStarsSummary.py
@@ -77,7 +77,7 @@ class PokerStarsSummary(TourneySummary):
 
     re_Currency = re.compile(u"""(?P<CURRENCY>[%(LS)s]|FPP)""" % substitutions)
 
-    re_Player = re.compile(u"""(?P<RANK>[0-9]+):\s(?P<NAME>.*)\s\(.*\),(\s)(\$(?P<WINNINGS>[0-9]+\.[0-9]+))?(?P<STILLPLAYING>still\splaying)?((?P<TICKET>Tournament\sTicket)\s\(WSOP\sStep\s(?P<LEVEL>\d)\))?\s+?""")
+    re_Player = re.compile(u"""(?P<RANK>[0-9]+):\s(?P<NAME>.*)\s\(.*\),(\s)?(\$(?P<WINNINGS>[0-9]+\.[0-9]+))?(?P<STILLPLAYING>still\splaying)?((?P<TICKET>Tournament\sTicket)\s\(WSOP\sStep\s(?P<LEVEL>\d)\))?(\s+)?""")
 
     re_DateTime = re.compile("\[(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)")
 

From d0df1b6e4413b095300f8d8f9657f4b343bd281d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 9 Sep 2010 18:08:03 +0800
Subject: [PATCH 10/11] SQL: Iport tourneyResults query

---
 pyfpdb/SQL.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index fff3f07e..2994515f 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -3050,7 +3050,7 @@ class Sql:
         # Tourney Results query
         ####################################
         self.query['tourneyResults'] = """
-            SELECT tp.tourneyId, (tp.winnings - tt.buyIn - tt.fee) as profit, tp.koCount, tp.rebuyCount, tp.addOnCount, tt.buyIn, tt.fee, t.siteTourneyNo
+            SELECT tp.tourneyId, (coalesce(tp.winnings,0) - coalesce(tt.buyIn,0) - coalesce(tt.fee,0)) 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)

From 69872b9638ad8d72506c40a41b2be27cfdb252b7 Mon Sep 17 00:00:00 2001
From: steffen123 <steffen@schaumburger.info>
Date: Thu, 9 Sep 2010 12:35:05 +0200
Subject: [PATCH 11/11] PS summaries import skipped digits of tourney no

---
 pyfpdb/PokerStarsSummary.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py
index a748b61a..c88641ba 100644
--- a/pyfpdb/PokerStarsSummary.py
+++ b/pyfpdb/PokerStarsSummary.py
@@ -93,7 +93,7 @@ class PokerStarsSummary(TourneySummary):
     def parseSummary(self):
         lines=self.summaryText.splitlines()
         
-        self.tourNo = self.re_TourNo.findall(lines[0])[0][1:-1] #ignore game and limit type as thats not recorded
+        self.tourNo = self.re_TourNo.findall(lines[0])[0] #ignore game and limit type as thats not recorded
         
         result=self.re_GameInfo.search(lines[0])
         result=result.groupdict()