plexutil 3.3.1__tar.gz → 3.4.0__tar.gz

{plexutil-3.3.1 → plexutil-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.3.1
+Version: 3.4.0
 Author-email: Carlos Florez <carlos@florez.co.uk>
 Maintainer-email: Carlos Florez <carlos@florez.co.uk>
 License: MIT License

{plexutil-3.3.1 → plexutil-3.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "plexutil"
-version = "3.3.1"
+version = "3.4.0"
 requires-python = ">=3.11"
 authors = [
   {name = "Carlos Florez", email = "carlos@florez.co.uk"}

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/__main__.py

@@ -38,7 +38,7 @@ def main() -> None:
         bootstrap_paths_dto = FileImporter.bootstrap()
         user_request = Prompt.confirm_user_request()
         try:
-            plex_resources = Auth.get_resources(bootstrap_paths_dto)
+            plex_account = Auth.get_account(bootstrap_paths_dto)
         except Unauthorized:
             description = f"{Icons.WARNING} Reauthentication required\n"
             PlexUtilLogger.get_logger().warning(description)
@@ -46,12 +46,46 @@ def main() -> None:
             bootstrap_paths_dto.private_key_dir.unlink(missing_ok=True)
             bootstrap_paths_dto.public_key_dir.unlink(missing_ok=True)
             bootstrap_paths_dto.token_dir.unlink(missing_ok=True)
-            plex_resources = Auth.get_resources(bootstrap_paths_dto)
+            plex_account = Auth.get_account(bootstrap_paths_dto)
 
-        plex_server = Prompt.confirm_server(plex_resources=plex_resources)
+        plex_server = Prompt.confirm_server(plex_account=plex_account)
+
+        release = plex_server.checkForUpdate()
+        current_version = plex_server.version
+
+        if release and user_request is not UserRequest.CHANGELOG:
+            release_version = release.version
+            description = (
+                f"{Icons.WARNING} A Server update is available: "
+                f"{release_version} (Current: {current_version})\n"
+                f"plexutil changelog (to display changes)"
+            )
+            PlexUtilLogger.get_logger().warning(description)
 
         if user_request is UserRequest.SETTINGS:
             PlexOps.set_server_settings(plex_server=plex_server)
+        elif user_request is UserRequest.CHANGELOG:
+            if release:
+                release_version = release.version
+                added = release.added
+                fixed = release.fixed
+
+                description = (
+                    f"{Icons.BANNER_LEFT}{release_version}{Icons.BANNER_RIGHT}\n"
+                    f"{Icons.BANNER_LEFT}\nADDED\n{Icons.BANNER_LEFT}\n"
+                    f"{added}\n"
+                    f"{Icons.BANNER_LEFT}\nFIXED\n{Icons.BANNER_LEFT}\n"
+                    f"{fixed}"
+                )
+
+            else:
+                description = (
+                    f"{Icons.SUCCESS} Server is up-to-date ({current_version})"
+                )
+
+            PlexUtilLogger.get_logger().info(description)
+            sys.exit(0)
+
         else:
             library = LibraryFactory.get(
                 user_request=user_request,

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/core/auth.py

@@ -1,7 +1,7 @@
 import uuid
 from importlib.metadata import PackageNotFoundError, version
 
-from plexapi.myplex import MyPlexAccount, MyPlexJWTLogin, MyPlexResource
+from plexapi.myplex import MyPlexAccount, MyPlexJWTLogin
 
 from plexutil.dto.bootstrap_paths_dto import BootstrapPathsDTO
 from plexutil.exception.auth_error import AuthError
@@ -13,9 +13,9 @@ from plexutil.util.icons import Icons
 
 class Auth(Static):
     @staticmethod
-    def get_resources(
+    def get_account(
         bootstrap_paths_dto: BootstrapPathsDTO,
-    ) -> list[MyPlexResource]:
+    ) -> MyPlexAccount:
         """
         Login to Plex and returns a list of all the available Plex Resources
         (Servers and Clients)
@@ -82,8 +82,4 @@ class Auth(Static):
         description = "Auth exists"
         PlexUtilLogger.get_logger().debug(description)
         token, _ = FileImporter.get_jwt(bootstrap_paths_dto.token_dir)
-        account = MyPlexAccount(token=token)
-        resources = account.resources()
-        description = f"Available Resources: {resources}"
-        PlexUtilLogger.get_logger().debug(description)
-        return resources
+        return MyPlexAccount(token=token)

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/core/library.py

@@ -146,6 +146,7 @@ class Library(ABC):
                     for x in self.plex_server.activities
                 )
                 if not is_updating:
+                    spinner.text = ""
                     spinner.ok(f"{Icons.SUCCESS} Updated")
 
         elapsed = time.time() - start

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/core/prompt.py

@@ -23,7 +23,7 @@ if TYPE_CHECKING:
         MusicSection,
         ShowSection,
     )
-    from plexapi.myplex import MyPlexResource
+    from plexapi.myplex import MyPlexAccount
     from plexapi.server import PlexServer
     from plexapi.video import Movie, Show
 
@@ -388,7 +388,7 @@ class Prompt(Static):
         ).value
 
     @staticmethod
-    def confirm_server(plex_resources: list[MyPlexResource]) -> PlexServer:
+    def confirm_server(plex_account: MyPlexAccount) -> PlexServer:
         """
         Prompts user for a Plex Media Server selection
 
@@ -403,10 +403,17 @@ class Prompt(Static):
         """
         is_default = True
         dropdown = []
+        plex_resources = plex_account.resources()
+        description = f"Available Resources: {plex_resources}"
+        PlexUtilLogger.get_logger().debug(description)
+
+        pass_icon = f"{Icons.PASS} " if plex_account.subscriptionActive else ""
+
         for resource in plex_resources:
+            display_name = f"{pass_icon}{resource.name} ({resource.device})"
             if resource.product == "Plex Media Server":
                 item = DropdownItemDTO(
-                    display_name=f"{resource.name} ({resource.device})",
+                    display_name=display_name,
                     value=resource,
                     is_default=is_default,
                 )
@@ -423,6 +430,7 @@ class Prompt(Static):
             try:
                 plex_server = plex_resource.connect()
             except NotFound as e:
+                spinner.text = ""
                 spinner.fail(f"{Icons.FAILURE} Connection Failure")
                 description = (
                     f"Failed to connect to: {plex_resource.name} "
@@ -431,6 +439,7 @@ class Prompt(Static):
                 )
                 raise ServerConnectionError(description) from e
             except Exception as e:
+                spinner.text = ""
                 spinner.fail(f"{Icons.FAILURE} Connection Failure")
                 description = (
                     f"Failed to connect to: {plex_resource.name} "
@@ -439,6 +448,7 @@ class Prompt(Static):
                 )
                 raise ServerConnectionError(description) from e
 
+            spinner.text = ""
             spinner.ok(f"{Icons.SUCCESS} Connected")
 
         description = f"Connected to: {plex_server}"
@@ -560,11 +570,11 @@ class Prompt(Static):
 
             space = " " * offset
             if dropdown_count < max_single_space:
-                number_format = f"[  {dropdown_count}] "
+                number_format = f"[  {dropdown_count}]"
             elif dropdown_count < max_double_space:
-                number_format = f"[ {dropdown_count}] "
+                number_format = f"[ {dropdown_count}]"
             else:
-                number_format = f"[{dropdown_count}] "
+                number_format = f"[{dropdown_count}]"
 
             if item.is_default and expect_input:
                 display_name = f"{item.display_name} {Icons.STAR}"

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/enums/user_request.py

@@ -12,6 +12,7 @@ class UserRequest(Enum):
     UPLOAD = "upload"
     DISPLAY = "display"
     UPDATE = "update"
+    CHANGELOG = "changelog"
 
     @staticmethod
     # Forward Reference used here in type hint

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil/util/icons.py

@@ -27,3 +27,6 @@ class Icons(Static):
         "🟢" if sys.stdout.encoding.lower().startswith("utf") else "SUCCESS"
     )
     FAILURE = "🔴" if sys.stdout.encoding.lower().startswith("utf") else "FAIL"
+    PASS = (
+        "🎟" if sys.stdout.encoding.lower().startswith("utf") else "*PlexPass*"
+    )

{plexutil-3.3.1 → plexutil-3.4.0}/src/plexutil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexutil
-Version: 3.3.1
+Version: 3.4.0
 Author-email: Carlos Florez <carlos@florez.co.uk>
 Maintainer-email: Carlos Florez <carlos@florez.co.uk>
 License: MIT License