From 22ff84852bf1794b7e86abaadcf165162ebc041d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 15 Mar 2009 00:30:38 +0900
Subject: [PATCH 01/16] Kludge maxseats for Stars

---
 pyfpdb/PokerStarsToFpdb.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 1915bb42..b7322a1b 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -114,7 +114,12 @@ follow :  whether to tail -f the input"""
     def readHandInfo(self, hand):
         info = {}
         m = self.re_HandInfo.search(hand.handText,re.DOTALL)
-        if m: info.update(m.groupdict())
+        if m:
+            info.update(m.groupdict())
+            # TODO: Be less lazy and parse maxseats from the HandInfo regex
+            if m.group('TABLEATTRIBUTES'):
+                m2 = re.search("\s*(\d+)-max", m.group('TABLEATTRIBUTES'))
+                hand.maxseats = int(m2.group(1))
         m = self.re_GameInfo.search(hand.handText)
         if m: info.update(m.groupdict())
         m = self.re_Button.search(hand.handText)

From 40d98b11d9f8313ae68c5286c2ffbd496c628987 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 15 Mar 2009 14:32:52 +0900
Subject: [PATCH 02/16] PokerStarsToFpdb - PLO parsing update

---
 pyfpdb/PokerStarsToFpdb.py |  8 ++++----
 pyfpdb/test_PokerStars.py  | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index b7322a1b..8b905005 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -24,9 +24,9 @@ from HandHistoryConverter import *
 # PokerStars HH Format
 
 class PokerStars(HandHistoryConverter):
-    
+
     # Static regexes
-    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
+    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
     re_SplitHands   = re.compile('\n\n+')
     re_HandInfo     = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
     re_Button       = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
@@ -80,7 +80,7 @@ follow :  whether to tail -f the input"""
         info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
-        if not m: 
+        if not m:
             return None
 
         mg = m.groupdict()
@@ -89,7 +89,7 @@ follow :  whether to tail -f the input"""
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         games = {              # base, category
                   "Hold'em" : ('hold','holdem'), 
-                 'Omaha Hi' : ('hold','omahahi'),
+                    'Omaha' : ('hold','omahahi'),
               'Omaha Hi/Lo' : ('hold','omahahilo'),
                      'Razz' : ('stud','razz'), 
               '7 Card Stud' : ('stud','studhi'),
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 85107e6f..53a5fbee 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -4,7 +4,10 @@ from Hand import *
 import py
 
 #regression-test-files/stars/badugi/ring-fl-badugi.txt
-#   s0rrow: start $30.00 end: $22.65 total: ($7.35)
+#   s0rrow: input: $30.00 end: $22.65 total: ($7.35)
+#regression-test-files/stars/plo/PLO-6max.txt
+#   s0rrow: input: $18.35 end: $0 total: ($18.35)
+#   Notes: last hand #25975302416 s0rrow aifp against 2 players
 
 gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}
 text = ""
@@ -30,7 +33,10 @@ def testGameInfo():
     {'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'}),
 
     (u"PokerStars Game #25923772706:  Badugi Limit ($0.25/$0.50) - 2009/03/13 16:40:58 ET",
-    {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'})
+    {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}),
+
+    (u"PokerStars Game #25974627364:  Omaha Pot Limit ($0.05/$0.10) - 2009/03/15 0:29:00 ET",
+    {'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.05', 'bb':'0.10','currency':'USD'})
     )
     for (header, info) in pairs:
         yield checkGameInfo, hhc, header, info

From e9fd3541150aa50625be830037ee7150c021437d Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 18 Mar 2009 16:52:18 +0000
Subject: [PATCH 03/16] handinfo

---
 pyfpdb/FulltiltToFpdb.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index fb2bf6ea..0c21762f 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -113,10 +113,30 @@ follow :  whether to tail -f the input"""
 
     def readHandInfo(self, hand):
         m =  self.re_HandInfo.search(hand.handText,re.DOTALL)
