searching improvements

Author: piotrj

src/core.py

@@ -124,13 +124,11 @@ def fnumber(num):
 
 def str_to_bytes(string):
     try:
-        string = string.replace(' ','').lower()
+        string = string.replace(' ','').lower().rstrip('b')
         string_endswith = string.endswith
-        for suffix,altsuffix,weight in ( ('kb','k',1024),('mb','m',1024*1024),('gb','g',1024*1024*1024),('tb','t',1024*1024*1024*1024),('b','b',1) ):
+        for suffix,weight in ( ('k',1024),('m',1024*1024),('g',1024*1024*1024),('t',1024*1024*1024*1024) ):
             if string_endswith(suffix):
-                return int(string[0:-len(suffix)]) * weight #no decimal point
-            elif string_endswith(altsuffix):
-                return int(string[0:-len(altsuffix)]) * weight #no decimal point
+                return int(string[0:-1]) * weight #no decimal point
 
         return int(string)
     except:

src/dialogs.py

@@ -399,7 +399,7 @@ def key_press_Shift_f3(self,event):
     def key_press(self,event):
         key=event.keysym
 
-        if key != "F3":
+        if key not in ("F3",'Up','Down','Next','Prior','Home','End','Delete','BackSpace'):
             if event.widget!=self.find_entry:
                 self.find_var.set(self.find_var.get() + event.char)
                 self.find_entry.icursor('end')
@@ -471,16 +471,18 @@ def show(self,title='',message='',uplabel_text=''):
 
         self.message = message
 
-        self.text.configure(state='normal')
-        self.text.delete('1.0', 'end')
-        self.text.insert('end',message)
-        self.text.configure(state='disabled')
+        self_text = self.text
+        self_text.configure(state='normal')
+        self_text.delete('1.0', 'end')
+        self_text.insert('end',message)
+        self_text.configure(state='disabled')
 
-        self.text.grid(row=1,column=0,sticky='news',padx=5,pady=5)
+        self_text.grid(row=1,column=0,sticky='news',padx=5,pady=5)
 
         self.copy_button.configure(state='normal')
 
         self.find_key_binding()
+        self.focus = self_text
         super().show()
 
 class TextDialogQuestion(TextDialogInfo):

src/librer.py

@@ -1477,25 +1477,6 @@ def ver_number(var):
 
             ##############
 
-            self.find_size_min_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_size_max_var.trace_add("write", lambda i,j,k : self.find_mod())
-
-            self.find_modtime_min_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_modtime_max_var.trace_add("write", lambda i,j,k : self.find_mod())
-
-            self.find_name_regexp_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_name_glob_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_name_fuzz_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_name_case_sens_var.trace_add("write", lambda i,j,k : self.find_mod())
-
-            self.find_cd_regexp_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_cd_glob_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_cd_fuzz_var.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_cd_case_sens_var.trace_add("write", lambda i,j,k : self.find_mod())
-
-            self.find_name_fuzzy_threshold.trace_add("write", lambda i,j,k : self.find_mod())
-            self.find_cd_fuzzy_threshold.trace_add("write", lambda i,j,k : self.find_mod())
-
             sfdma = self.find_dialog.area_main
 
             (find_filename_frame := LabelFrame(sfdma,text='Search range',bd=2,bg=self.bg_color,takefocus=False)).grid(row=0,column=0,sticky='news',padx=4,pady=4)
@@ -1527,9 +1508,9 @@ def ver_number(var):
             self.find_filename_glob_entry = Entry(find_filename_frame,textvariable=self.find_name_glob_var,validate="key")
             self.find_filename_fuzz_entry = Entry(find_filename_frame,textvariable=self.find_name_fuzz_var,validate="key")
 
-            self.find_filename_regexp_entry.bind("<KeyPress>", lambda event : self.find_mod)
-            self.find_filename_glob_entry.bind("<KeyPress>", lambda event : self.find_mod)
-            self.find_filename_fuzz_entry.bind("<KeyPress>", lambda event : self.find_mod)
+            self.find_filename_regexp_entry.bind("<KeyPress>", self.find_mod_keypress)
+            self.find_filename_glob_entry.bind("<KeyPress>", self.find_mod_keypress)
+            self.find_filename_fuzz_entry.bind("<KeyPress>", self.find_mod_keypress)
 
             self.find_filename_regexp_entry.grid(row=2, column=1, sticky='we',padx=4,pady=4)
             self.find_filename_glob_entry.grid(row=3, column=1, sticky='we',padx=4,pady=4)
@@ -1543,6 +1524,8 @@ def ver_number(var):
             self.find_filename_fuzzy_threshold_lab.grid(row=4, column=2, sticky='wens',padx=4,pady=4)
             self.find_filename_fuzzy_threshold_entry.grid(row=4, column=3, sticky='wens',padx=4,pady=4)
 
+            self.find_filename_fuzzy_threshold_entry.bind("<KeyPress>", self.find_mod_keypress)
+
             self.widget_tooltip(regexp_radio_name,regexp_tooltip + regexp_tooltip_name)
             self.widget_tooltip(self.find_filename_regexp_entry,regexp_tooltip + regexp_tooltip_name)
             self.widget_tooltip(glob_radio_name,glob_tooltip + glob_tooltip_name)
