evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move minPrint variable from callling class to setting in Importer class

Browse Source
This commit is contained in:
Worros 2008-10-12 01:42:08 +08:00
parent ae9b70ea5d
commit 1e8333ec5d
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyfpdb/GuiAutoImport.py
View File

@ -123,6 +123,7 @@ class GuiAutoImport (threading.Thread):
self.settings=settings self.settings=settings
self.importer = fpdb_import.Importer(self,self.settings) self.importer = fpdb_import.Importer(self,self.settings)
self.importer.setCallHud(True) self.importer.setCallHud(True)
self.importer.setMinPrint(30)
self.server=settings['db-host'] self.server=settings['db-host']
self.user=settings['db-user'] self.user=settings['db-user']
@ -130,7 +131,6 @@ class GuiAutoImport (threading.Thread):
self.database=settings['db-databaseName'] self.database=settings['db-databaseName']
self.quiet=False self.quiet=False
self.failOnError=False self.failOnError=False
self.minPrint=30
self.handCount=0 self.handCount=0
self.mainVBox=gtk.VBox(False,1) self.mainVBox=gtk.VBox(False,1)

4
pyfpdb/GuiBulkImport.py
View File

@ -48,9 +48,9 @@ class GuiBulkImport (threading.Thread):
self.minPrint=self.min_print_tbuffer.get_text(self.min_print_tbuffer.get_start_iter(), self.min_print_tbuffer.get_end_iter()) self.minPrint=self.min_print_tbuffer.get_text(self.min_print_tbuffer.get_start_iter(), self.min_print_tbuffer.get_end_iter())
if (self.minPrint=="never" or self.minPrint=="Never"): if (self.minPrint=="never" or self.minPrint=="Never"):
self.minPrint=0 self.importer.setMinPrint(0)
else: else:
self.minPrint=int(self.minPrint) self.importer.setMinPrint=int(self.minPrint)
self.quiet=self.info_tbuffer.get_text(self.info_tbuffer.get_start_iter(), self.info_tbuffer.get_end_iter()) self.quiet=self.info_tbuffer.get_text(self.info_tbuffer.get_start_iter(), self.info_tbuffer.get_end_iter())
if (self.quiet=="yes"): if (self.quiet=="yes"):

2
pyfpdb/GuiTableViewer.py
View File

@ -253,9 +253,9 @@ class GuiTableViewer (threading.Thread):
self.quiet=False self.quiet=False
self.failOnError=False self.failOnError=False
self.minPrint=0
self.handCount=0 self.handCount=0
self.importer = fpdb_import.Importer(self, self.settings) self.importer = fpdb_import.Importer(self, self.settings)
self.importer.setMinPrint(0)
self.last_read_hand_id=self.importer.import_file_dict() self.last_read_hand_id=self.importer.import_file_dict()
#end def table_viewer.import_clicked #end def table_viewer.import_clicked

14
pyfpdb/fpdb_import.py
View File

@ -49,8 +49,11 @@ class Importer:
self.callHud = False self.callHud = False
self.lines = None self.lines = None
self.pos_in_file = {} # dict to remember how far we have read in the file self.pos_in_file = {} # dict to remember how far we have read in the file
#Set defaults
if not self.settings.has_key('imp-callFpdbHud'): if not self.settings.has_key('imp-callFpdbHud'):
self.settings['imp-callFpdbHud'] = False self.settings['imp-callFpdbHud'] = False
if not self.settings.has_key('minPrint'):
self.settings['minPrint'] = 30
self.dbConnect() self.dbConnect()
def dbConnect(self): def dbConnect(self):
@ -77,6 +80,9 @@ class Importer:
def addImportFile(self, filename): def addImportFile(self, filename):
self.caller.inputFile = filename self.caller.inputFile = filename
def setMinPrint(self, value):
self.settings['minPrint'] = int(value)
def import_file_dict(self): def import_file_dict(self):
starttime = time() starttime = time()
last_read_hand=0 last_read_hand=0
@ -163,7 +169,7 @@ class Importer:
self.printEmailErrorMessage(errors, self.caller.inputFile, hand[0]) self.printEmailErrorMessage(errors, self.caller.inputFile, hand[0])
if (self.caller.failOnError): if (self.caller.failOnError):
self.db.commit() #dont remove this, in case hand processing was cancelled this ties up any open ends. self.db.commit() #dont remove this, in case hand processing was cancelled.
raise raise
except (fpdb_simple.FpdbError), fe: except (fpdb_simple.FpdbError), fe:
errors+=1 errors+=1
@ -173,10 +179,10 @@ class Importer:
self.db.rollback() self.db.rollback()
if (self.caller.failOnError): if (self.caller.failOnError):
self.db.commit() #dont remove this, in case hand processing was cancelled this ties up any open ends. self.db.commit() #dont remove this, in case hand processing was cancelled.
raise raise
if (self.caller.minPrint!=0): if (self.settings['minPrint']!=0):
if ((stored+duplicates+partial+errors)%self.caller.minPrint==0): if ((stored+duplicates+partial+errors)%self.settings['minPrint']==0):
print "stored:", stored, "duplicates:", duplicates, "partial:", partial, "errors:", errors print "stored:", stored, "duplicates:", duplicates, "partial:", partial, "errors:", errors
if (self.caller.handCount!=0): if (self.caller.handCount!=0):