new bindings: Ctrl+Q,Ctrl+A

minor WII import improvements

Author: xxx

src/core.py

@@ -1519,6 +1519,7 @@ def __init__(self,db_dir,record_exe,log):
 
         self.wii_import_known_disk_names_len = 0
         self.wii_import_files_counter = 0
+        self.wii_import_folders_counter = 0
         self.wii_import_space = 0
 
     def update_sorted(self):
@@ -1716,6 +1717,7 @@ def get_wii_files_dict(self,import_filenames):
         in_report=False
         in_item=False
         in_description=False
+        item_type_is_file=False
 
         demo_str = '*** DEMO ***'
 
@@ -1739,6 +1741,7 @@ def get_wii_files_dict(self,import_filenames):
 
         self.wii_import_known_disk_names_len = 0
         self.wii_import_files_counter = 0
+        self.wii_import_folders_counter = 0
         self.wii_import_space = 0
         try:
             for import_filename in import_filenames:
@@ -1775,7 +1778,11 @@ def get_wii_files_dict(self,import_filenames):
                                     if not item['name']:
                                         if match := re_obj_name_search(line):
                                             item['name']=match.group(1)
-                                            self.wii_import_files_counter +=1
+                                            if item_type_is_file:
+                                                self.wii_import_files_counter +=1
+                                            else:
+                                                self.wii_import_folders_counter +=1
+
                                             continue
 
                                     if not item['ext']:
@@ -1789,7 +1796,9 @@ def get_wii_files_dict(self,import_filenames):
                                                 size = int(match.group(1))
 
                                                 item['size']=size
-                                                self.wii_import_space += size
+
+                                                if item_type_is_file:
+                                                    self.wii_import_space += size
                                             except:
                                                 item['size']=0
                                             continue
@@ -1930,6 +1939,7 @@ def get_wii_files_dict(self,import_filenames):
                                 elif match := re_obj_item_search(line):
                                     in_item=True
                                     in_description=False
+                                    item_type_is_file=bool(match.group(1)=="File")
 
                                     item = { 'ext':None,'date':None,'time':None,'path':None,'name':None,'disk_name':None,'disk_type':None,'disk_loc':None,'disk_num':None,'category':None,'crc':None,'flag':None,'size':0,'description':[],'type':match.group(1)}
 

src/librer.py

@@ -403,6 +403,11 @@ def restore_status_line_wrapp(self,*args,**kwargs):
             return res
         return restore_status_line_wrapp
 
+    def select_all(self,event):
+        event.widget.select_range(0, 'end')
+        event.widget.icursor('end')
+        return 'break'  # Prevents default behavior
+
     def __init__(self,cwd):
         gc_disable()
 
@@ -1091,6 +1096,9 @@ def help_cascade_post():
         self_main_bind('<BackSpace>', lambda event : self.unload_record())
         self_main_bind('<Control-BackSpace>', lambda event : self.unload_all_recods())
 
+        self_main.bind_class('TEntry', '<Control-a>', self.select_all)
+        self_main.bind_class('TEntry', '<Control-A>', self.select_all)
+
         gc_collect()
         gc_enable()
 
@@ -3202,7 +3210,8 @@ def record_import_wii(self):
             while wii_import_thread_is_alive():
                 dialog_update_lab_text(0,f'disks:{fnumber(librer_core.wii_import_known_disk_names_len).rjust(14)}')
                 dialog_update_lab_text(1,f'files:{fnumber(librer_core.wii_import_files_counter).rjust(14)}' )
-                dialog_update_lab_text(2,f'space:{bytes_to_str(librer_core.wii_import_space).rjust(14)}')
+                dialog_update_lab_text(2,f'folders:{fnumber(librer_core.wii_import_folders_counter).rjust(14)}' )
+                dialog_update_lab_text(3,f'space:{bytes_to_str(librer_core.wii_import_space).rjust(14)}')
 
                 self_main_after(10,lambda : wait_var_set(not wait_var_get()))
                 self_main_wait_variable(wait_var)
@@ -3229,7 +3238,7 @@ def record_import_wii(self):
                 else:
                     self.wii_import_label_var.set(f'WII-imported-{Path(import_filenames[0]).stem}')
 
-                self.wii_import_brief_label.configure(text=f'GATHERED DATA:\ndisks   : {fnumber(quant_disks).rjust(14)}\nfiles   : {fnumber(quant_files).rjust(14)}\nspace   : {bytes_to_str(librer_core.wii_import_space).rjust(14)}')
+                self.wii_import_brief_label.configure(text=f'GATHERED DATA:\n\ndisks   : {fnumber(quant_disks).rjust(14)}\nfiles   : {fnumber(quant_files).rjust(14)}\nfiles   : {fnumber(quant_folders).rjust(14)}\nspace   : {bytes_to_str(librer_core.wii_import_space).rjust(14)}')
                 #\nfolders : {fnumber(quant_folders)}
 
                 dialog.show()
@@ -4733,6 +4742,11 @@ def key_press(self,event):
                         self.select_and_focus(self.sel_item)
 
                         return "break"
+                elif key == "Q" or key == "q":
+                    event_str=str(event)
+                    ctrl_pressed = 'Control' in event_str
+                    if ctrl_pressed:
+                        self.exit()
                 else:
                     #print(key)