Fix automatic macro naming generating duplicates after workspace reload

Author: PierreRaybaut

datalab/gui/macroeditor.py

@@ -186,8 +186,20 @@ def get_untitled_title() -> str:
         """
         global UNTITLED_NB  # pylint: disable=global-statement
         UNTITLED_NB += 1
-        untitled = _("Untitled")
-        return f"{untitled} {UNTITLED_NB:02d}"
+        return f"macro_{UNTITLED_NB:02d}"
+
+    @staticmethod
+    def set_untitled_number(number: int) -> None:
+        """Set the untitled number counter
+
+        This is useful when loading macros from HDF5 or files to ensure
+        that the next untitled macro has a unique name.
+
+        Args:
+            number: New untitled number
+        """
+        global UNTITLED_NB  # pylint: disable=global-statement
+        UNTITLED_NB = number
 
     def modification_changed(self, state: bool) -> None:
         """Method called when macro's editor modification state changed

datalab/gui/panel/macro.py

@@ -256,6 +256,8 @@ def deserialize_from_hdf5(
                 #  in a group but directly in the root of the HDF5 file
                 obj = self.deserialize_object_from_hdf5(reader, name, reset_all)
                 self.add_object(obj)
+        # Update untitled number counter to prevent duplicate names
+        self.update_untitled_counter()
 
     def __len__(self) -> int:
         """Return number of objects"""
@@ -302,6 +304,8 @@ def remove_all_objects(self) -> None:
         self.tabwidget.clear()
         self.__macros.clear()
         super().remove_all_objects()
+        # Reset untitled counter when clearing all macros
+        Macro.set_untitled_number(0)
 
     # ---- Macro panel API -------------------------------------------------------------
     def setup_actions(self) -> None:
@@ -576,9 +580,27 @@ def import_macro_from_file(self, filename: str | None = None) -> int:
                 Conf.main.base_dir.set(filename)
                 macro = self.add_macro()
                 macro.from_file(filename)
+            # Update untitled number counter to prevent duplicate names
+            self.update_untitled_counter()
             return self.get_number_from_macro(macro)
         return -1
 
+    def update_untitled_counter(self) -> None:
+        """Update the untitled counter based on existing macro titles
+
+        This scans all macro titles to find the highest "macro_XX" number
+        and updates the global counter to prevent duplicate names.
+        """
+        max_untitled = 0
+        for macro in self.__macros:
+            # Match titles like "macro_01", "macro_02", etc.
+            match = re.match(r"macro_(\d+)", macro.title)
+            if match:
+                number = int(match.group(1))
+                max_untitled = max(max_untitled, number)
+        # Set the counter to the highest found number
+        Macro.set_untitled_number(max_untitled)
+
     def remove_macro(self, number_or_title: int | str | None = None) -> None:
         """Remove macro
 

datalab/locale/fr/LC_MESSAGES/datalab.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  datalab\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-12-03 12:01+0100\n"
+"POT-Creation-Date: 2025-12-04 17:48+0100\n"
 "PO-Revision-Date: 2025-05-22 15:46+0200\n"
 "Last-Translator: Christophe Debonnel <[email protected]>\n"
 "Language: fr\n"
@@ -672,9 +672,6 @@ msgstr "Aucune donnée prise en charge dans le(s) fichier(s) HDF5."
 msgid "Macro simple example"
 msgstr "Exemple simple de macro"
 
-msgid "Untitled"
-msgstr "Sans titre"
-
 #, python-format
 msgid "# ==> Unable to run '%s' macro"
 msgstr "# ==> Impossible d'exécuter la macro '%s'"

doc/locale/fr/LC_MESSAGES/release_notes/release_1.00.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DataLab \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-12-04 15:55+0100\n"
+"POT-Creation-Date: 2025-12-04 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -34,6 +34,21 @@ msgstr "**Disposition du panneau des macros :**"
 msgid "Fixed macro console taking excessive vertical space on first open - the script editor now properly gets 70% of space and console 30% by default, ensuring comfortable editing without manual resizing"
 msgstr "Correction du panneau de la console des macros prenant un espace vertical excessif à la première ouverture - l'éditeur de scripts obtient désormais correctement 70 % de l'espace et la console 30 % par défaut, garantissant une édition confortable sans redimensionnement manuel"
 
+msgid "**Macro naming:**"
+msgstr "**Nommage des macros :**"
+
+msgid "Fixed automatic macro naming generating duplicate names after reloading workspace from HDF5 files"
+msgstr "Correction du nommage automatique des macros générant des noms en double après le rechargement de l'espace de travail à partir de fichiers HDF5"
+
+msgid "When macros were deserialized from saved workspaces or imported from files, the internal counter used for generating default names (e.g., \"macro_01\", \"macro_02\") was not updated, causing the next new macro to potentially reuse an existing name"
+msgstr "Lorsque les macros étaient désérialisées à partir d'espaces de travail enregistrés ou importées à partir de fichiers, le compteur interne utilisé pour générer des noms par défaut (par exemple, \"macro_01\", \"macro_02\") n'était pas mis à jour, ce qui pouvait entraîner la réutilisation d'un nom existant pour la prochaine nouvelle macro"
+
+msgid "The counter now synchronizes with existing macro names after loading, ensuring unique sequential naming"
+msgstr "Le compteur se synchronise désormais avec les noms de macros existants après le chargement, garantissant un nommage séquentiel unique"
+
+msgid "Default macro names simplified from translated \"Untitled XX\" to language-neutral \"macro_XX\" format for better consistency across locales"
+msgstr "Les noms de macros par défaut ont été simplifiés du format traduit \"Sans titre XX\" au format neutre en termes de langue \"macro_XX\" pour une meilleure cohérence entre les locales"
+
 msgid "**Macro execution:**"
 msgstr "**Exécution des macros :**"
 

doc/release_notes/release_1.00.md

@@ -8,6 +8,13 @@
 
 * Fixed macro console taking excessive vertical space on first open - the script editor now properly gets 70% of space and console 30% by default, ensuring comfortable editing without manual resizing
 
+**Macro naming:**
+
+* Fixed automatic macro naming generating duplicate names after reloading workspace from HDF5 files
+* When macros were deserialized from saved workspaces or imported from files, the internal counter used for generating default names (e.g., "macro_01", "macro_02") was not updated, causing the next new macro to potentially reuse an existing name
+* The counter now synchronizes with existing macro names after loading, ensuring unique sequential naming
+* Default macro names simplified from translated "Untitled XX" to language-neutral "macro_XX" format for better consistency across locales
+
 **Macro execution:**
 
 * Fixed syntax errors when using f-strings with nested quotes in macros (e.g., `f'text {func("arg")}'` now works correctly)