diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index b28d4065..b5f0cc4e 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -113,10 +113,16 @@ 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") + 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)) 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 509c9f61..6745e9fc 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,31 +195,45 @@ 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__': - +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", 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") - (options, sys.argv) = parser.parse_args() + 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; 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", 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' @@ -228,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) @@ -239,8 +256,13 @@ 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(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 9eaa1fcd..5d04a1f9 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: @@ -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" @@ -348,7 +356,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 7d518e94..e6ff1a48 100644 --- a/pyfpdb/fpdb_parse_logic.py +++ b/pyfpdb/fpdb_parse_logic.py @@ -64,6 +64,8 @@ def mainParser(backend, db, cursor, site, category, hand, config): 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) diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py index f13c8032..dc2418cf 100644 --- a/pyfpdb/fpdb_save_to_db.py +++ b/pyfpdb/fpdb_save_to_db.py @@ -32,6 +32,7 @@ saveActions = False # 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(config, backend, db, cursor, base, category, site_hand_no, gametype_id, hand_start_time