@@ -1568,9 +1551,9 @@ def ver_number(var):
             self.find_cd_glob_entry = Entry(find_cd_frame,textvariable=self.find_cd_glob_var,validate="key")
             self.find_cd_fuzz_entry = Entry(find_cd_frame,textvariable=self.find_cd_fuzz_var,validate="key")
 
-            self.find_cd_regexp_entry.bind("<KeyPress>", lambda event : self.find_mod)
-            self.find_cd_glob_entry.bind("<KeyPress>", lambda event : self.find_mod)
-            self.find_cd_fuzz_entry.bind("<KeyPress>", lambda event : self.find_mod)
+            self.find_cd_regexp_entry.bind("<KeyPress>", self.find_mod_keypress)
+            self.find_cd_glob_entry.bind("<KeyPress>", self.find_mod_keypress)
+            self.find_cd_fuzz_entry.bind("<KeyPress>", self.find_mod_keypress)
 
             self.find_cd_regexp_entry.grid(row=4, column=1, sticky='we',padx=4,pady=4)
             self.find_cd_glob_entry.grid(row=5, column=1, sticky='we',padx=4,pady=4)
@@ -1584,6 +1567,8 @@ def ver_number(var):
             self.find_cd_fuzzy_threshold_lab.grid(row=6, column=2, sticky='wens',padx=4,pady=4)
             self.find_cd_fuzzy_threshold_entry.grid(row=6, column=3, sticky='wens',padx=4,pady=4)
 
+            self.find_cd_fuzzy_threshold_entry.bind("<KeyPress>", self.find_mod_keypress)
+
             self.widget_tooltip(regexp_radio_cd,regexp_tooltip + regexp_tooltip_cd)
             self.widget_tooltip(self.find_cd_regexp_entry,regexp_tooltip + regexp_tooltip_cd)
             self.widget_tooltip(glob_radio_cd,glob_tooltip + glob_tooltip_cd)
@@ -1611,6 +1596,9 @@ def validate_size_str(val):
             find_size_max_entry=Entry(find_size_frame,textvariable=self.find_size_max_var)
             find_size_max_entry.grid(row=0, column=3, sticky='we',padx=4,pady=4)
 
+            find_size_min_entry.bind("<KeyPress>", self.find_mod_keypress)
+            find_size_max_entry.bind("<KeyPress>", self.find_mod_keypress)
+
             size_tooltip = 'Integer value [in bytes] or integer with unit.\nLeave the value blank to ignore this criterion.\n\nexamples:\n399\n100B\n125kB\n10MB'
             self.widget_tooltip(find_size_min_entry,size_tooltip)
             self.widget_tooltip(find_size_min_label,size_tooltip)
@@ -1628,6 +1616,9 @@ def validate_size_str(val):
             find_modtime_max_entry=Entry(find_modtime_frame,textvariable=self.find_modtime_max_var)
             find_modtime_max_entry.grid(row=0, column=3, sticky='we',padx=4,pady=4)
 
+            find_modtime_min_entry.bind("<KeyPress>", self.find_mod_keypress)
+            find_modtime_max_entry.bind("<KeyPress>", self.find_mod_keypress)
+
             time_toltip = 'Date and time in the format below.\nLeave the value blank to ignore this criterion.\n\nexamples:\n2023-12-14 22:21:20\n2023-12-14 22:21\n2023-12-14\n2023-12'
             self.widget_tooltip(find_modtime_min_entry,time_toltip)
             self.widget_tooltip(find_modtime_min_label,time_toltip)
@@ -2136,6 +2127,14 @@ def find_show_results(self):
 
     find_dialog_shown=False
 
+    def find_mod_keypress(self,event):
+        key=event.keysym
+
+        if key=='Return':
+            self.find_items()
+        else:
+            return self.find_mod()
+
     def find_mod(self):
         try:
             if self.cfg.get(CFG_KEY_find_cd_search_kind) != self.find_cd_search_kind_var.get():
@@ -2228,6 +2227,9 @@ def find_mod(self):
 
                 self.search_show_butt.configure(state='disabled')
                 self.search_save_butt.configure(state='disabled')
+            else:
+                self.search_show_butt.configure(state='normal')
+                self.search_save_butt.configure(state='normal')
 
         except Exception as e:
             self.find_result_record_index=0

src/record.py

@@ -143,7 +143,7 @@ def printer():
                 result=results_queue_get()
                 if result==True:
                     break
-                print(json_dumps(result))
+                print(json_dumps(result),flush=False)
             else:
                 sys.stdout.flush()
                 sleep(0.001)
@@ -268,11 +268,15 @@ def print_info(*args):
     thread = Thread(target=printer,daemon=True)
     thread.start()
 
-    record.find_items(results_queue,
-            size_min,size_max,
-            timestamp_min,timestamp_max,
-            name_search_kind,name_func_to_call,
-            cd_search_kind,cd_func_to_call)
+    try:
+        record.find_items(results_queue,
+                size_min,size_max,
+                timestamp_min,timestamp_max,
+                name_search_kind,name_func_to_call,
+                cd_search_kind,cd_func_to_call)
+    except Exception as fe:
+        print_info('find_items error:' + str(fe))
+        results_queue.append(True) #stop printer thread
 
     thread.join()