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

init vars used in load_clicked, comment out the exception handler that was single handedly stopping virtually all errors in the import process from showing up

Browse Source
This commit is contained in:
Eric Blade 2009-09-15 21:06:43 -05:00
parent a1783a37cb
commit e4772dcb74
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pyfpdb/GuiBulkImport.py
View File

@ -60,6 +60,11 @@ class GuiBulkImport():
return True return True
def load_clicked(self, widget, data=None): def load_clicked(self, widget, data=None):
stored = None
dups = None
partial = None
errs = None
ttime = None
# Does the lock acquisition need to be more sophisticated for multiple dirs? # Does the lock acquisition need to be more sophisticated for multiple dirs?
# (see comment above about what to do if pipe already open) # (see comment above about what to do if pipe already open)
if self.settings['global_lock'].acquire(False): # returns false immediately if lock not acquired if self.settings['global_lock'].acquire(False): # returns false immediately if lock not acquired
@ -101,13 +106,13 @@ class GuiBulkImport():
self.importer.addBulkImportImportFileOrDir(self.inputFile, site = sitename) self.importer.addBulkImportImportFileOrDir(self.inputFile, site = sitename)
self.importer.setCallHud(False) self.importer.setCallHud(False)
starttime = time() starttime = time()
try: # try:
(stored, dups, partial, errs, ttime) = self.importer.runImport() (stored, dups, partial, errs, ttime) = self.importer.runImport()
except: # except:
print "*** EXCEPTION DURING BULKIMPORT!!!" # print "*** EXCEPTION DURING BULKIMPORT!!!"
raise Exceptions.FpdbError # raise Exceptions.FpdbError
finally: # finally:
gobject.source_remove(self.timer) gobject.source_remove(self.timer)
ttime = time() - starttime ttime = time() - starttime
if ttime == 0: if ttime == 0: