Merge branch 'feature/scene-naming-option'

unshackle/core/config.py

@@ -80,6 +80,7 @@ class Config:
         self.tmdb_api_key: str = kwargs.get("tmdb_api_key") or ""
         self.update_checks: bool = kwargs.get("update_checks", True)
         self.update_check_interval: int = kwargs.get("update_check_interval", 24)
+        self.scene_naming: bool = kwargs.get("scene_naming", True)
 
     @classmethod
     def from_yaml(cls, path: Path) -> Config:

unshackle/core/titles/episode.py

@@ -107,10 +107,13 @@ class Episode(Title):
                 name=self.name or "",
             ).strip()
 
+        if config.scene_naming:
             # Resolution
             if primary_video_track:
                 resolution = primary_video_track.height
-            aspect_ratio = [int(float(plane)) for plane in primary_video_track.other_display_aspect_ratio[0].split(":")]
+                aspect_ratio = [
+                    int(float(plane)) for plane in primary_video_track.other_display_aspect_ratio[0].split(":")
+                ]
                 if len(aspect_ratio) == 1:
                     # e.g., aspect ratio of 2 (2.00:1) would end up as `(2.0,)`, add 1
                     aspect_ratio.append(1)
@@ -144,7 +147,9 @@ class Episode(Title):
                 codec = primary_audio_track.format
                 channel_layout = primary_audio_track.channel_layout or primary_audio_track.channellayout_original
                 if channel_layout:
-                channels = float(sum({"LFE": 0.1}.get(position.upper(), 1) for position in channel_layout.split(" ")))
+                    channels = float(
+                        sum({"LFE": 0.1}.get(position.upper(), 1) for position in channel_layout.split(" "))
+                    )
                 else:
                     channel_count = primary_audio_track.channel_s or primary_audio_track.channels or 0
                     channels = float(channel_count)
@@ -158,7 +163,10 @@ class Episode(Title):
             if primary_video_track:
                 codec = primary_video_track.format
                 hdr_format = primary_video_track.hdr_format_commercial
-            trc = primary_video_track.transfer_characteristics or primary_video_track.transfer_characteristics_original
+                trc = (
+                    primary_video_track.transfer_characteristics
+                    or primary_video_track.transfer_characteristics_original
+                )
                 frame_rate = float(primary_video_track.frame_rate)
                 if hdr_format:
                     if (primary_video_track.hdr_format or "").startswith("Dolby Vision"):
@@ -176,6 +184,9 @@ class Episode(Title):
                 name += f"-{config.tag}"
 
             return sanitize_filename(name)
+        else:
+            # Simple naming style without technical details - use spaces instead of dots
+            return sanitize_filename(name, " ")
 
 
 class Series(SortedKeyList, ABC):

unshackle/core/titles/movie.py

@@ -58,10 +58,13 @@ class Movie(Title):
         # Name (Year)
         name = str(self).replace("$", "S")  # e.g., Arli$$
 
+        if config.scene_naming:
             # Resolution
             if primary_video_track:
                 resolution = primary_video_track.height
-            aspect_ratio = [int(float(plane)) for plane in primary_video_track.other_display_aspect_ratio[0].split(":")]
+                aspect_ratio = [
+                    int(float(plane)) for plane in primary_video_track.other_display_aspect_ratio[0].split(":")
+                ]
                 if len(aspect_ratio) == 1:
                     # e.g., aspect ratio of 2 (2.00:1) would end up as `(2.0,)`, add 1
                     aspect_ratio.append(1)
@@ -95,7 +98,9 @@ class Movie(Title):
                 codec = primary_audio_track.format
                 channel_layout = primary_audio_track.channel_layout or primary_audio_track.channellayout_original
                 if channel_layout:
-                channels = float(sum({"LFE": 0.1}.get(position.upper(), 1) for position in channel_layout.split(" ")))
+                    channels = float(
+                        sum({"LFE": 0.1}.get(position.upper(), 1) for position in channel_layout.split(" "))
+                    )
                 else:
                     channel_count = primary_audio_track.channel_s or primary_audio_track.channels or 0
                     channels = float(channel_count)
@@ -109,7 +114,10 @@ class Movie(Title):
             if primary_video_track:
                 codec = primary_video_track.format
                 hdr_format = primary_video_track.hdr_format_commercial
-            trc = primary_video_track.transfer_characteristics or primary_video_track.transfer_characteristics_original
+                trc = (
+                    primary_video_track.transfer_characteristics
+                    or primary_video_track.transfer_characteristics_original
+                )
                 frame_rate = float(primary_video_track.frame_rate)
                 if hdr_format:
                     if (primary_video_track.hdr_format or "").startswith("Dolby Vision"):
@@ -127,6 +135,9 @@ class Movie(Title):
                 name += f"-{config.tag}"
 
             return sanitize_filename(name)
+        else:
+            # Simple naming style without technical details - use spaces instead of dots
+            return sanitize_filename(name, " ")
 
 
 class Movies(SortedKeyList, ABC):

unshackle/core/titles/song.py

@@ -100,6 +100,7 @@ class Song(Title):
             # NN. Song Name
             name = str(self).split(" / ")[1]
 
+        if config.scene_naming:
             # Service
             if show_service:
                 name += f" {self.service.__name__}"
@@ -116,6 +117,9 @@ class Song(Title):
                 name += f"-{config.tag}"
 
             return sanitize_filename(name, " ")
+        else:
+            # Simple naming style without technical details
+            return sanitize_filename(name, " ")
 
 
 class Album(SortedKeyList, ABC):

unshackle/unshackle.yaml

@@ -4,6 +4,11 @@ tag: user_tag
 # Set terminal background color (custom option not in CONFIG.md)
 set_terminal_bg: false
 
+# Set file naming convention
+#  true for style - Prime.Suspect.S07E01.The.Final.Act.Part.One.1080p.ITV.WEB-DL.AAC2.0.H.264
+#  false for style - Prime Suspect S07E01 The Final Act - Part One
+scene_naming: true
+
 # Check for updates from GitHub repository on startup (default: true)
 update_checks: true