-        #print m.groups()
+
+        if(m == None):
+            logging.info("Didn't match re_HandInfo")
+            logging.info(hand.handText)
+            return None
+        
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
+        
+        # attributes
+        # (deep 6)
+        # (6 max)
+        # 
+        # be goodd idea to log those what we don't know idea
+        hand.maxseats = 8 # assume 8-max until we see otherwise
+        # stud tables are usually 8-max?
+        # 
+        atts = m.group('ATTRIBUTES')
+        if atts:
+            # TODO: parse these
+            pass
+        
+        
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #       m.group('SB')
 #       m.group('BB')

From cbba16feaf44a911f9d85d766a21ecd2f5a1b30c Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Thu, 19 Mar 2009 13:41:05 +0000
Subject: [PATCH 04/16] comment

---
 pyfpdb/fpdb_save_to_db.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py
index ba734e80..1089a5de 100644
--- a/pyfpdb/fpdb_save_to_db.py
+++ b/pyfpdb/fpdb_save_to_db.py
@@ -32,6 +32,7 @@ saveActions=True    # set this to False to avoid storing action data
                     # Pros: speeds up imports
                     # Cons: no action data is saved, so you need to keep the hand histories
                     #       variance not available on stats page
+                    #       no graphs
 
 #stores a stud/razz hand into the database
 def ring_stud(backend, db, cursor, base, category, site_hand_no, gametype_id, hand_start_time

From 451a9b3ab12e8c3ec0b0a88851ef83df569f5e01 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sat, 21 Mar 2009 14:27:49 +0000
Subject: [PATCH 05/16] GuiBulkImport: import directories from cmdline.
 Basically now does what CliFpdb should do, but reads most settings from xml
 config.

---
 pyfpdb/GuiBulkImport.py | 41 ++++++++++++++++++++++++-----------------
 pyfpdb/fpdb_import.py   | 10 +++++++++-
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 509c9f61..2d086428 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -60,8 +60,8 @@ class GuiBulkImport():
         self.importer.setFailOnError(self.chk_fail.get_active())
         self.importer.setThreads(int(self.spin_threads.get_text()))
         self.importer.setHandsInDB(self.n_hands_in_db)
-        cb_model = self.cb.get_model()
-        cb_index = self.cb.get_active()
+        cb_model = self.cb_dropindexes.get_model()
+        cb_index = self.cb_dropindexes.get_active()
         if cb_index:
             self.importer.setDropIndexes(cb_model[cb_index][0])
         else:
@@ -159,13 +159,13 @@ class GuiBulkImport():
         self.lab_drop.set_justify(gtk.JUSTIFY_RIGHT)
 
 #    ComboBox - drop indexes
-        self.cb = gtk.combo_box_new_text()
-        self.cb.append_text('auto')
-        self.cb.append_text("don't drop")
-        self.cb.append_text('drop')
-        self.cb.set_active(0)
-        self.table.attach(self.cb, 4, 5, 1, 2, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
-        self.cb.show()
+        self.cb_dropindexes = gtk.combo_box_new_text()
+        self.cb_dropindexes.append_text('auto')
+        self.cb_dropindexes.append_text("don't drop")
+        self.cb_dropindexes.append_text('drop')
+        self.cb_dropindexes.set_active(0)
+        self.table.attach(self.cb_dropindexes, 4, 5, 1, 2, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
+        self.cb_dropindexes.show()
 
 #    label - filter
         self.lab_filter = gtk.Label("Site filter:")
@@ -195,13 +195,13 @@ class GuiBulkImport():
 
 #    see how many hands are in the db and adjust accordingly
         tcursor = db.db.cursor()
-        tcursor.execute("Select max(id) from Hands;")
+        tcursor.execute("Select count(1) from Hands;")
         row = tcursor.fetchone()
         tcursor.close()
         self.n_hands_in_db = row[0]
         if self.n_hands_in_db == 0:
-            self.cb.set_active(2)
-            self.cb.set_sensitive(False)
+            self.cb_dropindexes.set_active(2)
+            self.cb_dropindexes.set_sensitive(False)
             self.lab_drop.set_sensitive(False)
 
 if __name__ == '__main__':
@@ -211,9 +211,16 @@ if __name__ == '__main__':
         gtk.main_quit()
 
     parser = OptionParser()
-    parser.add_option("-f", "--file", dest="filename", help="Input file in quiet mode", metavar="FILE")
-    parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True, help="don't start gui")
-    parser.add_option("-x", "--convert", dest="filtername", help="Conversion filter", default="passthrough")
+    parser.add_option("-f", "--file", dest="filename", metavar="FILE",
+                    help="Input file in quiet mode")
+    parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True,
+                    help="don't start gui")
+    parser.add_option("-c", "--convert", dest="filtername", default="passthrough", metavar="FILTER",
+                    help="Conversion filter (*passthrough, FullTiltToFpdb, PokerStarsToFpdb, EverleafToFpdb)")
+    parser.add_option("-x", "--failOnError", action="store_true", default=False,
+                    help="If this option is passed it quits when it encounters any error")
+    #parser.add_option("-m", "--minPrint", "--status", default="0", type="int",
+                    #help="How often to print a one-line status report (0 (default) means never)")
     (options, sys.argv) = parser.parse_args()
 
     config = Configuration.Config()
@@ -239,8 +246,8 @@ if __name__ == '__main__':
         #Do something useful
         importer = fpdb_import.Importer(False,settings, config) 
         importer.setDropIndexes("auto")
-        importer.setFailOnError(True)
-        importer.addImportFile(options.filename, filter=options.filtername)
+        importer.setFailOnError(options.failOnError)
+        importer.addBulkImportImportFileOrDir(options.filename, filter=options.filtername)
         importer.setCallHud(False)
         importer.runImport()
         importer.clearFileList()
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 12575b4f..fb602e63 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -172,7 +172,15 @@ class Importer:
 
     def calculate_auto(self):
         """An heuristic to determine a reasonable value of drop/don't drop"""
-        if len(self.filelist) == 1:            return "don't drop"      
+        if len(self.filelist) == 1:            return "don't drop"
+        if 'handsInDB' not in self.settings:
+            try:
+                tmpcursor = self.fdb.db.cursor()
+                tmpcursor.execute("Select count(1) from Hands;")
+                self.settings['handsInDB'] = tmpcursor.fetchone()[0]
+                tmpcursor.close()
+            except:
+                pass # if this fails we're probably doomed anyway
         if self.settings['handsInDB'] < 5000:  return "drop"
         if len(self.filelist) < 50:            return "don't drop"      
         if self.settings['handsInDB'] > 50000: return "don't drop"

From 239330ae7bb20b05981090d7f541931f9a1d40ca Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sat, 21 Mar 2009 15:34:23 +0000
Subject: [PATCH 06/16] filterCrap after checking if hand is in db refactor
 GuiBulkImport : add main() so that it can be called from interactive shell
 (for profiling purposes).

---
 pyfpdb/GuiAutoImport.py    |  6 ++++--
 pyfpdb/GuiBulkImport.py    | 33 ++++++++++++++++++++++++---------
 pyfpdb/fpdb_import.py      |  3 +--
 pyfpdb/fpdb_parse_logic.py |  2 ++
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index ee633d4f..7212862b 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -45,7 +45,7 @@ class GuiAutoImport (threading.Thread):
 
         self.importer = fpdb_import.Importer(self,self.settings, self.config)
         self.importer.setCallHud(True)
-        self.importer.setMinPrint(30)
+        self.importer.setMinPrint(settings['minPrint'])
         self.importer.setQuiet(False)
         self.importer.setFailOnError(False)
         self.importer.setHandCount(0)
@@ -227,13 +227,15 @@ if __name__== "__main__":
 
     parser = OptionParser()
     parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True, help="don't start gui")
