X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ffiles%2Fsearch.py;h=11cb0cd59cdcfcf291f8811212c2154bb3506824;hb=73cefe83014c3f57dd45052d237b00a9db7f5efd;hp=a8586f1d3979ed583c82207214e32ebf5c089de7;hpb=9cac287424e94e66aa21335640428800fb3981a5;p=findit diff --git a/src/files/search.py b/src/files/search.py index a8586f1..11cb0cd 100755 --- a/src/files/search.py +++ b/src/files/search.py @@ -3,12 +3,19 @@ # vim: sw=4 ts=4 expandtab ai from os import walk -from os.path import join, abspath, normcase, basename, isdir, getsize +from os.path import join, abspath, normcase, isdir, getsize from heapq import nlargest -from misc import size_hum_read, _ +from misc import size_hum_read, _, NotebookWCloseBtns from config import config +OUTTYPES = [ + ('out_table', _('Table')), + ('out_diabar', _('Bar chart')), + ('out_diapie', _('Pie chart')), + ('out_diaold', _('Old chart')), +] + #============================================================================== class Control(object): @@ -19,13 +26,13 @@ class Control(object): self.toplevel = self.present.toplevel - def start_search(self, get_data, get_stopit): + def start_search(self, get_criteria, get_stopit): filelist = [] - outtype, start_path, count = get_data() + outtype, start_path, count = get_criteria() search_func = self.abstrac.filegetter(start_path, get_stopit) for fsize, fpath in nlargest(count, search_func): filelist.append([int(fsize), fpath, size_hum_read(fsize)]) - self.present.show_out_toplevel(None, outtype, filelist) + self.present.show_out_toplevel(outtype, filelist) def run(self): self.present.run() @@ -40,7 +47,6 @@ class Abstraction(object): def filegetter(self, startdir, get_stopit): """Generator of file sizes and paths based on os.walk.""" - # Walk across directory tree for dirpath, dirnames, fnames in walk(startdir): # Eliminate unnecessary directories @@ -87,7 +93,7 @@ class Cli_Presentation(object): def get_stopit(self): return False - def show_out_toplevel(self, _, outtype, results): + def show_out_toplevel(self, outtype, results): out_submodule = __import__('files.' + outtype, None, None, outtype) out_submodule.Cli_Presentation(results).toplevel @@ -108,15 +114,27 @@ class Gtk_Presentation(object): def __init__(self, start_func, __): import gtk + global gtk # for show_current_status() + + self.nb = NotebookWCloseBtns() + self.nb.notebook.set_scrollable(True) + self.nb.notebook.set_border_width(2) + + #==================== + # Notebook + #==================== + # "Start path" label + self.path_label = gtk.Label(_('Path')) # "Start path" entry self.path_entry = gtk.Entry() self.path_entry.set_text(config['files']['start_path']) + # "Browse" button + self.browse_btn = gtk.Button('Browse...') + self.browse_btn.connect('clicked', self.browse_btn_clicked) # "Files quantity" label -# qty_label = gtk.Label(_('Files quantity')) - qty_label = gtk.Label('Files quantity') - + qty_label = gtk.Label(_('Files quantity')) # "Files quantity" spin self.qty_spin = gtk.SpinButton() self.qty_spin.set_numeric(True) @@ -124,96 +142,128 @@ class Gtk_Presentation(object): self.qty_spin.set_increments(1, 10) self.qty_spin.set_value(config['files']['count']) + # "Output" label + out_label = gtk.Label(_('Output')) + # Output selection + btn = gtk.RadioButton(None, OUTTYPES[0][1]) + btn.set_name(OUTTYPES[0][0]) + self.out_rbtns = [] + self.out_rbtns.append(btn) + for name, label in OUTTYPES[1:]: + btn = gtk.RadioButton(self.out_rbtns[0], label) + btn.set_name(name) + self.out_rbtns.append(btn) + # "Start" button self.start_btn = gtk.Button(_('Start')) self.start_btn.connect('released', self.start_btn_released, start_func) - # "Stop" button self.stop_btn = gtk.Button(_('Stop')) self.stop_btn.set_sensitive(False) self.stop_btn.connect('clicked', self.stop_btn_clicked) - # Output selection - out_table_rbtn = gtk.RadioButton(None, _('Table')) - out_table_rbtn.set_name('out_table') - out_diabar_rbtn = gtk.RadioButton(out_table_rbtn, _('Bar chart')) - out_diabar_rbtn.set_name('out_diabar') - out_diapie_rbtn = gtk.RadioButton(out_table_rbtn, _('Pie chart')) - out_diapie_rbtn.set_name('out_diapie') - out_diaold_rbtn = gtk.RadioButton(out_table_rbtn, _('Old chart')) - out_diaold_rbtn.set_name('out_diaold') - self.out_rbtns = [ - out_table_rbtn, out_diabar_rbtn, out_diapie_rbtn, out_diaold_rbtn - ] - - hbox = gtk.HBox(False, 4) - hbox.pack_start(qty_label, False, False, 0) - hbox.pack_start(self.qty_spin, False, False, 0) - hbox.pack_start(self.start_btn, False, False, 0) - hbox.pack_start(self.stop_btn, False, False, 0) - for btn in reversed(self.out_rbtns): - hbox.pack_end(btn, False, False, 0) + hbox1 = gtk.HBox(False, 2) + hbox1.pack_start(self.path_label, False, False, 4) + hbox1.pack_start(self.path_entry, True, True, 0) + hbox1.pack_start(self.browse_btn, False, False, 0) + + hbox2 = gtk.HBox(False, 2) + hbox2.pack_start(qty_label, False, False, 4) + hbox2.pack_start(self.qty_spin, False, False, 0) + + hbox3 = gtk.HBox(False, 2) + hbox3.pack_start(out_label, False, False, 4) + for btn in self.out_rbtns: + hbox3.pack_start(btn, False, False, 0) # Activate radio button if btn.get_name() == config['outtype']: btn.set_active(True) + hbox4 = gtk.HBox(True, 2) + hbox4.pack_start(self.start_btn, True, True, 0) + hbox4.pack_start(self.stop_btn, True, True, 0) + + cr_vbox = gtk.VBox(False, 2) + cr_vbox.set_border_width(2) + cr_vbox.pack_start(hbox1, False, False, 0) + cr_vbox.pack_start(hbox2, False, False, 0) + cr_vbox.pack_start(hbox3, False, False, 0) + cr_vbox.pack_end(hbox4, False, False, 0) + + self.nb.new_tab(cr_vbox, _('Criteria'), noclose=True) + + #==================== + # Others + #==================== + self.statusbar = gtk.Statusbar() + self.statusbar.set_has_resize_grip(False) self.context_id = self.statusbar.get_context_id('Current walked file') - self.vbox = gtk.VBox(False, 4) - self.vbox.pack_start(self.path_entry, False, False, 0) - self.vbox.pack_start(hbox, False, False, 0) + self.vbox = gtk.VBox() + self.vbox.pack_start(self.nb.notebook, True, True, 0) self.vbox.pack_end(self.statusbar, False, False, 0) - self.toplevel = self.vbox +# self.show_out_toplevel(config['outtype'], [(1, 'path', 'bytesize')]) - # For importing gtk only once (lambda not work) - def show_current_status(current_path): - self.statusbar.push(self.context_id, current_path) - gtk.main_iteration() - self.show_current_status = show_current_status - - self.show_out_toplevel(None, config['outtype'], [(1, 'path', 'bytesize')]) + self.toplevel = self.vbox #=== Functions ============================================================ + def browse_btn_clicked(self, btn): + """Open directory browser. "Browse" button clicked callback.""" + dialog = gtk.FileChooserDialog(title=_('Choose directory'), + action='select-folder', + buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, + gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + path = abspath(self.path_entry.get_text()) + dialog.set_current_folder(path) + dialog.show_all() + response = dialog.run() + if response == gtk.RESPONSE_OK: + self.path_entry.set_text(dialog.get_filename()) + dialog.destroy() + def start_btn_released(self, btn, start_func): + """Start file search. Button "Go" activate callback.""" self.stopit = False self.stop_btn.set_sensitive(True) self.start_btn.set_sensitive(False) - start_func(self.get_data, self.get_stopit) + start_func(self.get_criteria, self.get_stopit) self.stop_btn.set_sensitive(False) self.start_btn.set_sensitive(True) def stop_btn_clicked(self, widget): + """Stop search. "Stop" button clicked callback.""" self.stopit = True self.stop_btn.set_sensitive(False) self.start_btn.set_sensitive(True) - def get_data(self): + def get_criteria(self): + """Pick search criteria from window.""" for btn in self.out_rbtns: if btn.get_active(): - out = btn.get_name() + out = {} + out['name'] = btn.get_name() + out['label'] = btn.get_label() return out, self.path_entry.get_text(), int(self.qty_spin.get_value()) def get_stopit(self): return self.stopit + def show_current_status(self, current_path): + """Show current walked path in statusbar and update window.""" + self.statusbar.push(self.context_id, current_path) + gtk.main_iteration() + def run(self): pass #=== Output type selecting ================================================ - def show_out_toplevel(self, btn, outtype, results): - print 'Entering <' + outtype + '> output mode...' - out_submodule = __import__('files.' + outtype, None, None, outtype) - - try: - self.out_toplevel.destroy() - except: - pass - + def show_out_toplevel(self, outtype, results): + print 'Entering <' + outtype['name'] + '> output mode...' + out_submodule = __import__('files.' + outtype['name'], None, None, outtype) self.out_toplevel = out_submodule.Gtk_Presentation(results).toplevel - self.vbox.add(self.out_toplevel) - self.out_toplevel.show_all() + self.nb.new_tab(self.out_toplevel, outtype['label']) ### out_submodule.Gtk_Presentation().show_results(results) #==============================================================================