plexutil 3.1.4__tar.gz → 3.2.1__tar.gz

{plexutil-3.1.4 → plexutil-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.1.4
+Version: 3.2.1
 Author-email: Carlos Florez <carlos@florez.co.uk>
 Maintainer-email: Carlos Florez <carlos@florez.co.uk>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: peewee==3.18.3
 Requires-Dist: colorlog==6.10.1
 Requires-Dist: pyjwt[crypto]==2.10.1
 Requires-Dist: ttkthemes==3.3.0
+Requires-Dist: yaspin==3.4.0
 Dynamic: license-file
 
 # Plexutil
@@ -110,15 +111,10 @@ plexutil upload
 > [!WARNING]
 > This feature requires a graphical session (X11 or Wayland) <br>
 
-To add songs to an existing music playlist
+To add songs to an existing music playlist or to remove songs from an existing music playlist
 ```bash
-plexutil add_to_playlist
+plexutil modify
 ```
-To remove songs from an existing music playlist
-```bash
-plexutil remove_from_playlist
-```
-
 
 ## Development
 > [!NOTE]

{plexutil-3.1.4 → plexutil-3.2.1}/README.md

@@ -64,15 +64,10 @@ plexutil upload
 > [!WARNING]
 > This feature requires a graphical session (X11 or Wayland) <br>
 
-To add songs to an existing music playlist
+To add songs to an existing music playlist or to remove songs from an existing music playlist
 ```bash
-plexutil add_to_playlist
+plexutil modify
 ```
-To remove songs from an existing music playlist
-```bash
-plexutil remove_from_playlist
-```
-
 
 ## Development
 > [!NOTE]

{plexutil-3.1.4 → plexutil-3.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "plexutil"
-version = "3.1.4"
+version = "3.2.1"
 requires-python = ">=3.11"
 authors = [
   {name = "Carlos Florez", email = "carlos@florez.co.uk"}
@@ -31,6 +31,7 @@ dependencies = [
   "colorlog==6.10.1",
   "pyjwt[crypto]==2.10.1",
   "ttkthemes==3.3.0",
+  "yaspin==3.4.0",
 ]
 
 [project.scripts]

{plexutil-3.1.4 → plexutil-3.2.1}/requirements.txt

@@ -8,3 +8,4 @@ peewee==3.18.3
 colorlog==6.10.1
 pyjwt[crypto]==2.10.1
 ttkthemes==3.3.0
+yaspin==3.4.0

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/__main__.py

@@ -18,6 +18,7 @@ from plexutil.exception.library_poll_timeout_error import (
 from plexutil.exception.library_section_missing_error import (
     LibrarySectionMissingError,
 )
+from plexutil.exception.server_connection_error import ServerConnectionError
 from plexutil.exception.unexpected_argument_error import (
     UnexpectedArgumentError,
 )
@@ -46,9 +47,7 @@ def main() -> None:
             bootstrap_paths_dto.token_dir.unlink(missing_ok=True)
             plex_resources = Auth.get_resources(bootstrap_paths_dto)
 
-        plex_server = Prompt.confirm_server(
-            plex_resources=plex_resources
-        ).connect()
+        plex_server = Prompt.confirm_server(plex_resources=plex_resources)
 
         if user_request is UserRequest.SETTINGS:
             PlexOps.set_server_settings(plex_server=plex_server)
@@ -80,6 +79,14 @@ def main() -> None:
         PlexUtilLogger.get_logger().error(description)
         sys.exit(1)
 
+    except ServerConnectionError as e:
+        sys.tracebacklimit = 0
+        description = (
+            f"\n{Icons.BANNER_LEFT}Connection Error{Icons.BANNER_RIGHT}\n{e!s}"
+        )
+        PlexUtilLogger.get_logger().error(description)
+        sys.exit(1)
+
     except LibraryIllegalStateError as e:
         sys.tracebacklimit = 0
         description = (

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/library.py

@@ -87,12 +87,6 @@ class Library(ABC):
                 self.display(expect_input=True)
                 self.modify()
                 self.update()
-            case UserRequest.ADD_TO_PLAYLIST:
-                self.display(expect_input=True)
-                self.add_item()
-            case UserRequest.REMOVE_FROM_PLAYLIST:
-                self.display(expect_input=True)
-                self.remove_item()
 
     @abstractmethod
     def download(self) -> None:
@@ -110,27 +104,61 @@ class Library(ABC):
     def remove_item(self) -> None:
         raise NotImplementedError
 
+    @abstractmethod
+    def query(self) -> list[Track] | list[Show] | list[Movie] | list[Playlist]:
+        raise NotImplementedError
+
+    @abstractmethod
+    def display_media(
+        self, expect_input: bool = False
+    ) -> Movie | Show | Track:
+        raise NotImplementedError
+
     @abstractmethod
     def update(self) -> None:
         section = self.get_section()
         section.update()
         section.refresh()
+        [media.refresh() for media in self.query()]
 
     @abstractmethod
-    def modify(self) -> None:
-        settings = LibrarySetting.get_all(self.library_type)
+    def modify(self, is_modify_media: bool = False) -> None:
 
-        self.assign_language(default=self.language, is_from_server=True)
-        self.get_section().edit(
-            agent=self.agent.get_value(),
-            scanner=self.scanner.get_value(),
-            language=self.language.get_value(),
-        )
+        if is_modify_media:
+            selected_media = self.display_media(expect_input=True)
 
-        PlexOps.set_library_settings(
-            section=self.get_section(),
-            settings=[x.to_dto(is_from_server=True) for x in settings],
-        )
+            language = self.language
+            language_override = selected_media.languageOverride
+            if language_override:
+                language = Language.get_from_str(language_override)
+
+            selected_language = Prompt.confirm_language(
+                default=language,
+                is_from_server=True,
+            )
+
+            if selected_language is self.language:
+                # Sets to Libary Default if selected language matches Library
+                selected_media.editAdvanced(languageOverride="")  # pyright: ignore [reportOptionalCall]
+            else:
+                selected_media.editAdvanced(
+                    languageOverride=selected_language.get_value()  # pyright: ignore [reportOptionalCall]
+                )
+
+        else:
+            settings = LibrarySetting.get_all(self.library_type)
+
+            self.assign_language(default=self.language, is_from_server=True)
+            self.get_section().edit(
+                agent=self.agent.get_value(),
+                scanner=self.scanner.get_value(),
+                language=self.language.get_value(),
+            )
+
+            PlexOps.set_library_settings(
+                section=self.get_section(),
+                settings=[x.to_dto(is_from_server=True) for x in settings],
+            )
 
     @abstractmethod
     def create(self) -> None:
@@ -436,10 +464,6 @@ class Library(ABC):
 
         PlexUtilLogger.get_logger().debug(debug)
 
-    @abstractmethod
-    def query(self) -> list[Track] | list[Show] | list[Movie] | list[Playlist]:
-        raise NotImplementedError
-
     def log_library(
         self,
         operation: str,

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/movie_library.py

@@ -3,6 +3,9 @@ from __future__ import annotations
 from dataclasses import field
 from typing import TYPE_CHECKING, cast
 
+from plexutil.core.prompt import Prompt
+from plexutil.dto.dropdown_item_dto import DropdownItemDTO
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -65,12 +68,30 @@ class MovieLibrary(Library):
     def update(self) -> None:
         super().update()
 
-    def modify(self) -> None:
-        super().modify()
+    def modify(self, is_modify_media: bool = False) -> None:
+        is_modify_media = Prompt.confirm_media_modification()
+        super().modify(is_modify_media=is_modify_media)
 
     def display(self, expect_input: bool = False) -> None:
         super().display(expect_input=expect_input)
 
+    def display_media(self, expect_input: bool = False) -> Movie:
+        title = "Choose Movie to modify"
+        description = ""
+        dropdown = [
+            DropdownItemDTO(
+                display_name=movie.title, value=movie, is_default=False
+            )
+            for movie in self.query()
+        ]
+
+        return Prompt.draw_dropdown(
+            title=title,
+            description=description,
+            dropdown=dropdown,
+            expect_input=expect_input,
+        ).value
+
     def create(self) -> None:
         super().create()
 

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/music_library.py

@@ -68,11 +68,14 @@ class MusicLibrary(Library):
     def remove_item(self) -> None:
         raise NotImplementedError
 
+    def display_media(self, expect_input: bool = False) -> Track:
+        raise NotImplementedError
+
     def update(self) -> None:
         super().update()
 
-    def modify(self) -> None:
-        super().modify()
+    def modify(self, is_modify_media: bool = False) -> None:
+        super().modify(is_modify_media=is_modify_media)
 
     def display(self, expect_input: bool = False) -> None:
         super().display(expect_input=expect_input)

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/music_playlist.py

@@ -51,8 +51,7 @@ class MusicPlaylist(Library):
                 UserRequest.DISPLAY,
                 UserRequest.UPLOAD,
                 UserRequest.DOWNLOAD,
-                UserRequest.ADD_TO_PLAYLIST,
-                UserRequest.REMOVE_FROM_PLAYLIST,
+                UserRequest.MODIFY,
             ],
             plex_server=plex_server,
             name=name,
@@ -121,11 +120,39 @@ class MusicPlaylist(Library):
         raise NotImplementedError
 
     def update(self) -> None:
-        raise NotImplementedError
+        # None of MusicPlaylist operations benefit from a refresh/reload
+        return
 
-    def modify(self) -> None:
+    def display_media(self, expect_input: bool = False) -> Track:
         raise NotImplementedError
 
+    def modify(self, is_modify_media: bool = False) -> None:  # noqa: ARG002
+
+        action_add_display_name = "Add Songs To Playlist"
+        action_delete_display_name = "Delete Songs From Playlist"
+
+        actions = [
+            DropdownItemDTO(
+                display_name=action_add_display_name,
+                value=False,
+                is_default=True,
+            ),
+            DropdownItemDTO(
+                display_name=action_delete_display_name,
+                value=False,
+                is_default=False,
+            ),
+        ]
+        title = "Playlist Modification"
+        description = "Select from the supported modifications"
+        selected_action = Prompt.draw_dropdown(
+            title=title, description=description, dropdown=actions
+        )
+        if selected_action.display_name == action_add_display_name:
+            self.add_item()
+        elif selected_action.display_name == action_delete_display_name:
+            self.remove_item()
+
     def display(self, expect_input: bool = False) -> None:  # noqa: ARG002
         super().display(expect_input=True)
         if (
@@ -150,8 +177,8 @@ class MusicPlaylist(Library):
         self.playlist_name = selected_playlist.title
 
         if (
-            self.user_request is UserRequest.ADD_TO_PLAYLIST
-            or self.user_request is UserRequest.REMOVE_FROM_PLAYLIST
+            self.user_request is UserRequest.MODIFY
+            or self.user_request is UserRequest.DELETE
         ):
             return
 

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/prompt.py

@@ -8,7 +8,11 @@ from argparse import RawTextHelpFormatter
 from importlib.metadata import PackageNotFoundError, version
 from typing import TYPE_CHECKING, cast
 
+from plexapi.exceptions import NotFound
+from yaspin import yaspin
+
 from plexutil.exception.device_error import DeviceError
+from plexutil.exception.server_connection_error import ServerConnectionError
 from plexutil.graphical.selection_window import SelectionWindow
 
 if TYPE_CHECKING:
@@ -20,6 +24,7 @@ if TYPE_CHECKING:
         ShowSection,
     )
     from plexapi.myplex import MyPlexResource
+    from plexapi.server import PlexServer
     from plexapi.video import Movie, Show
 
     from plexutil.core.library import Library
@@ -383,7 +388,7 @@ class Prompt(Static):
         ).value
 
     @staticmethod
-    def confirm_server(plex_resources: list[MyPlexResource]) -> MyPlexResource:
+    def confirm_server(plex_resources: list[MyPlexResource]) -> PlexServer:
         """
         Prompts user for a Plex Media Server selection
 
@@ -392,7 +397,9 @@ class Prompt(Static):
             anything other than a Plex Media Server is filtered
 
         Returns:
-            MyPlexResource: The chosen Plex Media Server
+            PlexServer: The chosen Plex Media Server
+        Raises:
+            ServerConnectionError: If unable to connect
         """
         is_default = True
         dropdown = []
@@ -406,12 +413,38 @@ class Prompt(Static):
                 is_default = False
                 dropdown.append(item)
 
-        return Prompt.draw_dropdown(
+        plex_resource = Prompt.draw_dropdown(
             title="Available Servers",
             description="Choose a server to connect to",
             dropdown=dropdown,
         ).value
 
+        with yaspin(text="Connecting", color="yellow") as spinner:
+            try:
+                plex_server = plex_resource.connect()
+            except NotFound as e:
+                spinner.fail(f"{Icons.FAILURE} Connection Failure")
+                description = (
+                    f"Failed to connect to: {plex_resource.name} "
+                    f"({plex_resource.device})\n"
+                    f"Reason: [Unavailable/Not Found]"
+                )
+                raise ServerConnectionError(description) from e
+            except Exception as e:
+                spinner.fail(f"{Icons.FAILURE} Connection Failure")
+                description = (
+                    f"Failed to connect to: {plex_resource.name} "
+                    f"({plex_resource.device})\n"
+                    f"Reason: [Unknown]"
+                )
+                raise ServerConnectionError(description) from e
+
+            spinner.ok(f"{Icons.SUCCESS} Connected")
+
+        description = f"Connected to: {plex_server}"
+        PlexUtilLogger.get_logger().debug(description)
+        return plex_server
+
     @staticmethod
     def confirm_plex_media(
         title: str,
@@ -439,6 +472,31 @@ class Prompt(Static):
             dropdown=dropdown,
         ).value
 
+    @staticmethod
+    def confirm_media_modification() -> bool:
+        """
+        Prompts user whether to modify the library or the associated media
+
+        Returns:
+            bool: Is media modification requested?
+
+        """
+
+        title = "Modify Media?"
+        description = (
+            "yes -> Modify a specific media item in this library\n"
+            "no -> Modify this library instead\n"
+        )
+        question = "Modify a specific media item in this library"
+
+        return Prompt.__get_toggle_response(
+            title=title,
+            description=description,
+            question=question,
+            is_from_server=False,
+            default_selection=False,
+        )
+
     @staticmethod
     def draw_dropdown(
         title: str,

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/core/tv_library.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from dataclasses import field
 from typing import TYPE_CHECKING, cast
 
+from plexutil.dto.dropdown_item_dto import DropdownItemDTO
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -67,12 +69,30 @@ class TVLibrary(Library):
     def update(self) -> None:
         super().update()
 
-    def modify(self) -> None:
-        super().modify()
+    def modify(self, is_modify_media: bool = False) -> None:
+        is_modify_media = Prompt.confirm_media_modification()
+        super().modify(is_modify_media=is_modify_media)
 
     def display(self, expect_input: bool = False) -> None:
         super().display(expect_input=expect_input)
 
+    def display_media(self, expect_input: bool = False) -> Show:
+        title = "Choose Series to modify"
+        description = ""
+        dropdown = [
+            DropdownItemDTO(
+                display_name=series.title, value=series, is_default=False
+            )
+            for series in self.query()
+        ]
+
+        return Prompt.draw_dropdown(
+            title=title,
+            description=description,
+            dropdown=dropdown,
+            expect_input=expect_input,
+        ).value
+
     def create(self) -> None:
         super().create()
 

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/enums/library_setting.py

@@ -130,8 +130,7 @@ class LibrarySetting(Enum):
         False,
         False,
         [],
-        # False,
-        0,
+        1,
     )
 
     ARTIST_BIOS = (
@@ -143,8 +142,7 @@ class LibrarySetting(Enum):
         False,
         False,
         [],
-        # False,
-        0,
+        1,
     )
 
     ALBUM_REVIEWS = (
@@ -159,7 +157,6 @@ class LibrarySetting(Enum):
         False,
         False,
         [],
-        # False,
         0,
     )
 
@@ -188,7 +185,7 @@ class LibrarySetting(Enum):
         False,
         False,
         [],
-        0,
+        1,
     )
 
     CONCERTS = (
@@ -200,7 +197,7 @@ class LibrarySetting(Enum):
         False,
         False,
         [],
-        0,
+        1,
     )
 
     GENRES = (

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/enums/user_request.py

@@ -12,8 +12,6 @@ class UserRequest(Enum):
     UPLOAD = "upload"
     DISPLAY = "display"
     UPDATE = "update"
-    ADD_TO_PLAYLIST = "add_to_playlist"
-    REMOVE_FROM_PLAYLIST = "remove_from_playlist"
 
     @staticmethod
     # Forward Reference used here in type hint

plexutil-3.2.1/src/plexutil/exception/server_connection_error.py

@@ -0,0 +1,2 @@
+class ServerConnectionError(Exception):
+    pass

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil/util/icons.py

@@ -23,3 +23,7 @@ class Icons(Static):
         "► " if sys.stdout.encoding.lower().startswith("utf") else "> "
     )
     STAR = "●" if sys.stdout.encoding.lower().startswith("utf") else "*"
+    SUCCESS = (
+        "🟢" if sys.stdout.encoding.lower().startswith("utf") else "SUCCESS"
+    )
+    FAILURE = "🔴" if sys.stdout.encoding.lower().startswith("utf") else "FAIL"

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.1.4
+Version: 3.2.1
 Author-email: Carlos Florez <carlos@florez.co.uk>
 Maintainer-email: Carlos Florez <carlos@florez.co.uk>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: peewee==3.18.3
 Requires-Dist: colorlog==6.10.1
 Requires-Dist: pyjwt[crypto]==2.10.1
 Requires-Dist: ttkthemes==3.3.0
+Requires-Dist: yaspin==3.4.0
 Dynamic: license-file
 
 # Plexutil
@@ -110,15 +111,10 @@ plexutil upload
 > [!WARNING]
 > This feature requires a graphical session (X11 or Wayland) <br>
 
-To add songs to an existing music playlist
+To add songs to an existing music playlist or to remove songs from an existing music playlist
 ```bash
-plexutil add_to_playlist
+plexutil modify
 ```
-To remove songs from an existing music playlist
-```bash
-plexutil remove_from_playlist
-```
-
 
 ## Development
 > [!NOTE]

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ src/plexutil/exception/library_poll_timeout_error.py
 src/plexutil/exception/library_section_missing_error.py
 src/plexutil/exception/library_unsupported_error.py
 src/plexutil/exception/plex_media_missing_error.py
+src/plexutil/exception/server_connection_error.py
 src/plexutil/exception/unexpected_argument_error.py
 src/plexutil/exception/unexpected_naming_pattern_error.py
 src/plexutil/exception/user_error.py

{plexutil-3.1.4 → plexutil-3.2.1}/src/plexutil.egg-info/requires.txt

@@ -7,6 +7,7 @@ peewee==3.18.3
 colorlog==6.10.1
 pyjwt[crypto]==2.10.1
 ttkthemes==3.3.0
+yaspin==3.4.0
 
 [:sys_platform == "win32"]
 pywin32==311