-
+    parser.add_option("-m", "--minPrint", "--status", dest="minPrint", default="0", type="int",
+                    help="How often to print a one-line status report (0 (default) means never)")
     (options, sys.argv) = parser.parse_args()
 
     config = Configuration.Config()
 #    db = fpdb_db.fpdb_db()
 
     settings = {}
+    settings['minPrint'] = options.minPrint
     if os.name == 'nt': settings['os'] = 'windows'
     else:               settings['os'] = 'linuxmac'
 
diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 2d086428..6745e9fc 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -204,29 +204,36 @@ class GuiBulkImport():
             self.cb_dropindexes.set_sensitive(False)
             self.lab_drop.set_sensitive(False)
 
-if __name__ == '__main__':
-
+def main(argv=None):
+    """main can also be called in the python interpreter, by supplying the command line as the argument.
+>>>import GuiBulkImport
+>>>GuiBulkImport.main("-f ~/data/hands")"""
+    if argv is None:
+        argv = sys.argv[1:]
+    else:
+        argv = argv.split(" ")
 
     def destroy(*args):  # call back for terminating the main eventloop
         gtk.main_quit()
 
     parser = OptionParser()
-    parser.add_option("-f", "--file", dest="filename", metavar="FILE",
+    parser.add_option("-f", "--file", dest="filename", metavar="FILE", default=None,
                     help="Input file in quiet mode")
     parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True,
-                    help="don't start gui")
+                    help="don't start gui; deprecated (just give a filename with -f).")
     parser.add_option("-c", "--convert", dest="filtername", default="passthrough", metavar="FILTER",
                     help="Conversion filter (*passthrough, FullTiltToFpdb, PokerStarsToFpdb, EverleafToFpdb)")
     parser.add_option("-x", "--failOnError", action="store_true", default=False,
                     help="If this option is passed it quits when it encounters any error")
