From d5608fa7a7d6e86447b037d4ed9b1a07ac467fde Mon Sep 17 00:00:00 2001
From: steffen123 <steffen@schaumburger.info>
Date: Sun, 20 Dec 2009 12:01:26 +0000
Subject: [PATCH 1/4] support PS tourneys with euro buyin

---
 pyfpdb/fpdb_simple.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 1c22f6e6..5f0c6507 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: iso-8859-15 -*-
 
 #Copyright 2008 Steffen Jobbagy-Felso
 #This program is free software: you can redistribute it and/or modify
@@ -538,7 +539,11 @@ def parseAnteLine(line, isTourney, names, antes):
 #returns the buyin of a tourney in cents
 def parseBuyin(topline):
     pos1 = topline.find("$")+1
-    pos2 = topline.find("+")
+    if pos1 != 0:
+        pos2 = topline.find("+")
+    else:
+        pos1 = topline.find("€")+3
+        pos2 = topline.find("+")
     return float2int(topline[pos1:pos2])
 
 #parses a card line and changes the passed arrays accordingly
@@ -635,9 +640,14 @@ def parseCashesAndSeatNos(lines):
 
 #returns the buyin of a tourney in cents
 def parseFee(topline):
-    pos1=topline.find("$")+1
-    pos1=topline.find("$",pos1)+1
-    pos2=topline.find(" ", pos1)
+    pos1 = topline.find("$")+1
+    if pos1 != 0:
+        pos1 = topline.find("$", pos1)+1
+        pos2 = topline.find(" ", pos1)
+    else:
+        pos1 = topline.find("€")+3
+        pos1 = topline.find("€", pos1)+3
+        pos2 = topline.find(" ", pos1)
     return float2int(topline[pos1:pos2])
 
 #returns a datetime object with the starttime indicated in the given topline

From babf0a039aa3332547e50b1f9e61f223ff9f6237 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 21 Dec 2009 09:21:41 +0800
Subject: [PATCH 2/4] PartyPoker - No Disconnect fix

Fix from Neko on 2+2

http://forumserver.twoplustwo.com/showpost.php?p=15495528&postcount=2374

"Finally got around to checking this out. Seems great so far. I had issues with some of my party hands that were on No Disconnect protect tables but adding the No DP regex in the PartyToFpdb hand converter seems to have fixed it for me."
---
 pyfpdb/PartyPokerToFpdb.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4ed0c965..4cf64547 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -89,6 +89,7 @@ class PartyPoker(HandHistoryConverter):
             (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
             (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
+            (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
             """,

From b71e4852525e8dc637679464555bbbf61af28d43 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 21 Dec 2009 16:10:44 +0800
Subject: [PATCH 3/4] PokerStarsToFpdb - Add comment on parsing tourney buy-in

---
 pyfpdb/PokerStarsToFpdb.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index b3463da9..5e2f9c21 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -203,6 +203,8 @@ class PokerStars(HandHistoryConverter):
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':
+                #FIXME: The key looks like: '€0.82+€0.18 EUR'
+                #       This should be parsed properly and used
                 hand.buyin = info[key]
             if key == 'LEVEL':
                 hand.level = info[key]

From a3be99bcf6eccd79afec2a6e0835ab1d54a953f8 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 17:20:07 +0800
Subject: [PATCH 4/4] [NEWIMPORT] HandsPlayers.startCards

Dodgy function just to get things kinda working again.
---
 pyfpdb/Card.py         | 21 ++++++++++++++++++++-
 pyfpdb/DerivedStats.py |  4 ++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 287a0f6a..8639fd35 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -16,6 +16,25 @@
 #agpl-3.0.txt in the docs folder of the package.
 
 
+# From fpdb_simple
+card_map = { "0": 0, "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8,
+            "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14}
+
+# FIXME: the following is a workaround until switching to newimport.
+#        This should be moved into DerivedStats
+#        I'd also like to change HandsPlayers.startCards to a different datatype
+#        so we can 'trivially' add different start card classifications
+
+def calcStartCards(hand, player):
+    if hand.gametype['category'] == 'holdem':
+        hcs = hand.join_holecards(player, asList=True)
+        #print "DEBUG: hcs: %s" % hcs
+        value1 = card_map[hcs[0][0]]
+        value2 = card_map[hcs[1][0]]
+        return twoStartCards(value1, hcs[0][1], value2, hcs[1][1])
+    else:
+        # FIXME: Only do startCards value for holdem at the moment
+        return 0
 
 
 def twoStartCards(value1, suit1, value2, suit2):
@@ -127,4 +146,4 @@ if __name__ == '__main__':
             (i, valueSuitFromCard(i), i+13, valueSuitFromCard(i+13), i+26, valueSuitFromCard(i+26), i+39, valueSuitFromCard(i+39))
 
         print 
-    print encodeCard('7c')
\ No newline at end of file
+    print encodeCard('7c')
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index dbd655a3..b65b0d05 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -47,6 +47,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['wonWhenSeenStreet1'] = 0.0
             self.handsplayers[player[1]]['sawShowdown'] = False
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
+            self.handsplayers[player[1]]['startCards']  = 0
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -57,7 +58,6 @@ class DerivedStats():
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['position']            = 2
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
-            self.handsplayers[player[1]]['startCards']          = 0
             self.handsplayers[player[1]]['street0_3BChance']    = False
             self.handsplayers[player[1]]['street0_3BDone']      = False
             self.handsplayers[player[1]]['stealAttemptChance']  = False
@@ -172,7 +172,7 @@ class DerivedStats():
             #    self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
             for i, card in enumerate(hcs[:7]):
                 self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
-
+            self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
         # position,
             #Stud 3rd street card test