Add "Open from directory" action to the "File" menu

Author: PierreRaybaut

CHANGELOG.md

@@ -6,6 +6,7 @@ See DataLab [roadmap page](https://datalab-platform.com/en/contributing/roadmap.
 
 💥 New features and enhancements:
 
+* Add "Open from directory" action to the "File" menu for both Signal and Image panels
 * Add `1/x` operation to the "Operations" menu for both Signal and Image panels:
   * This feature relies on the `numpy.reciprocal` function, and handles the case where the denominator is zero by catching warnings and replacing the `np.inf` values with `np.nan` values
   * Add `compute_inverse` method for image and signal processors

cdl/core/baseproxy.py

@@ -211,6 +211,14 @@ def load_from_files(self, filenames: list[str]) -> None:
             filenames: list of file names
         """
 
+    @abc.abstractmethod
+    def load_from_directory(self, path: str) -> None:
+        """Open objects from directory in current panel (signals/images).
+
+        Args:
+            path: directory path
+        """
+
     @abc.abstractmethod
     def add_signal(
         self,
@@ -623,6 +631,14 @@ def load_from_files(self, filenames: list[str]) -> None:
         """
         self._cdl.load_from_files(filenames)
 
+    def load_from_directory(self, path: str) -> None:
+        """Open objects from directory in current panel (signals/images).
+
+        Args:
+            path: directory path
+        """
+        self._cdl.load_from_directory(path)
+
     def get_sel_object_uuids(self, include_groups: bool = False) -> list[str]:
         """Return selected objects uuids.
 

cdl/core/gui/actionhandler.py

@@ -415,6 +415,14 @@ def create_first_actions(self):
                 select_condition=SelectCond.always,
                 toolbar_pos=-1,
             )
+            self.new_action(
+                _("Open from directory..."),
+                icon_name="fileopen_directory.svg",
+                tip=_("Open %s objects from directory") % self.OBJECT_STR,
+                triggered=self.panel.load_from_directory,
+                select_condition=SelectCond.always,
+                toolbar_pos=-1,
+            )
             self.new_action(
                 _("Save %s...") % self.OBJECT_STR,
                 # icon: filesave_signal.svg or filesave_image.svg

cdl/core/gui/main.py

@@ -1493,6 +1493,16 @@ def load_from_files(self, filenames: list[str]) -> None:
         panel = self.__get_current_basedatapanel()
         panel.load_from_files(filenames)
 
+    @remote_controlled
+    def load_from_directory(self, path: str) -> None:
+        """Open objects from directory in current panel (signals/images).
+
+        Args:
+            path: directory path
+        """
+        panel = self.__get_current_basedatapanel()
+        panel.load_from_directory(path)
+
     # ------Other methods related to AbstractCDLControl interface
     def get_version(self) -> str:
         """Return DataLab public version.

cdl/core/gui/panel/base.py

@@ -10,6 +10,7 @@
 
 import abc
 import dataclasses
+import glob
 import os.path as osp
 import re
 import warnings
@@ -28,7 +29,12 @@
 from plotpy.tools import ActionTool
 from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
-from qtpy.compat import getopenfilename, getopenfilenames, getsavefilename
+from qtpy.compat import (
+    getexistingdirectory,
+    getopenfilename,
+    getopenfilenames,
+    getsavefilename,
+)
 
 from cdl.config import APP_NAME, Conf, _
 from cdl.core.gui import actionhandler, objectmodel, objectview
@@ -859,11 +865,38 @@ def __save_to_file(self, obj: TypeObj, filename: str) -> None:
         """
         self.IO_REGISTRY.write(filename, obj)
 
-    def load_from_files(self, filenames: list[str] | None = None) -> list[TypeObj]:
+    def load_from_directory(self, directory: str | None = None) -> list[TypeObj]:
+        """Open objects from directory (signals or images, depending on the panel),
+        add them to DataLab and return them.
+        If the directory is not specified, ask the user to select a directory.
+
+        Args:
+            directory: directory name
+
+        Returns:
+            list of new objects
+        """
+        if not self.mainwindow.confirm_memory_state():
+            return []
+        if directory is None:  # pragma: no cover
+            basedir = Conf.main.base_dir.get()
+            with save_restore_stds():
+                directory = getexistingdirectory(self, _("Open"), basedir)
+        if not directory:
+            return []
+        # Get all files in the directory:
+        relfnames = sorted(glob.glob("**/*.*", root_dir=directory, recursive=True))
+        filenames = [osp.join(directory, fname) for fname in relfnames]
+        return self.load_from_files(filenames, ignore_unknown=True)
+
+    def load_from_files(
+        self, filenames: list[str] | None = None, ignore_unknown: bool = False
+    ) -> list[TypeObj]:
         """Open objects from file (signals/images), add them to DataLab and return them.
 
         Args:
             filenames: File names
+            ignore_unknown: if True, ignore unknown file types (default: False)
 
         Returns:
             list of new objects
@@ -879,7 +912,14 @@ def load_from_files(self, filenames: list[str] | None = None) -> list[TypeObj]:
         for filename in filenames:
             with qt_try_loadsave_file(self.parent(), filename, "load"):
                 Conf.main.base_dir.set(filename)
-                objs += self.__load_from_file(filename)
+                try:
+                    objs += self.__load_from_file(filename)
+                except NotImplementedError as exc:
+                    if ignore_unknown:
+                        # Ignore unknown file types
+                        pass
+                    else:
+                        raise exc
         return objs
 
     def save_to_files(self, filenames: list[str] | str | None = None) -> None:

cdl/core/remote.py

@@ -145,6 +145,7 @@ class RemoteServer(QC.QThread):
     SIG_ADD_OBJECT = QC.Signal(object)
     SIG_ADD_GROUP = QC.Signal(str, str, bool)
     SIG_LOAD_FROM_FILES = QC.Signal(list)
+    SIG_LOAD_FROM_DIRECTORY = QC.Signal(str)
     SIG_SELECT_OBJECTS = QC.Signal(list, str)
     SIG_SELECT_GROUPS = QC.Signal(list, str)
     SIG_SELECT_ALL_GROUPS = QC.Signal(str)
@@ -174,6 +175,7 @@ def __init__(self, win: CDLMainWindow) -> None:
         self.SIG_ADD_OBJECT.connect(win.add_object)
         self.SIG_ADD_GROUP.connect(win.add_group)
         self.SIG_LOAD_FROM_FILES.connect(win.load_from_files)
+        self.SIG_LOAD_FROM_DIRECTORY.connect(win.load_from_directory)
         self.SIG_SELECT_OBJECTS.connect(win.select_objects)
         self.SIG_SELECT_GROUPS.connect(win.select_groups)
         self.SIG_SELECT_ALL_GROUPS.connect(lambda panel: win.select_groups(None, panel))
@@ -348,6 +350,15 @@ def load_from_files(self, filenames: list[str]) -> None:
         """
         self.SIG_LOAD_FROM_FILES.emit(filenames)
 
+    @remote_call
+    def load_from_directory(self, path: str) -> None:
+        """Open objects from directory in current panel (signals/images).
+
+        Args:
+            path: directory path
+        """
+        self.SIG_LOAD_FROM_DIRECTORY.emit(path)
+
     @remote_call
     def add_signal(
         self,

cdl/data/icons/io/fileopen_directory.svg

@@ -0,0 +1,5 @@
+1850.0  -0.443
+1851.0  -0.288
+1852.0  -0.289
+1853.0  -0.333
+1854.0  -0.304

cdl/data/tests/curve_formats/other/other2/recursive2.txt

@@ -0,0 +1,5 @@
+1850.0  -0.443
+1851.0  -0.288
+1852.0  -0.289
+1853.0  -0.333
+1854.0  -0.304

cdl/data/tests/curve_formats/other/recursive1.txt

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-03-23 14:48+0100\n"
+"POT-Creation-Date: 2025-03-30 15:59+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"
@@ -824,6 +824,12 @@ msgstr "Ouvrir un objet %s..."
 msgid "Open %s"
 msgstr "Ouvrir un objet %s"
 
+msgid "Open from directory..."
+msgstr "Ouvrir depuis le répertoire..."
+
+msgid "Open %s objects from directory"
+msgstr "Ouvrir des objets %s depuis le répertoire"
+
 msgid "Save %s..."
 msgstr "Enregistrer un objet %s..."
 
@@ -1813,7 +1819,10 @@ msgid ""
 "Do you want to clear current workspace (signals and images) before importing "
 "data from HDF5 files?<br><br>Choosing to ignore this message will prevent it "
 "from being displayed again, and will use the current setting (%s)."
-msgstr "Souhaitez-vous effacer l'espace de travail actuel (signaux et images) avant d'importer des données depuis des fichiers HDF5 ?<br><br>Ignorer ce message empêchera son affichage ultérieur, et utilisera le réglage actuel (%s)."
+msgstr ""
+"Souhaitez-vous effacer l'espace de travail actuel (signaux et images) avant "
+"d'importer des données depuis des fichiers HDF5 ?<br><br>Ignorer ce message "
+"empêchera son affichage ultérieur, et utilisera le réglage actuel (%s)."
 
 msgid "No"
 msgstr "Non"