-    #parser.add_option("-m", "--minPrint", "--status", default="0", type="int",
-                    #help="How often to print a one-line status report (0 (default) means never)")
-    (options, sys.argv) = parser.parse_args()
+    parser.add_option("-m", "--minPrint", "--status", dest="minPrint", default="0", type="int",
+                    help="How often to print a one-line status report (0 (default) means never)")
+    (options, sys.argv) = parser.parse_args(args = argv)
 
     config = Configuration.Config()
     db = fpdb_db.fpdb_db()
 
     settings = {}
+    settings['minPrint'] = options.minPrint
     if os.name == 'nt': settings['os'] = 'windows'
     else:               settings['os'] = 'linuxmac'
 
@@ -235,7 +242,10 @@ if __name__ == '__main__':
     settings.update(config.get_import_parameters())
     settings.update(config.get_default_paths())
 
-    if(options.gui == True):
+    if not options.gui:
+        print """-q is deprecated. Just use "-f filename" instead"""
+        # This is because -q on its own causes an error, so -f is necessary and sufficient for cmd line use
+    if not options.filename:
         i = GuiBulkImport(db, settings, config)
         main_window = gtk.Window()
         main_window.connect('destroy', destroy)
@@ -247,7 +257,12 @@ if __name__ == '__main__':
         importer = fpdb_import.Importer(False,settings, config) 
         importer.setDropIndexes("auto")
         importer.setFailOnError(options.failOnError)
-        importer.addBulkImportImportFileOrDir(options.filename, filter=options.filtername)
+        importer.addBulkImportImportFileOrDir(os.path.expanduser(options.filename), filter=options.filtername)
         importer.setCallHud(False)
         importer.runImport()
         importer.clearFileList()
+
+
+if __name__ == '__main__':
+    sys.exit(main())
+
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index fb602e63..49e180df 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -115,6 +115,7 @@ class Importer:
     # Called from GuiBulkImport to add a file or directory.
     def addBulkImportImportFileOrDir(self, inputPath,filter = "passthrough"):
         """Add a file or directory for bulk import"""
