for some reason my GuiBulkImport was missing get_vbox()
Added a combobox for selecting a filter But import brokea bit
This commit is contained in:
parent
40ccefe105
commit
03f89ee439
|
@ -35,17 +35,6 @@ import Configuration
|
||||||
|
|
||||||
class GuiBulkImport():
|
class GuiBulkImport():
|
||||||
|
|
||||||
def import_dir(self):
|
|
||||||
"""imports a directory, non-recursive. todo: move this to fpdb_import so CLI can use it"""
|
|
||||||
|
|
||||||
self.path = self.inputFile
|
|
||||||
self.importer.addImportDirectory(self.path)
|
|
||||||
self.importer.setCallHud(False)
|
|
||||||
starttime = time()
|
|
||||||
(stored, dups, partial, errs, ttime) = self.importer.runImport()
|
|
||||||
print 'GuiBulkImport.import_dir done: Stored: %d Duplicates: %d Partial: %d Errors: %d in %s seconds - %d/sec'\
|
|
||||||
% (stored, dups, partial, errs, ttime, stored / ttime)
|
|
||||||
|
|
||||||
def load_clicked(self, widget, data=None):
|
def load_clicked(self, widget, data=None):
|
||||||
# get the dir to import from the chooser
|
# get the dir to import from the chooser
|
||||||
self.inputFile = self.chooser.get_filename()
|
self.inputFile = self.chooser.get_filename()
|
||||||
|
@ -63,18 +52,22 @@ class GuiBulkImport():
|
||||||
self.importer.setDropIndexes(cb_model[cb_index][0])
|
self.importer.setDropIndexes(cb_model[cb_index][0])
|
||||||
else:
|
else:
|
||||||
self.importer.setDropIndexes("auto")
|
self.importer.setDropIndexes("auto")
|
||||||
|
hhc=self.cbfilter.get_model()[self.cbfilter.get_active()][0]
|
||||||
self.lab_info.set_text("Importing")
|
self.lab_info.set_text("Importing")
|
||||||
if os.path.isdir(self.inputFile):
|
|
||||||
self.import_dir()
|
self.importer.addImportFile(self.inputFile,filter=hhc)
|
||||||
else:
|
self.importer.setCallHud(False)
|
||||||
self.importer.addImportFile(self.inputFile)
|
starttime = time()
|
||||||
self.importer.setCallHud(False)
|
(stored, dups, partial, errs, ttime) = self.importer.runImport()
|
||||||
self.importer.runImport()
|
print 'GuiBulkImport.import_dir done: Stored: %d Duplicates: %d Partial: %d Errors: %d in %s seconds - %d/sec'\
|
||||||
self.importer.clearFileList()
|
% (stored, dups, partial, errs, ttime, stored / ttime)
|
||||||
|
self.importer.clearFileList()
|
||||||
|
|
||||||
self.lab_info.set_text("Import finished")
|
self.lab_info.set_text("Import finished")
|
||||||
|
|
||||||
|
def get_vbox(self):
|
||||||
|
return self.vbox
|
||||||
|
|
||||||
def __init__(self, db, settings, config):
|
def __init__(self, db, settings, config):
|
||||||
self.db = db # this is an instance of fpdb_db
|
self.db = db # this is an instance of fpdb_db
|
||||||
self.settings = settings
|
self.settings = settings
|
||||||
|
@ -159,6 +152,20 @@ class GuiBulkImport():
|
||||||
self.table.attach(self.cb, 4, 5, 1, 2, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
|
self.table.attach(self.cb, 4, 5, 1, 2, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
|
||||||
self.cb.show()
|
self.cb.show()
|
||||||
|
|
||||||
|
# label - filter
|
||||||
|
self.lab_filter = gtk.Label("Site filter:")
|
||||||
|
self.table.attach(self.lab_filter, 2, 3, 2, 3, xpadding = 0, ypadding = 0, yoptions=gtk.SHRINK)
|
||||||
|
self.lab_filter.show()
|
||||||
|
self.lab_filter.set_justify(gtk.JUSTIFY_RIGHT)
|
||||||
|
|
||||||
|
# ComboBox - filter
|
||||||
|
self.cbfilter = gtk.combo_box_new_text()
|
||||||
|
self.cbfilter.append_text("passthrough")
|
||||||
|
self.cbfilter.append_text("Everleaf")
|
||||||
|
self.cbfilter.set_active(0)
|
||||||
|
self.table.attach(self.cbfilter, 3, 4, 2, 3, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
|
||||||
|
self.cbfilter.show()
|
||||||
|
|
||||||
# label - info
|
# label - info
|
||||||
self.lab_info = gtk.Label()
|
self.lab_info = gtk.Label()
|
||||||
self.table.attach(self.lab_info, 0, 4, 2, 3, xpadding = 0, ypadding = 0, yoptions=gtk.SHRINK)
|
self.table.attach(self.lab_info, 0, 4, 2, 3, xpadding = 0, ypadding = 0, yoptions=gtk.SHRINK)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user