Merge pull request #1667 from papr/v1.16_fixes

V1.16 fixes

Author: papr

pupil_src/shared_modules/gaze_producer/model/calibration_storage.py

@@ -59,8 +59,9 @@ def duplicate_calibration(self, calibration):
     def add(self, calibration):
         if any(c.unique_id == calibration.unique_id for c in self._calibrations):
             logger.warning(
-                "Did not add calibration {} because it is already in the "
-                "storage".format(calibration.name)
+                f"Did not add calibration {calibration.name} ({calibration.unique_id})"
+                " because it is already in the storage. Currently in storage:\n"
+                + "\n".join(f"- {c.name} ({c.unique_id})" for c in self._calibrations)
             )
             return
         self._calibrations.append(calibration)

pupil_src/shared_modules/gaze_producer/ui/storage_edit_menu.py

@@ -9,18 +9,22 @@
 ---------------------------------------------------------------------------~(*)
 """
 import abc
+import logging
 
 from pyglui import ui
 
 from gaze_producer import ui as plugin_ui
 
+logger = logging.getLogger(__name__)
+
 
 class StorageEditMenu(plugin_ui.SelectAndRefreshMenu, abc.ABC):
     """
     A SelectAndRefreshMenu that shows the items in a storage. It has a button above the
     selector to create a new item and shows for every item two buttons,
     one to duplicate the current item, and one to delete it.
     """
+
     new_button_label = "New"
     duplicate_button_label = "Duplicate Current Configuration"
 
@@ -76,12 +80,18 @@ def render_item(self, item, menu):
     def _on_click_new_button(self):
         new_item = self._new_item()
         self._storage.add(new_item)
+        if new_item not in self._storage:
+            logger.error("New item could not be added. Aborting.")
+            return
         self.current_item = new_item
         self.render()
 
     def _on_click_duplicate_button(self):
         new_item = self._duplicate_item(self.current_item)
         self._storage.add(new_item)
+        if new_item not in self._storage:
+            logger.error("New item could not be added. Aborting.")
+            return
         self.current_item = new_item
         self.render()
 

pupil_src/shared_modules/pupil_recording/recording.py

@@ -153,9 +153,9 @@ def filter_multiple(self, *keys: str, mode: FilterMode) -> FilterType:
                 for patterns in patterns_for_keys
             ]
             if mode is self.FilterMode.UNION:
-                self.__files = set.union(*sets_of_files)
+                self.__files = list(set.union(*sets_of_files))
             elif mode is self.FilterMode.INTERSECTION:
-                self.__files = set.intersection(*sets_of_files)
+                self.__files = list(set.intersection(*sets_of_files))
             else:
                 logger.warning(
                     f"Unknown filter mode: {mode}! Must be 'union' or 'intersection'!"

pupil_src/shared_modules/storage.py

@@ -13,11 +13,18 @@
 import os
 import random
 import re
+import uuid
 
 import file_methods as fm
 
 logger = logging.getLogger(__name__)
 
+# Create our own uuid namespace; to be used with uuid.uuid5()
+# Will be used to create reproducible uuids in create_unique_id_from_string()
+UUID_NAMESPACE_PUPIL_LABS = uuid.uuid5(uuid.NAMESPACE_DNS, "pupil-labs.com")
+# Should always result in the same UUID:
+assert UUID_NAMESPACE_PUPIL_LABS == uuid.UUID("8ea5d78e-e022-5ee4-a198-1bc002516ff0")
+
 
 class StorageItem(abc.ABC):
     @property
@@ -40,18 +47,15 @@ def create_new_unique_id():
         """
         Returns: A string like e.g. "04bfd332"
         """
-        return "{:0>8x}".format(random.getrandbits(32))
+        return str(uuid.uuid4())
 
     @staticmethod
     def create_unique_id_from_string(string):
         """
         Returns: A unique id as generated by create_new_unique_id(), but for
             the same input string, it will always return the same id.
         """
-        old_state_of_random = random.getstate()
-        random.seed(string)
-        unique_id = StorageItem.create_new_unique_id()
-        random.setstate(old_state_of_random)
+        unique_id = str(uuid.uuid5(UUID_NAMESPACE_PUPIL_LABS, string))
         return unique_id
 
 

pupil_src/shared_modules/video_export/plugins/imotions_exporter.py

@@ -151,7 +151,7 @@ def _copy_info_csv(source_folder, destination_folder):
 
     data = {}
     data["Recording Name"] = meta.recording_name
-    data["Start Data"] = start_date
+    data["Start Date"] = start_date
     data["Start Time"] = start_time
     data["Start Time (System)"] = meta.start_time_system_s
     data["Start Time (Synced)"] = meta.start_time_synced_s