+        
         # Bulk import never monitors
         # if directory, add all files in it. Otherwise add single file.
         # TODO: only add sane files?
@@ -124,7 +125,6 @@ class Importer:
                     self.addImportFile(os.path.join(inputPath, subdir[0], file), site="default", filter=filter)
         else:
             self.addImportFile(inputPath, site="default", filter=filter)
-
     #Add a directory of files to filelist
     #Only one import directory per site supported.
     #dirlist is a hash of lists:
@@ -355,7 +355,6 @@ class Importer:
                     isTourney=fpdb_simple.isTourney(hand[0])
                     if not isTourney:
                         fpdb_simple.filterAnteBlindFold(site,hand)
-                    hand=fpdb_simple.filterCrap(site, hand, isTourney)
                     self.hand=hand
                     
                     try:
diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py
index 9dd54f83..8550a102 100644
--- a/pyfpdb/fpdb_parse_logic.py
+++ b/pyfpdb/fpdb_parse_logic.py
@@ -65,6 +65,8 @@ def mainParser(backend, db, cursor, site, category, hand, config):
         tourneyTypeId=fpdb_simple.recogniseTourneyTypeId(cursor, siteID, buyin, fee, knockout, rebuyOrAddon)        
     fpdb_simple.isAlreadyInDB(cursor, gametypeID, siteHandNo)
     
+    hand=fpdb_simple.filterCrap(site, hand, isTourney)
+    
     #part 2: classify lines by type (e.g. cards, action, win, sectionchange) and street
     fpdb_simple.classifyLines(hand, category, lineTypes, lineStreets)
         

From 86d350984e07a87edf39e8a7640be1d44639f1a4 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 01:31:36 +0900
Subject: [PATCH 07/16] Dodgy 6 max fix to FTP converter

