Open from directory: add cancelable progress bar

Author: PierreRaybaut

cdl/core/gui/panel/base.py

@@ -855,14 +855,15 @@ def set_current_object_title(self, title: str) -> None:
         self.objview.update_item(obj.uuid)
 
     def __load_from_file(
-        self, filename: str, create_group: bool = True
+        self, filename: str, create_group: bool = True, add_objects: bool = True
     ) -> list[SignalObj] | list[ImageObj]:
         """Open objects from file (signal/image), add them to DataLab and return them.
 
         Args:
             filename: file name
             create_group: if True, create a new group if more than one object is loaded.
              Defaults to True. If False, all objects are added to the current group.
+            add_objects: if True, add objects to the panel. Defaults to True.
 
         Returns:
             New object or list of new objects
@@ -875,7 +876,8 @@ def __load_from_file(
             group_id = self.add_group(osp.basename(filename)).uuid
         for obj in objs:
             obj.metadata["source"] = filename
-            self.add_object(obj, group_id=group_id, set_current=obj is objs[-1])
+            if add_objects:
+                self.add_object(obj, group_id=group_id, set_current=obj is objs[-1])
         self.selection_changed()
         return objs
 
@@ -907,29 +909,44 @@ def load_from_directory(self, directory: str | None = None) -> list[TypeObj]:
                 directory = getexistingdirectory(self, _("Open"), basedir)
         if not directory:
             return []
+        folders = [
+            path
+            for path in glob.glob(osp.join(directory, "**"), recursive=True)
+            if osp.isdir(path) and len(os.listdir(path)) > 0
+        ]
         objs = []
-        # Iterate over all subfolders in the directory:
-        for path in glob.glob(osp.join(directory, "**"), recursive=True):
-            if osp.isdir(path) and len(os.listdir(path)) > 0:
+        with create_progress_bar(
+            self, _("Scanning directory"), max_=len(folders) - 1
+        ) as progress:
+            # Iterate over all subfolders in the directory:
+            for i_path, path in enumerate(folders):
+                progress.setValue(i_path + 1)
+                if progress.wasCanceled():
+                    break
                 path = osp.normpath(path)
-                self.add_group(osp.basename(path), select=True)
                 fnames = [
                     osp.join(path, fname)
                     for fname in os.listdir(path)
                     if osp.isfile(osp.join(path, fname))
                 ]
                 new_objs = self.load_from_files(
-                    fnames, create_group=False, ignore_errors=True
+                    fnames,
+                    create_group=False,
+                    add_objects=False,
+                    ignore_errors=True,
                 )
-                objs += new_objs
-                if len(new_objs) == 0:
-                    self.remove_object(force=True)  # Remove empty group
+                if new_objs:
+                    objs += new_objs
+                    grp = self.add_group(osp.basename(path))
+                    for obj in new_objs:
+                        self.add_object(obj, group_id=grp.uuid, set_current=False)
         return objs
 
     def load_from_files(
         self,
         filenames: list[str] | None = None,
         create_group: bool = False,
+        add_objects: bool = True,
         ignore_errors: bool = False,
     ) -> list[TypeObj]:
         """Open objects from file (signals/images), add them to DataLab and return them.
@@ -939,6 +956,7 @@ def load_from_files(
             create_group: if True, create a new group if more than one object is loaded
              for a single file. Defaults to False: all objects are added to the current
              group.
+            add_objects: if True, add objects to the panel. Defaults to True.
             ignore_errors: if True, ignore errors when loading files. Defaults to False.
 
         Returns:
@@ -956,7 +974,9 @@ def load_from_files(
             with qt_try_loadsave_file(self.parent(), filename, "load"):
                 Conf.main.base_dir.set(filename)
                 try:
-                    objs += self.__load_from_file(filename, create_group=create_group)
+                    objs += self.__load_from_file(
+                        filename, create_group=create_group, add_objects=add_objects
+                    )
                 except Exception as exc:  # pylint: disable=broad-except
                     if ignore_errors:
                         # Ignore unknown file types

cdl/locale/fr/LC_MESSAGES/cdl.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-03-30 15:59+0200\n"
+"POT-Creation-Date: 2025-04-08 10:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1960,6 +1960,9 @@ msgstr "Renommer le groupe"
 msgid "Adding objects to workspace"
 msgstr "Ajout d'objets à l'espace de travail"
 
+msgid "Scanning directory"
+msgstr "Analyse du répertoire"
+
 msgid "Save as"
 msgstr "Enregistrer sous"
 

doc/locale/fr/LC_MESSAGES/api/core.gui/panel.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DataLab \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-08 10:22+0200\n"
+"POT-Creation-Date: 2025-04-08 10:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -346,6 +346,9 @@ msgstr ""
 msgid "if True, create a new group if more than one object is loaded for a single file. Defaults to False: all objects are added to the current group."
 msgstr ""
 
+msgid "if True, add objects to the panel. Defaults to True."
+msgstr ""
+
 msgid "if True, ignore errors when loading files. Defaults to False."
 msgstr ""