plexutil 3.2.0__tar.gz → 3.2.2__tar.gz

{plexutil-3.2.0 → plexutil-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.2.0
+Version: 3.2.2
 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.2.0 → plexutil-3.2.2}/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.2.0 → plexutil-3.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "plexutil"
-version = "3.2.0"
+version = "3.2.2"
 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.2.0 → plexutil-3.2.2}/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.2.0 → plexutil-3.2.2}/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.2.0 → plexutil-3.2.2}/src/plexutil/core/library.py

@@ -5,6 +5,8 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from yaspin import yaspin
+
 from plexutil.core.prompt import Prompt
 from plexutil.enums.agent import Agent
 from plexutil.enums.language import Language
@@ -116,11 +118,37 @@ class Library(ABC):
 
     @abstractmethod
     def update(self) -> None:
+        start = time.time()
         section = self.get_section()
         section.update()
         section.refresh()
         [media.refresh() for media in self.query()]
 
+        is_updating = any(
+            "updating" in x.title.lower() or "scanning" in x.title.lower()
+            for x in self.plex_server.activities
+        )
+        while is_updating:
+            with yaspin(text="Updating", color="yellow") as spinner:
+                elapsed = time.time() - start
+                spinner.write(
+                    f"# of items: {len(self.query())!s} [{elapsed:.2f}s]"
+                )
+                is_updating = any(
+                    "updating" in x.title.lower()
+                    or "scanning" in x.title.lower()
+                    for x in self.plex_server.activities
+                )
+                if not is_updating:
+                    spinner.ok(f"{Icons.SUCCESS} Updated")
+
+        elapsed = time.time() - start
+        description = (
+            f"\nFinished update in {elapsed:.2f}s\n"
+            f"# of items: {len(self.query())!s}"
+        )
+        PlexUtilLogger.get_console_logger().info(description)
+
     @abstractmethod
     def modify(self, is_modify_media: bool = False) -> None:
 

{plexutil-3.2.0 → plexutil-3.2.2}/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,

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

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

{plexutil-3.2.0 → plexutil-3.2.2}/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.2.0 → plexutil-3.2.2}/src/plexutil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.2.0
+Version: 3.2.2
 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.2.0 → plexutil-3.2.2}/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.2.0 → plexutil-3.2.2}/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