---
 pyfpdb/FulltiltToFpdb.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index fb2bf6ea..b28d4065 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -117,6 +117,9 @@ follow :  whether to tail -f the input"""
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
+        if m.group('TABLEATTRIBUTES'):
+            m2 = re.search("(\d+) max", m.group('TABLEATTRIBUTES'))
+            hand.maxseats = int(m2.group(1))
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #       m.group('SB')
 #       m.group('BB')

From 8ebcd7b68a4f5b37ea1d7e593526e6d015330f5f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 02:17:48 +0900
Subject: [PATCH 08/16] Fix crash on Stars tourney import

If importing a tourney and the line was marked as crap this test crashed
the importer
---
 pyfpdb/fpdb_simple.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index fc6c13b2..b0263888 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -714,7 +714,7 @@ def filterCrap(site, hand, isTourney):
             hand[i] = False
         elif (hand[i].find(": ")!=-1 and site=="ftp" and hand[i].find("Seat ")==-1 and hand[i].find(": Table")==-1): #filter ftp chat
             hand[i] = False
-        if isTourney:
+        if isTourney and not hand[i] == False:
             if (hand[i].endswith(" is sitting out") and (not hand[i].startswith("Seat "))):
                 hand[i] = False
         elif hand[i]:

From 38b0fc71577182fcc8e0333e9f9ae175a9be020c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 02:20:56 +0900
Subject: [PATCH 09/16] Add all functional site importers to Bulk import gui

---
 pyfpdb/GuiBulkImport.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 6745e9fc..84ef4645 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -176,7 +176,10 @@ class GuiBulkImport():
 #    ComboBox - filter
         self.cbfilter = gtk.combo_box_new_text()
         self.cbfilter.append_text("passthrough")
-        self.cbfilter.append_text("Everleaf")
+        self.cbfilter.append_text("BetfairToFpdb")
+        self.cbfilter.append_text("EverleafToFpdb")
+        self.cbfilter.append_text("FulltiltToFpdb")
+        self.cbfilter.append_text("PokerStarsToFpdb")
         self.cbfilter.set_active(0)
         self.table.attach(self.cbfilter, 3, 4, 2, 3, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
         self.cbfilter.show()

From 2747b079eddfe65ae46826b41466e2678fc1eab8 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 02:52:41 +0900
Subject: [PATCH 10/16] Fix saveActions to True by default

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

diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py
index dc2418cf..7a5c7d6d 100644
--- a/pyfpdb/fpdb_save_to_db.py
+++ b/pyfpdb/fpdb_save_to_db.py
@@ -28,7 +28,7 @@ SQLITE          = 4
 
 fastStoreHudCache = True   # set this to True to test the new storeHudCache routine
 
-saveActions = False    # set this to False to avoid storing action data
+saveActions = True  # set this to False to avoid storing action data
                     # Pros: speeds up imports
                     # Cons: no action data is saved, so you need to keep the hand histories
                     #       variance not available on stats page
@@ -70,8 +70,10 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no,
     """stores a holdem/omaha hand into the database"""
 
     import_options = config.get_import_parameters()
-    saveActions = True if import_options['saveActions'] == 'True' else False
-    fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False
+    saveActions = False if import_options['saveActions'] == 'False' else True
+    fastStoreHudCache = False if import_options['fastStoreHudCache'] == 'False' else True
+
+    print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
 
     t0 = time()
     fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)

From 999a2b9b5fcd3221f947f153e83ddb269726a0f0 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 02:57:37 +0900
Subject: [PATCH 11/16] Remove debug statement

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

diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py
index 7a5c7d6d..01bd71cc 100644
--- a/pyfpdb/fpdb_save_to_db.py
+++ b/pyfpdb/fpdb_save_to_db.py
@@ -73,7 +73,7 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no,
     saveActions = False if import_options['saveActions'] == 'False' else True
     fastStoreHudCache = False if import_options['fastStoreHudCache'] == 'False' else True
 
-    print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
+    # print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
 
     t0 = time()
     fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)

From 208176077e847d555a3ad70a80a17b072d2f2ee9 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 02:59:47 +0900
Subject: [PATCH 12/16] Add test code for executemany function

---
 pyfpdb/fpdb_simple.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index b0263888..7f241a2c 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -29,6 +29,8 @@ MYSQL_INNODB    = 2
 PGSQL           = 3
 SQLITE          = 4
 
+DBTEST = False
+
 # Data Structures for index and foreign key creation
 # drop_code is an int with possible values:  0 - don't drop for bulk import
 #                                            1 - drop during bulk import
@@ -1511,11 +1513,18 @@ def storeActions(cursor, handsPlayersIds, actionTypes, allIns, actionAmounts, ac
 #stores into table hands_actions
     #print "start of storeActions, actionNos:",actionNos
     #print " action_amounts:",action_amounts
+    inserts = []
     for i in xrange(len(actionTypes)): #iterate through streets
         for j in xrange(len(actionTypes[i])): #iterate through names
             for k in xrange(len(actionTypes[i][j])): #iterate through individual actions of that player on that street
-                cursor.execute ("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)"
-                               , (handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k]))
+                if DBTEST == False:
+                    cursor.execute("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", (handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k]))
+                else:
+                    # Add inserts into a list and let 
+                    inserts = inserts + [(handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k])]
+
+    if DBTEST == True:
+        cursor.executemany("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", inserts)
 #end def storeActions
  
 def store_board_cards(cursor, hands_id, board_values, board_suits):

From e9853c1ff23b88514bb5126928697b0e12c7674d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 04:07:08 +0900
Subject: [PATCH 13/16] Make previous executemany() function the default

---
 pyfpdb/fpdb_simple.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 7f241a2c..aa876804 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -29,7 +29,6 @@ MYSQL_INNODB    = 2
 PGSQL           = 3
 SQLITE          = 4
 
-DBTEST = False
 
 # Data Structures for index and foreign key creation
 # drop_code is an int with possible values:  0 - don't drop for bulk import
@@ -1517,14 +1516,10 @@ def storeActions(cursor, handsPlayersIds, actionTypes, allIns, actionAmounts, ac
     for i in xrange(len(actionTypes)): #iterate through streets
         for j in xrange(len(actionTypes[i])): #iterate through names
             for k in xrange(len(actionTypes[i][j])): #iterate through individual actions of that player on that street
-                if DBTEST == False:
-                    cursor.execute("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", (handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k]))
-                else:
-                    # Add inserts into a list and let 
-                    inserts = inserts + [(handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k])]
+                # Add inserts into a list and let 
+                inserts = inserts + [(handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k])]
 
-    if DBTEST == True:
-        cursor.executemany("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", inserts)
+    cursor.executemany("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", inserts)
 #end def storeActions
  
 def store_board_cards(cursor, hands_id, board_values, board_suits):

From 40c17cffaa082396735cd1b930fa6aa23bf3f2df Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 18:52:30 +0900
Subject: [PATCH 14/16] Recognise deep 6 tables at Full Tilt

---
 pyfpdb/FulltiltToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index b5f0cc4e..6a897bad 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -124,8 +124,8 @@ follow :  whether to tail -f the input"""
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
         hand.maxseats = 8 # assume 8-max until we see otherwise
         if m.group('TABLEATTRIBUTES'):
