cuemsutils 0.1.0rc15__tar.gz → 0.1.0rc16__tar.gz

{cuemsutils-0.1.0rc15 → cuemsutils-0.1.0rc16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cuemsutils
-Version: 0.1.0rc15
+Version: 0.1.0rc16
 Summary: Reusable classes and methods for CueMS system
 Project-URL: Documentation, https://stagesoft.github.io/cuems-utils/
 Project-URL: Issues, https://github.com/stagesoft/cuems-utils/issues

{cuemsutils-0.1.0rc15 → cuemsutils-0.1.0rc16}/cuemsutils/__init__.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0
 # SPDX-FileContributor: Ion Reguera <ion@stagelab.coop>
-__version__ = "0.1.0rc15"
+__version__ = "0.1.0rc16"

{cuemsutils-0.1.0rc15 → cuemsutils-0.1.0rc16}/cuemsutils/cues/CueList.py

@@ -1,6 +1,10 @@
+# SPDX-FileCopyrightText: 2026 Stagelab Coop SCCL
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileContributor: Ion Reguera <ion@stagelab.coop>
 from .Cue import Cue
 from .MediaCue import MediaCue
 from ..helpers import ensure_items
+from ..log import Logger
 from ..tools.Uuid import Uuid
 
 REQ_ITEMS = {
@@ -111,9 +115,24 @@ class CueList(Cue):
         for cue in self.contents:
             if isinstance(cue, CueList):
                 media_dict.update(cue.get_media())
-            elif isinstance(cue, MediaCue) and hasattr(cue.media, 'file_name'):
-                media_dict[str(cue.id)] = {str(cue.media.id) : cue.media.file_name }
-        
+            elif isinstance(cue, MediaCue):
+                state, file_name = cue.media_status()
+                if state == 'ok':
+                    media_dict[str(cue.id)] = {str(cue.media.id): file_name}
+                elif state == 'none':
+                    # Legacy <Media/>: keep such projects listable and
+                    # duplicable; saving one is the editor's validator's job.
+                    Logger.warning(
+                        f"cue {cue.get('name')} ({cue.get('id')}) has no media, skipped"
+                    )
+                else:
+                    # A media block without a file: a client dropped it. Never
+                    # skip silently — a save that got through would write an
+                    # empty <Media/> and lose the cue's media for good.
+                    raise ValueError(
+                        f"cue {cue.get('name')} ({cue.get('id')}) has no media file"
+                    )
+
         return media_dict
 
     def get_next_cue(self):

{cuemsutils-0.1.0rc15 → cuemsutils-0.1.0rc16}/cuemsutils/cues/CuemsScript.py

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2026 Stagelab Coop SCCL
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileContributor: Ion Reguera <ion@stagelab.coop>
 import json
 import json_fix
 
@@ -238,11 +241,21 @@ class CuemsScript(dict):
                 media_dict.update(
                     self.get_own_media(config=config, cuelist=cue)
                 )
-            elif isinstance(cue, MediaCue) and hasattr(cue.media, 'file_name'):
-                Logger.debug(f'get_own_media media cue at {pos}')
-                cue.localize_cue(config.node_conf['uuid'])
-                if cue._local:
-                    media_dict[str(cue.id)] = cue.media.file_name
+            elif isinstance(cue, MediaCue):
+                state, file_name = cue.media_status()
+                if state != 'ok':
+                    # Engine path, every node, every load: never raise here.
+                    # The project still loads and this cue fails at arm,
+                    # loudly and locally, as it always did for <Media/>.
+                    Logger.error(
+                        f"get_own_media: cue {cue.get('name')} ({cue.get('id')}) "
+                        f"has no media file ({state}); left out of the media list"
+                    )
+                else:
+                    Logger.debug(f'get_own_media media cue at {pos}')
+                    cue.localize_cue(config.node_conf['uuid'])
+                    if cue._local:
+                        media_dict[str(cue.id)] = file_name
             pos += 1
         return media_dict
 

{cuemsutils-0.1.0rc15 → cuemsutils-0.1.0rc16}/cuemsutils/cues/MediaCue.py

@@ -382,6 +382,31 @@ class MediaCue(Cue):
 
     media: Media = property(get_Media, set_Media)
 
+    def media_status(self) -> tuple[str, str | None]:
+        """Classify this cue's media without raising.
+
+        Returns ``(state, file_name)`` with ``state`` one of:
+
+        * ``'none'``    — no media object at all (``None``): what an empty
+          ``<Media/>`` or a JSON ``Media: null`` decodes to;
+        * ``'invalid'`` — a media object with no ``file_name`` key, an empty
+          ``file_name``, or no ``id`` key: what a client that dropped the
+          media block produces (``ensure_items`` builds an empty ``Media``);
+        * ``'ok'``      — a usable media reference.
+
+        Never touches the ``file_name`` property: it raises ``KeyError`` when
+        the key is missing, which is exactly the crash this replaces.
+        """
+        media = dict.get(self, 'Media')
+        if media is None:
+            return 'none', None
+        if not isinstance(media, dict):
+            return 'invalid', None
+        file_name = dict.get(media, 'file_name')
+        if not file_name or 'id' not in media:
+            return 'invalid', None
+        return 'ok', str(file_name)
+
     def get_outputs(self):
         """Get the output routing configuration.