skipping hidden files/folders by default (+ option)

fix of finding files on non-default showing mode

Author: PJDude

src/core.py

@@ -36,8 +36,9 @@
 from time import sleep,strftime,localtime,time,perf_counter
 
 from os import stat,scandir,sep,symlink,link,cpu_count,name as os_name,rename as os_rename,remove as os_remove
+from stat import FILE_ATTRIBUTE_HIDDEN as stat_FILE_ATTRIBUTE_HIDDEN
 
-from os.path import dirname,relpath,normpath,join as path_join,abspath as abspath,exists as path_exists,isdir as path_isdir
+from os.path import dirname,relpath,normpath,basename,join as path_join,abspath as abspath,exists as path_exists,isdir as path_isdir
 
 if os_name=='nt':
     from subprocess import CREATE_NO_WINDOW
@@ -194,6 +195,16 @@ def join(self):
         self.log.info('CRCThreadedCalc %s join',self)
         self.thread.join()
 
+windows = bool(os_name=='nt')
+
+def is_hidden_win(filepath):
+    return bool(stat(filepath).st_file_attributes & stat_FILE_ATTRIBUTE_HIDDEN)
+
+def is_hidden_lin(filepath):
+    return basename(abspath(filepath)).startswith('.')
+
+is_hidden = is_hidden_win if windows else is_hidden_lin
+
 MODE_CRC = 0
 MODE_SIMILARITY = 1
 MODE_GPS = 2
@@ -334,7 +345,7 @@ def convert_to_degrees(value):
         return None
 
     scan_update_info_path_nr=None
-    def scan(self,operation_mode,file_min_size_int=0,file_max_size_int=0):
+    def scan(self,operation_mode,file_min_size_int=0,file_max_size_int=0,include_hidden=False):
         from PIL.Image import open as image_open
 
         self.log.info('')
@@ -369,6 +380,7 @@ def scan(self,operation_mode,file_min_size_int=0,file_max_size_int=0):
         use_max_size = bool(file_max_size_int!=0)
         use_size = use_min_size or use_max_size
 
+        is_hidden_loc=is_hidden
         #############################################################################################
         if operation_mode in (MODE_SIMILARITY,MODE_GPS):
 
@@ -420,14 +432,18 @@ def scan(self,operation_mode,file_min_size_int=0,file_max_size_int=0):
                                 if entry.is_symlink() :
                                     skipping_action('skippping link: %s / %s',path,entry.name)
                                 else:
+                                    fullpath=path_join(path,entry.name)
+                                    if not include_hidden and is_hidden_loc(fullpath):
+                                        skipping_action('skipping hidden Mask:%s',fullpath)
+                                        continue
+
                                     if any_exclude_list:
-                                        fullpath=path_join(path,entry.name)
                                         if any({self_excl_fn(expr,fullpath) for expr in self_exclude_list}):
                                             skipping_action('skipping by Exclude Mask:%s',fullpath)
                                             continue
 
                                     if entry.is_dir():
-                                        loop_list_append(path_join(path,entry.name))
+                                        loop_list_append(fullpath)
                                     elif entry.is_file():
                                         try:
                                             stat_res = stat(entry)
@@ -537,14 +553,18 @@ def scan(self,operation_mode,file_min_size_int=0,file_max_size_int=0):
                                 if entry.is_symlink() :
                                     skipping_action('skippping link: %s / %s',path,entry.name)
                                 else:
+                                    fullpath=path_join(path,entry.name)
+                                    if not include_hidden and is_hidden_loc(fullpath):
+                                        skipping_action('skipping hidden Mask:%s',fullpath)
+                                        continue
+
                                     if any_exclude_list:
-                                        fullpath=path_join(path,entry.name)
                                         if any({self_excl_fn(expr,fullpath) for expr in self_exclude_list}):
                                             skipping_action('skipping by Exclude Mask:%s',fullpath)
                                             continue
 
                                     if entry.is_dir():
-                                        loop_list_append(path_join(path,entry.name))
+                                        loop_list_append(fullpath)
                                     elif entry.is_file():
                                         try:
                                             stat_res = stat(entry)

src/dialogs.py