-            m2 = re.search("(\d+) max", m.group('TABLEATTRIBUTES'))
-            hand.maxseats = int(m2.group(1))
+            m2 = re.search("(deep )?(\d+)( max)?", m.group('TABLEATTRIBUTES'))
+            hand.maxseats = int(m2.group(2))
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #       m.group('SB')
 #       m.group('BB')

From 6e021ea3a4ff8d4f41fca9845dd02f9dfef2e2d1 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Mar 2009 18:56:51 +0900
Subject: [PATCH 15/16] Remove old graph queries from file

---
 pyfpdb/FpdbSQLQueries.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/pyfpdb/FpdbSQLQueries.py b/pyfpdb/FpdbSQLQueries.py
index c3260466..24948986 100644
--- a/pyfpdb/FpdbSQLQueries.py
+++ b/pyfpdb/FpdbSQLQueries.py
@@ -599,37 +599,6 @@ class FpdbSQLQueries:
         ################################
 
 
-        # Returns all cash game handIds and the money won(winnings is the final pot)
-        # by the playerId for a single site.
-        if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
-            self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers 
-                    INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-                    INNER JOIN Hands ON Hands.id = HandsPlayers.handId
-                    WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
-                    ORDER BY handStart"""
-        elif(self.dbname == 'SQLite'):
-            #Probably doesn't work.
-            self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers
-                    INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-                    INNER JOIN Hands ON Hands.id = HandsPlayers.handId
-                    WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
-                    ORDER BY handStart"""
-
-        # Returns the profit for a given ring game handId, Total pot - money invested by playerId
-        if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
-            self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
-                    INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
-                    INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-                    WHERE Players.name = %s AND HandsPlayers.handId = %s 
-                    AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
-        elif(self.dbname == 'SQLite'):
-            #Probably doesn't work.
-            self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
-                    INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
-                    INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-                    WHERE Players.name = %s AND HandsPlayers.handId = %s 
-                    AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
-
         if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
             self.query['getPlayerId'] = """SELECT id from Players where name = %s"""
         elif(self.dbname == 'SQLite'):

From 5e5e79f08ad331b40dfe2263ff26bf8d78e4f22f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Mar 2009 22:18:22 +0900
Subject: [PATCH 16/16] Fix typo

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

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 5cdd3d3b..b5931bde 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -337,7 +337,7 @@ class fpdb:
         new_ps_thread=GuiPositionalStats.GuiPositionalStats(self.db, self.config, self.querydict)
         self.threads.append(new_ps_thread)
         ps_tab=new_ps_thread.get_vbox()
-        self.add_and_display_tab(ps_tab, "Ppositional Stats")
+        self.add_and_display_tab(ps_tab, "Positional Stats")
 
 
     def tab_main_help(self, widget, data):