Refactor: Add RichMarkup mixin

plextraktsync/media.py

@@ -5,11 +5,11 @@
 
 from plexapi.exceptions import PlexApiException
 from requests import RequestException
-from rich.markup import escape
 from trakt.errors import TraktException
 from trakt.tv import TVShow
 
 from plextraktsync.factory import logger
+from plextraktsync.mixin.RichMarkup import RichMarkup
 from plextraktsync.trakt.TraktLookup import TraktLookup
 
 if TYPE_CHECKING:
@@ -21,7 +21,7 @@
     from plextraktsync.trakt.types import TraktMedia
 
 
-class Media:
+class Media(RichMarkup):
     """
     Class containing Plex and Trakt media items (Movie, Episode)
     """
@@ -55,7 +55,7 @@ def title_link(self):
         if self.plex:
             return self.plex.title_link
 
-        return f"[green]{escape(self.title)}[/]"
+        return self.markup_title(self.title)
 
     @cached_property
     def media_type(self):

plextraktsync/mixin/RichMarkup.py

@@ -0,0 +1,10 @@
+from rich.markup import escape
+
+
+class RichMarkup:
+    def markup_link(self, link: str, title: str):
+        return f"[link={link}]{self.markup_title(title)}[/]"
+
+    @staticmethod
+    def markup_title(title: str):
+        return f"[green]{escape(title)}[/]"

plextraktsync/plex/PlexGuid.py

@@ -3,15 +3,14 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from rich.markup import escape
-
 from plextraktsync.factory import factory
+from plextraktsync.mixin.RichMarkup import RichMarkup
 
 if TYPE_CHECKING:
     from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
 
 
-class PlexGuid:
+class PlexGuid(RichMarkup):
     def __init__(self, guid: str, type: str, pm: PlexLibraryItem | None = None):
         self.guid = guid
         self.type = type
@@ -79,7 +78,7 @@ def title_link(self):
         if self.pm:
             return self.pm.title_link
 
-        return f"[green]{escape(str(self))}[/]"
+        return self.markup_title(str(self))
 
     def __str__(self):
         return f"<PlexGuid:{self.guid}>"

plextraktsync/plex/PlexLibraryItem.py

@@ -4,11 +4,11 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from rich.markup import escape
 from trakt.utils import timestamp
 
 from plextraktsync.decorators.retry import retry
 from plextraktsync.factory import factory
+from plextraktsync.mixin.RichMarkup import RichMarkup
 from plextraktsync.plex.PlexGuid import PlexGuid
 
 if TYPE_CHECKING:
@@ -18,7 +18,7 @@
     from plextraktsync.plex.types import PlexMedia
 
 
-class PlexLibraryItem:
+class PlexLibraryItem(RichMarkup):
     def __init__(self, item: PlexMedia, plex: PlexApi = None):
         self.item = item
         self.plex = plex
@@ -349,9 +349,9 @@ def title_link(self):
         if self.plex:
             link = self.plex.media_url(self)
 
-            return f"[link={link}][green]{escape(self.title)}[/][/]"
+            return self.markup_link(link, self.title)
 
-        return f"[green]{escape(self.title)}[/]"
+        return self.markup_title(self.title)
 
     def __repr__(self):
         try:

plextraktsync/plex/PlexLibrarySection.py

@@ -4,9 +4,9 @@
 
 from plexapi import X_PLEX_CONTAINER_SIZE
 from plexapi.exceptions import NotFound
-from rich.markup import escape
 
 from plextraktsync.decorators.retry import retry
+from plextraktsync.mixin.RichMarkup import RichMarkup
 from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
 
 if TYPE_CHECKING:
@@ -16,7 +16,7 @@
     from plextraktsync.plex.types import PlexMedia
 
 
-class PlexLibrarySection:
+class PlexLibrarySection(RichMarkup):
     def __init__(self, section: ShowSection | MovieSection, plex: PlexApi = None):
         self.section = section
         self.plex = plex
@@ -44,7 +44,7 @@ def link(self):
 
     @property
     def title_link(self):
-        return f"[link={self.link}][green]{escape(self.title)}[/][/]"
+        return self.markup_link(self.link, self.title)
 
     def find_by_title(self, name: str):
         try:

plextraktsync/plex/PlexPlaylist.py

@@ -3,11 +3,10 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from rich.markup import escape
-
 from plextraktsync.decorators.flatten import flatten_dict
 from plextraktsync.factory import logging
 from plextraktsync.media import Media
+from plextraktsync.mixin.RichMarkup import RichMarkup
 
 if TYPE_CHECKING:
     from plexapi.playlist import Playlist
@@ -16,7 +15,7 @@
     from plextraktsync.plex.types import PlexMedia
 
 
-class PlexPlaylist:
+class PlexPlaylist(RichMarkup):
     def __init__(self, server: PlexServer, name: str):
         self.server = server
         self.name = name
@@ -90,9 +89,9 @@ def title_link(self):
         if self.playlist is not None:
             link = self.playlist._getWebURL()
 
-            return f"[link={link}][green]{escape(self.name)}[/][/]"
+            return self.markup_link(link, self.name)
 
-        return f"[green]{escape(self.name)}[/]"
+        return self.markup_title(self.name)
 
     @staticmethod
     def same_list(list_a: list[PlexMedia], list_b: list[PlexMedia]) -> bool: