diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt index d48a2a49..87daac0c 100644 --- a/docs/known-bugs-and-planned-features.txt +++ b/docs/known-bugs-and-planned-features.txt @@ -3,8 +3,6 @@ Everything is subject to change and especially the order will often change. Patc alpha2 (release by 17Aug) ====== -implement HandsPlayers.seatNo - change tabledesign VALIGN seperate and improve instructions for update verify link in release notes @@ -18,6 +16,7 @@ add minimal instructions for developing to git-instructions alpha3 ====== +(steffen) finish bringing back tourney store raw hand in db export settings[hud-defaultInterval] to conf fix up bg colours in tv @@ -37,6 +36,7 @@ printhand each and the 2/3 relevant printplayerflags respectively on ps-lhe-ring before beta =========== +stop auto-importer from freezing interface maybe remove siteId from gametypes ?change most cache fields to bigint to allow extremely big databases in excess of 2 or 4 million hands per stake and position? rakeback/frequent player points diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index e0bf4e98..585e72ae 100644 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -19,6 +19,8 @@ import threading import pygtk pygtk.require('2.0') import gtk +import os +import time import fpdb_import class GuiAutoImport (threading.Thread): @@ -45,7 +47,19 @@ class GuiAutoImport (threading.Thread): def startClicked(self, widget, data): """runs when user clicks start on auto import tab""" - print "implement GuiAutoImport.startClicked" + + self.path=self.pathTBuffer.get_text(self.pathTBuffer.get_start_iter(), self.pathTBuffer.get_end_iter()) + for file in os.listdir(self.path): + if os.path.isdir(file): + print "AutoImport is not recursive - please select the final directory in which the history files are" + else: + self.inputFile=self.path+os.sep+file + fpdb_import.import_file_dict(self) + print "GuiBulkImport.import_dir done" + + interval=int(self.intervalTBuffer.get_text(self.intervalTBuffer.get_start_iter(), self.intervalTBuffer.get_end_iter())) + time.sleep(interval) + self.startClicked(widget,data) #end def GuiAutoImport.browseClicked def get_vbox(self): @@ -57,6 +71,15 @@ class GuiAutoImport (threading.Thread): """Constructor for GuiAutoImport""" self.settings=settings + self.server=settings['db-host'] + self.user=settings['db-user'] + self.password=settings['db-password'] + self.database=settings['db-databaseName'] + self.quiet=False + self.failOnError=False + self.minPrint=30 + self.handCount=0 + self.mainVBox=gtk.VBox(False,1) self.mainVBox.show() diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 279337c8..1db64ba0 100644 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -29,11 +29,11 @@ class GuiBulkImport (threading.Thread): self.path=self.inputFile for file in os.listdir(self.path): if os.path.isdir(file): - pass + print "BulkImport is not recursive - please select the final directory in which the history files are" else: self.inputFile=self.path+os.sep+file fpdb_import.import_file_dict(self) - print "import_dir done" + print "GuiBulkImport.import_dir done" def load_clicked(self, widget, data=None): self.inputFile=self.chooser.get_filename() diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 77ea08a1..26c985fc 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -370,7 +370,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt") self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window.connect("delete_event", self.delete_event) self.window.connect("destroy", self.destroy) - self.window.set_title("Free Poker DB - version: alpha1+, p45") + self.window.set_title("Free Poker DB - version: alpha1+, p46") self.window.set_border_width(1) self.window.set_size_request(1020,400) self.window.set_resizable(True)