refactor: Consolidate text color decorators and update related properties

renamer/views/media_panel.py

@@ -32,17 +32,16 @@ class MediaPanelView:
         """Return formatted selected data"""
         return "\n".join(
             [
-                self._props.title("Media Info Summary"),
                 self._props.media_title,
                 self._props.media_year,
-                self._props.media_genres,
+                self._props.tmdb_genres,
                 self._props.media_duration,
                 self._props.media_file_size,
                 self._props.media_file_extension,
                 self._props.selected_frame_class,
                 self._props.selected_source,
                 self._props.selected_audio_langs,
-                self._props.selected_database_info,
+                self._props.tmdb_database_info,
                 self._props.selected_order,
             ]
         )
@@ -52,7 +51,7 @@ class MediaPanelView:
         """Return formatted file info"""
         return "\n".join(
             [
-                self._props.title("File Info"),
+                self._props.file_info_title,
                 self._props.file_path,
                 self._props.file_size,
                 self._props.file_name,
@@ -66,7 +65,6 @@ class MediaPanelView:
         """Return formatted TMDB data"""
         return "\n".join(
             [
-                self._props.title("TMDB Data"),
                 self._props.tmdb_id,
                 self._props.tmdb_title,
                 self._props.tmdb_original_title,

renamer/views/media_panel_properties.py

@@ -44,40 +44,48 @@ class MediaPanelProperties:
     # ============================================================
 
     @property
-    @conditional_decorators.wrap("Path: ")
-    @text_decorators.blue()
+    @conditional_decorators.wrap(left="󰷊 ", right="")
+    @text_decorators.uppercase()
+    @text_decorators.bold()
+    def file_info_title(self) -> str:
+        """Get file info title formatted with label."""
+        return "File Info"
+
+    @property
+    @conditional_decorators.wrap("├ 󰙅 : ")
+    @text_decorators.colour(name="blue")
     @text_decorators.escape()
     def file_path(self) -> str:
         """Get file path formatted with label."""
         return self._extractor.get("file_path")
 
     @property
-    @conditional_decorators.wrap("Size: ")
-    @text_decorators.green()
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @size_decorators.size_full()
     def file_size(self) -> str:
         """Get file size formatted with label."""
         return self._extractor.get("file_size")
 
     @property
-    @conditional_decorators.wrap("Name: ")
-    @text_decorators.cyan()
+    @conditional_decorators.wrap(left="├ 󰈙 : ")
+    @text_decorators.colour(name="bisque")
     @text_decorators.escape()
     def file_name(self) -> str:
         """Get file name formatted with label."""
         return self._extractor.get("file_name")
 
     @property
-    @conditional_decorators.wrap("Modified: ")
-    @text_decorators.magenta()
+    @conditional_decorators.wrap(left="├ 󱋡 : ")
+    @text_decorators.colour("bisque")
     @date_decorators.modification_date()
     def modification_time(self) -> str:
         """Get modification time formatted with label."""
         return self._extractor.get("modification_time")
 
     @property
-    @conditional_decorators.wrap("Extension: ")
-    @text_decorators.green()
+    @conditional_decorators.wrap(left="└  : ")
+    @text_decorators.colour(name="bisque")
     @extension_decorators.extension_info()
     def extension_fileinfo(self) -> str:
         """Get extension from FileInfo formatted with label."""
@@ -88,63 +96,62 @@ class MediaPanelProperties:
     # ============================================================
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("ID: ")
-    @text_decorators.yellow()
+    @conditional_decorators.wrap("󰈚 TMDB : ")
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.default("<None>")
     def tmdb_id(self) -> str:
         """Get TMDB ID formatted with label."""
         return self._extractor.get("tmdb_id", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Title: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰗴 : ")
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.default("<None>")
     def tmdb_title(self) -> str:
         """Get TMDB title formatted with label."""
         return self._extractor.get("title", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Original Title: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰗴 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def tmdb_original_title(self) -> str:
         """Get TMDB original title formatted with label."""
         return self._extractor.get("original_title", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Year: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def tmdb_year(self) -> str:
         """Get TMDB year formatted with label."""
         return self._extractor.get("year", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Countries: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def tmdb_countries(self) -> str:
         """Get TMDB production countries formatted with label."""
         return self._extractor.get("production_countries", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Genres: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰴂 : ")
+    @text_decorators.colour(name="cyan")
     @conditional_decorators.default("<None>")
     def tmdb_genres(self) -> str:
         """Get TMDB genres formatted with label."""
         return self._extractor.get("genres", "TMDB")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Database Info: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰻾 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     @special_info_decorators.database_info()
     def tmdb_database_info(self) -> str:
@@ -152,8 +159,9 @@ class MediaPanelProperties:
         return self._extractor.get("movie_db", "TMDB")
 
     @property
-    # @text_decorators.blue()
-    @conditional_decorators.default("")
+    # @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="└ ")
+    @conditional_decorators.default(default_value="")
     @text_decorators.url()
     def tmdb_url(self) -> str:
         """Get TMDB URL formatted with label."""
@@ -165,7 +173,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Title: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def metadata_title(self) -> str:
         """Get metadata title formatted with label."""
@@ -173,7 +181,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Duration: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     @duration_decorators.duration_full()
     def metadata_duration(self) -> str:
@@ -182,7 +190,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Artist: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def metadata_artist(self) -> str:
         """Get metadata artist formatted with label."""
@@ -194,7 +202,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Duration: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     @duration_decorators.duration_full()
     def mediainfo_duration(self) -> str:
@@ -203,7 +211,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Frame Class: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_frame_class(self) -> str:
         """Get MediaInfo frame class formatted with label."""
@@ -211,7 +219,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Resolution: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     @resolution_decorators.resolution_dimensions()
     def mediainfo_resolution(self) -> str:
@@ -220,7 +228,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Aspect Ratio: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_aspect_ratio(self) -> str:
         """Get MediaInfo aspect ratio formatted with label."""
@@ -228,7 +236,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("HDR: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_hdr(self) -> str:
         """Get MediaInfo HDR formatted with label."""
@@ -236,7 +244,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Audio Languages: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_audio_langs(self) -> str:
         """Get MediaInfo audio languages formatted with label."""
@@ -244,7 +252,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Anamorphic: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_anamorphic(self) -> str:
         """Get MediaInfo anamorphic formatted with label."""
@@ -252,7 +260,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Extension: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     @extension_decorators.extension_info()
     def mediainfo_extension(self) -> str:
@@ -261,7 +269,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("3D Layout: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def mediainfo_3d_layout(self) -> str:
         """Get MediaInfo 3D layout formatted with label."""
@@ -273,7 +281,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Order: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.default("Not extracted")
     def filename_order(self) -> str:
         """Get filename order formatted with label."""
@@ -281,15 +289,15 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Movie title: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("")
     def filename_title(self) -> str:
         """Get filename title formatted with label."""
         return self._extractor.get("title", "Filename")
 
     @property
-    @conditional_decorators.wrap("Year: ")
-    @text_decorators.grey()
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("")
     def filename_year(self) -> str:
         """Get filename year formatted with label."""
@@ -297,7 +305,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Video source: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def filename_source(self) -> str:
         """Get filename source formatted with label."""
@@ -305,7 +313,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Frame class: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def filename_frame_class(self) -> str:
         """Get filename frame class formatted with label."""
@@ -313,7 +321,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("HDR: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def filename_hdr(self) -> str:
         """Get filename HDR formatted with label."""
@@ -321,7 +329,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Audio langs: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def filename_audio_langs(self) -> str:
         """Get filename audio languages formatted with label."""
@@ -329,9 +337,9 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Special info: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
-    @text_decorators.blue()
+    @text_decorators.colour(name="blue")
     @special_info_decorators.special_info()
     def filename_special_info(self) -> str:
         """Get filename special info formatted with label."""
@@ -339,7 +347,7 @@ class MediaPanelProperties:
 
     @property
     @conditional_decorators.wrap("Movie DB: ")
-    @text_decorators.grey()
+    @text_decorators.colour(name="grey")
     @conditional_decorators.default("Not extracted")
     def filename_movie_db(self) -> str:
         """Get filename movie DB formatted with label."""
@@ -350,72 +358,63 @@ class MediaPanelProperties:
     # ============================================================
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Duration: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰔚 : ")
+    @text_decorators.colour(name="bisque")
     @duration_decorators.duration_full()
     def media_duration(self) -> str:
         """Get media duration from best available source."""
         return self._extractor.get("duration")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Order: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="└ 󰒾 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def selected_order(self) -> str:
         """Get selected order formatted with label."""
         return self._extractor.get("order")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap(left="󰿎 ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="󰿎 MOVIE : ")
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.default("<None>")
     def media_title(self) -> str:
         """Get selected title formatted with label."""
         return self._extractor.get("title")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Year: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def media_year(self) -> str:
         """Get selected year formatted with label."""
         return self._extractor.get("year")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Genres: ")
-    @text_decorators.cyan()
-    @conditional_decorators.default("<None>")
-    def media_genres(self) -> str:
-        """Get TMDB genres formatted with label."""
-        return self._extractor.get("genres")
-
-    @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("File size: ")
-    @text_decorators.green()
-    @size_decorators.size_full()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="green")
+    @size_decorators.size_short()
     def media_file_size(self) -> str:
         """Get media file size formatted with label."""
         return self._extractor.get("file_size")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Extension: ")
-    @text_decorators.green()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @extension_decorators.extension_info()
     def media_file_extension(self) -> str:
         """Get media file extension formatted with label."""
         return self._extractor.get("extension")
 
     @property
-    @text_decorators.blue()
+    @text_decorators.colour(name="blue")
     @conditional_decorators.wrap("Special info: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.default("<None>")
     @special_info_decorators.special_info()
     def selected_special_info(self) -> str:
@@ -423,58 +422,48 @@ class MediaPanelProperties:
         return self._extractor.get("special_info")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Source: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├  : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def selected_source(self) -> str:
         """Get selected source formatted with label."""
         return self._extractor.get("source")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Frame class: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󱣴 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def selected_frame_class(self) -> str:
         """Get selected frame class formatted with label."""
         return self._extractor.get("frame_class")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("HDR: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰵽 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def selected_hdr(self) -> str:
         """Get selected HDR formatted with label."""
         return self._extractor.get("hdr")
 
     @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Audio langs: ")
-    @text_decorators.yellow()
+    @text_decorators.colour(name="blue")
+    @conditional_decorators.wrap(left="├ 󰗊 : ")
+    @text_decorators.colour(name="bisque")
     @conditional_decorators.default("<None>")
     def selected_audio_langs(self) -> str:
         """Get selected audio languages formatted with label."""
         return self._extractor.get("audio_langs")
 
-    @property
-    @text_decorators.blue()
-    @conditional_decorators.wrap("Database Info: ")
-    @text_decorators.yellow()
-    @conditional_decorators.default("<None>")
-    @special_info_decorators.database_info()
-    def selected_database_info(self) -> str:
-        """Get selected database info formatted with label."""
-        return self._extractor.get("movie_db")
-
     @property
     def video_tracks(self) -> list[str]:
         """Return formatted video track data"""
         tracks = self._extractor.get("video_tracks", "MediaInfo") or []
         return [self.video_track(track, i) for i, track in enumerate(tracks, start=1)]
 
-    @text_decorators.green()
+    @text_decorators.colour(name="green")
     @conditional_decorators.wrap("Video Track {index}: ")
     @track_decorators.video_track()
     def video_track(self, track, index) -> str:
@@ -487,7 +476,7 @@ class MediaPanelProperties:
         tracks = self._extractor.get("audio_tracks", "MediaInfo") or []
         return [self.audio_track(track, i) for i, track in enumerate(tracks, start=1)]
 
-    @text_decorators.yellow()
+    @text_decorators.colour(name="yellow")
     @conditional_decorators.wrap("Audio Track {index}: ")
     @track_decorators.audio_track()
     def audio_track(self, track, index) -> str:
@@ -502,7 +491,7 @@ class MediaPanelProperties:
             self.subtitle_track(track, i) for i, track in enumerate(tracks, start=1)
         ]
 
-    @text_decorators.magenta()
+    @text_decorators.colour(name="magenta")
     @conditional_decorators.wrap("Subtitle Track {index}: ")
     @track_decorators.subtitle_track()
     def subtitle_track(self, track, index) -> str:

renamer/views/proposed_filename.py

@@ -92,14 +92,14 @@ class ProposedFilenameView:
 
     @property
     @conditional_decorators.wrap(">> ", " <<")
-    @text_decorators.green()
+    @text_decorators.colour(name="green")
     def rename_line_similar(self) -> str:
         """Generate a simplified proposed filename for similarity checks."""
         return escape(str(self))
 
     @property
-    @conditional_decorators.wrap(">> ", " <<")
-    @text_decorators.orange()
+    @conditional_decorators.wrap(left=">> ", right=" <<")
+    @text_decorators.colour(name="orange")
     def rename_line_different(self) -> str:
         """Generate a detailed proposed filename for difference checks."""
-        return escape(str(self))
+        return escape(str(self))