@@ -411,7 +411,7 @@ def __init__(self,parent,icon,bg_color,pre_show=None,post_close=None,min_width=1
         Label(self.area_dummy, width=22,bg=self.bg_color).pack(side='right', anchor='e',padx=5,pady=5)
         Label(self.area_dummy, width=8,bg=self.bg_color).pack(side='right', anchor='e',padx=5,pady=5)
 
-        self.focus=self.cancel_button
+        self.focus = self.cancel_button
 
     def key_press_f3(self,event):
         self.find_next_prev(1)
@@ -516,7 +516,7 @@ def show(self,title='',message='',uplabel_text=''):
         self.copy_button.configure(state='normal')
 
         self.find_key_binding()
-        self.focus = self_text
+
         super().show()
 
 class TextDialogQuestion(TextDialogInfo):
@@ -529,7 +529,7 @@ def __init__(self,parent,icon,bg_color,pre_show=None,post_close=None,min_width=8
         self.ok_button=Button(self.area_buttons, text='OK', width=14, command=self.ok,image=image, compound='left' )
         self.ok_button.pack(side='right', anchor='n',padx=5,pady=5,fill='both')
 
-        self.focus=self.cancel_button
+        self.focus=self.ok_button
 
     def ok (self):
         self.res_bool=True

src/dude.py

@@ -86,6 +86,7 @@
 ###########################################################################################################################################
 
 CFG_THEME='theme'
+CFG_KEY_include_hidden = 'include_hidden'
 CFG_KEY_FULL_CRC='show_full_crc'
 CFG_KEY_SHOW_TOOLTIPS_INFO='show_tooltips_info'
 CFG_KEY_SHOW_TOOLTIPS_HELP='show_tooltips_help'
@@ -132,6 +133,7 @@
 
 cfg_defaults={
     CFG_THEME:'Vista' if windows else 'Clam',
+    CFG_KEY_include_hidden:False,
     CFG_KEY_FULL_CRC:False,
     CFG_KEY_SHOW_TOOLTIPS_INFO:True,
     CFG_KEY_SHOW_TOOLTIPS_HELP:True,
@@ -1805,6 +1807,7 @@ def get_settings_dialog(self):
             self.settings_dialog=GenericDialog(self.main,self.main_icon_tuple,self.bg_color,STR('Settings'),pre_show=self.pre_show_settings,post_close=self.post_close)
 
             self.theme = StringVar()
+            self.scan_hidden_var = BooleanVar()
             self.show_full_crc = BooleanVar()
             self.show_tooltips_info = BooleanVar()
             self.show_tooltips_help = BooleanVar()
@@ -1830,6 +1833,7 @@ def get_settings_dialog(self):
             self.folders_open_wrapper_params = StringVar()
 
             self.settings = [
+                (self.scan_hidden_var,CFG_KEY_include_hidden),
                 (self.show_full_crc,CFG_KEY_FULL_CRC),
                 (self.show_tooltips_info,CFG_KEY_SHOW_TOOLTIPS_INFO),
                 (self.show_tooltips_help,CFG_KEY_SHOW_TOOLTIPS_HELP),
@@ -1886,6 +1890,11 @@ def get_settings_dialog(self):
 
             label_frame.grid_columnconfigure((0,1,2), weight=1)
 
+            label_frame=LabelFrame(self.settings_dialog.area_main, text=STR("Scan options"),borderwidth=2,bg=self.bg_color)
+            label_frame.grid(row=row,column=0,sticky='wens',padx=3,pady=3) ; row+=1
+
+            (cb_1:=Checkbutton(label_frame, text = ' ' + STR('Include hidden files / folders in scan'), variable=self.scan_hidden_var)).grid(row=0,column=0,sticky='wens',padx=3,pady=2)
+
             label_frame=LabelFrame(self.settings_dialog.area_main, text=STR("Main panels and dialogs"),borderwidth=2,bg=self.bg_color)
             label_frame.grid(row=row,column=0,sticky='wens',padx=3,pady=3) ; row+=1
 
@@ -2664,8 +2673,9 @@ def find_prev_from_dialog(self,expression,use_reg_expr):
         self.select_find_result(-1)
 
     def find_prev(self):
-        if not self.find_result or self.find_tree!=self.sel_tree:
+        if not self.find_result or self.find_tree!=self.sel_tree or self.find_params_changed:
             self.find_params_changed=True
+            self.find_result_index=0
             self.finder_wrapper_show()
         else:
             self.select_find_result(-1)
@@ -2675,8 +2685,9 @@ def find_next_from_dialog(self,expression,use_reg_expr):
         self.select_find_result(1)
 
     def find_next(self):
-        if not self.find_result or self.find_tree!=self.sel_tree:
+        if not self.find_result or self.find_tree!=self.sel_tree or self.find_params_changed:
             self.find_params_changed=True
+            self.find_result_index=0
             self.finder_wrapper_show()
         else:
             self.select_find_result(1)
@@ -2698,7 +2709,13 @@ def find_mod(self,expression,use_reg_expr):
     def find_items(self,expression,use_reg_expr):
         self.status(STR('finding ...'))
 
+        self_files_of_groups_filtered_by_mode = self.files_of_groups_filtered_by_mode
+
+        crc_shown = list(self_files_of_groups_filtered_by_mode.keys())
+
         if self.find_params_changed or self.find_tree != self.sel_tree:
+            self.find_result=()
+
             self.find_tree=self.sel_tree
 
             items=[]
@@ -2712,10 +2729,15 @@ def find_items(self,expression,use_reg_expr):
 
                     try:
                         for crc_item in crc_range:
-                            for item in self.tree_children_sub[crc_item]:
-                                fullpath = self_item_full_path(item)
-                                if (use_reg_expr and search(expression,fullpath)) or (not use_reg_expr and fnmatch(fullpath,expression) ):
-                                    items_append(item)
+                            if crc_item in crc_shown:
+                                sub_items = self_files_of_groups_filtered_by_mode[crc_item]
+
+                                for item in self.tree_children_sub[crc_item]:
+                                    fullpath = self_item_full_path(item)
+                                    if (use_reg_expr and search(expression,fullpath)) or (not use_reg_expr and fnmatch(fullpath,expression) ):
+                                        kind,size,crc, (pathnr,path,file,ctime,dev,inode) = self.groups_tree_item_to_data[item]
+                                        if (dev,inode) in sub_items:
+                                            items_append(item)
                     except Exception as e:
                         try:
                             self.info_dialog_on_find[self.find_tree].show('Error',str(e))
@@ -2742,15 +2764,12 @@ def find_items(self,expression,use_reg_expr):
 
     def select_find_result(self,mod):
         if self.find_result:
+            #print(f'{self.find_result=}')
             items_len=len(self.find_result)
             self.find_result_index+=mod
             next_item=self.find_result[self.find_result_index%items_len]
 
-            if self.find_dialog_shown:
-                #focus is still on find dialog
-                self.semi_selection(self.find_tree,next_item)
-            else:
-                self.semi_selection(self.find_tree,next_item)
+            self.semi_selection(self.find_tree,next_item)
 
             self.tree_see_wrapper(self.find_tree,next_item)
 
@@ -2816,7 +2835,6 @@ def goto_next_prev_crc(self,direction):
 
             if tree_set(current_item,'kind')==self_CRC:
                 self.crc_select_and_focus_child(current_item)
-
                 self.status(status)
 
                 break
@@ -2875,14 +2893,8 @@ def key_release(self,event):
 
             if key=="Next":
                 item=tree.focus()
-                #tree.yview_moveto(tree.bbox(item)[1] / tree.winfo_height())
                 children=tree.get_children(item)
                 children_len=len(children)
-
-                #if children_len>=3:
-                #    tree.see(children[2])
-                #elif children_len:
-                #    tree.see(children[-1])
         except Exception as e :
             #print(e)
             pass
@@ -4113,9 +4125,12 @@ def scan(self):
         if file_max_size_int==-1:
             file_max_size_int=0
 
+        #################
+        include_hidden = self.cfg_get_bool(CFG_KEY_include_hidden)
+
         #################
 
-        scan_thread=Thread(target=lambda : dude_core.scan(operation_mode,file_min_size_int,file_max_size_int),daemon=True)
+        scan_thread=Thread(target=lambda : dude_core.scan(operation_mode,file_min_size_int,file_max_size_int,include_hidden),daemon=True)
         scan_thread.start()
 
         self_progress_dialog_on_scan.lab_l1.configure(text=STR('Total space:'))
@@ -4625,6 +4640,9 @@ def settings_ok(self):
             if not need_restart:
                 self.get_info_dialog_on_settings().show(STR('Theme Changed'),STR('Application restart required\nfor changes to take effect'))
 
+        if self.cfg_get_bool(CFG_KEY_include_hidden)!=self.scan_hidden_var.get():
+            self.cfg.set_bool(CFG_KEY_include_hidden,self.scan_hidden_var.get())
+
         if self.cfg_get_bool(CFG_KEY_FULL_CRC)!=self.show_full_crc.get():
             self.cfg.set_bool(CFG_KEY_FULL_CRC,self.show_full_crc.get())
             update1=True
@@ -4647,6 +4665,8 @@ def settings_ok(self):
 
         if self.cfg_get(CFG_KEY_SHOW_MODE)!=self.show_mode.get():
             self.cfg.set(CFG_KEY_SHOW_MODE,self.show_mode.get())
+            self.find_params_changed=True
+            self.find_result_index=0
             update0=True
 
         if self.cfg_get_bool(CFG_KEY_REL_SYMLINKS)!=self.create_relative_symlinks.get():
@@ -4940,12 +4960,13 @@ def groups_show(self):
                 #kind,crc,(pathnr,path,file,ctime,dev,inode)
                 self_groups_tree_item_to_data[group_item]=(self_CRC,size,crc,(None,None,None,None,None,None) )
 
+                files_of_groups_filtered_by_mode_group_index_add = files_of_groups_filtered_by_mode[group_index].add
                 for pathnr,path,file,ctime,dev,inode,size in sorted(items_set,key=lambda x : (x[6],x[0],x[1],x[2]),reverse=True):
                     if show_mode_same_dir:
                         if hist[(pathnr,path)]==1:
                             continue
 
-                    files_of_groups_filtered_by_mode[group_index].add( (dev,inode) )
+                    files_of_groups_filtered_by_mode_group_index_add( (dev,inode) )
 
                     #print(pathnr,path,file,mtime,ctime,dev,inode,size)
                     iid=self_idfunc(inode,dev)
@@ -4998,13 +5019,14 @@ def groups_show(self):
                     #kind,crc,index_tuple
                     #kind,crc,(pathnr,path,file,ctime,dev,inode)
                     self_groups_tree_item_to_data[crc_item]=(self_CRC,size,crc,(None,None,None,None,None,None) )
+                    files_of_groups_filtered_by_mode_crc_add = files_of_groups_filtered_by_mode[crc].add
 
                     for pathnr,path,file,ctime,dev,inode in sorted(crc_dict,key = lambda x : x[0]):
                         if show_mode_same_dir:
                             if hist[(pathnr,path)]==1:
                                 continue
 
-                        files_of_groups_filtered_by_mode[crc].add( (dev,inode) )
+                        files_of_groups_filtered_by_mode_crc_add( (dev,inode) )
 
                         iid=self_idfunc(inode,dev)
                         self_iid_to_size[iid]=size
@@ -5106,8 +5128,6 @@ def tree_folder_update(self,arbitrary_path=None):
 
         current_path=arbitrary_path if arbitrary_path else self.sel_path_full
 
-        #print('current_path:',current_path)
-
         if not current_path:
             return False
 

src/text.py

@@ -755,6 +755,14 @@ class LANGUAGES:
             'it': 'Somiglianza tra immagini',
             'fr': 'Similitude des images',
         },
+        'Include hidden files / folders in scan': {
+            'pl': "Uwzględniaj pliki/foldery ukryte",
+            'es': "Incluir archivos/carpetas ocultos en el escaneo",
+            'ru': "Включить скрытые файлы/папки в сканирование",
+            'de': "Versteckte Dateien/Ordner in den Scan einbeziehen",
+            'it': "Includi file/cartelle nascosti nella scansione",
+            'fr': "Inclure les fichiers/dossiers cachés dans l'analyse",
+        },
         'Information': {
             'pl': 'Informacja',
             'es': 'Información',