Modernize 2025-09-14 (#59)

* modernize with ruff

* Remove deprecated ownerid

* Switch from poetry to uv. Bump a bunch of versions. Remove unused modules.

* Better exception handling

* Tweak gh workflow syntax

Author: danielhoherd

.dockerignore

@@ -14,10 +14,11 @@
 .mypy_cache
 .requirements*
 .tox
+.venv
 .vscode
 Pipfile.lock
 __pycache__
 dev.env
 env
 pip-wheel-metadata
-poetry.lock
+venv

.flake8

@@ -14,14 +14,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org/ | python -
+      # https://docs.astral.sh/uv/guides/integration/github/
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
       - name: Build packages
-        run: poetry build -f wheel
+        run: uv build
 
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: dist/*.whl

.github/workflows/create-release-from-tag.yaml

@@ -1,6 +1,7 @@
 name: pre-commit
 
-on: [push, pull_request]
+on:
+  pull_request:
 
 jobs:
   pre-commit:

.github/workflows/pre-commit-action.yaml

@@ -1,53 +1,23 @@
 ---
 exclude: "(venv|.vscode)" # regex
 repos:
-  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.10.0
-    hooks:
-      - id: python-check-blanket-noqa
-      - id: python-check-blanket-type-ignore
-      - id: text-unicode-replacement-char
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.1.0"
-    hooks:
-      - id: prettier
-        args: ["--print-width=135"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
-    hooks:
-      - id: pyupgrade
-        args: ["--py38-plus"]
-  - repo: https://github.com/pycqa/isort
-    rev: 6.0.1
-    hooks:
-      - id: isort
-        name: isort (python)
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.12.7"
+    rev: "v0.13.0"
     hooks:
       - id: ruff-check
-        args: ["--fix", "--exit-non-zero-on-fix"]
+        args:
+          - "--fix"
+          - "--exit-non-zero-on-fix"
+          - "--unsafe-fixes"
+      - id: ruff-format
   - repo: https://github.com/PyCQA/bandit
     rev: 1.8.6
     hooks:
       - id: bandit
         args: ["-s", "B101"]
-  - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.3.0
-    hooks:
-      - id: pydocstyle
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.3.0
-    hooks:
-      - id: flake8
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
-      - id: check-byte-order-marker
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-docstring-first
@@ -65,7 +35,6 @@ repos:
       - id: mixed-line-ending
         args: ["--fix=lf"]
       - id: pretty-format-json
-      - id: requirements-txt-fixer
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/adrienverge/yamllint.git

.pre-commit-config.yaml

@@ -37,39 +37,24 @@ docker-push: ## Push built Docker container to Docker Hub
 
 .PHONY: clean
 clean: ## Delete build artifacts
-	rm -f .requirements-dev .requirements || true
-	find . -name '*.pyc' -delete
-	find . -name '__pycache__' -delete
-	rm -rf dist
+	-rm -rf .venv
+	-find . -name '*.pyc' -delete
+	-find . -name '__pycache__' -delete
+	-rm -rf dist
 
-.PHONY: poetry-clean
-poetry-clean: ## Delete poetry virtualenv
-	poetry env list 2>/dev/null | awk '{print $$1}' | xargs -n1 poetry env remove || true
-	rm -fv .requirements
-
-.PHONY: wheel
-wheel: ## Build a wheel
-	poetry build -f wheel
+.PHONY: build
+build: ## Build a wheel
+	uv build
 
 .PHONY: test
 test: ## Run tests
-	tox
-
-.PHONY: requirements-dev
-requirements-dev: .requirements-dev ## Install dev requirements
-.requirements-dev:
-	pip3 install --user --upgrade poetry
-	poetry run pip install --quiet --upgrade pip setuptools wheel
-	poetry install
-	touch .requirements-dev .requirements
+	uv run pytest tests
 
-.PHONY: requirements
-requirements: .requirements ## Install requirements
-.requirements:
-	pip3 install --user --upgrade poetry
-	poetry run pip install --quiet --upgrade pip setuptools wheel
-	poetry install --no-dev
-	touch .requirements
+.PHONY: venv
+venv: .venv ## Install dev requirements
+.venv:
+	uv venv --seed
+	uv sync
 
 .PHONY: generate-setup.py
 generate-setup.py: wheel ## Generate the setup.py file from pyproject.toml

Makefile

@@ -1,7 +1,6 @@
 """plexdl CLI."""
 
 import datetime
-import logging
 import sys
 
 import humanize
@@ -15,24 +14,17 @@
 
 from plexdl.plexdl import Client
 
-
-def get_logger(ctx, param, value):
-    """Get logger and return verbosity value."""
-    logging.basicConfig(format="%(message)s")
-    log = logging.getLogger("plexdl")
-    if value > 0:
-        log.setLevel("DEBUG")  # https://docs.python.org/3.9/library/logging.html#logging-levels
-    return value
-
-
-app = typer.Typer(help=__doc__, context_settings={"max_content_width": 9999})
+app = typer.Typer(
+    context_settings={"max_content_width": 9999},
+    help=__doc__,
+    pretty_exceptions_enable=False,
+)
 
 
 @app.command()
 def get_server_info(
     username: str = typer.Argument(None, envvar="PLEXDL_USERNAME"),
     password: str = typer.Argument(None, envvar="PLEXDL_PASSWORD"),
-    debug: bool = typer.Argument(False, envvar="PLEXDL_DEBUG"),
 ):
     """Show info about servers available to your account."""
     p = MyPlexAccount(
@@ -63,7 +55,6 @@ def get_server_info(
             print(f"    httpsRequired: {server.httpsRequired}")
             print(f"    name: {server.name}")
             print(f"    owned: {server.owned}")
-            print(f"    ownerid: {server.ownerid}")
             print(f"    platform: {server.platform}")
             print(f"    platformVersion: {server.platformVersion}")
             print(f"    presence: {server.presence}")
@@ -73,7 +64,7 @@ def get_server_info(
             print(f"    publicAddressMatches: {server.publicAddressMatches}")
             print(f"    sourceTitle: {server.sourceTitle}")
             print(f"    synced: {server.synced}")
-            print("")
+            print()
 
 
 @app.command()
@@ -86,7 +77,6 @@ def search(
     show_ratings: bool = typer.Option(False, "--show-ratings", help="Show ratings for each result"),
     show_metadata: bool = typer.Option(False, "--show-metadata", help="Show file and codec metadata for each file in each result"),
     include_relays: bool = typer.Option(False, "--include-relays", help="Output relay servers along with direct servers"),
-    verbose: bool = typer.Option(False, "--verbose", "-v"),
     debug: bool = typer.Option(False, "--debug"),
 ):
     """Search for media in servers that are available to your account."""

plexdl/cli.py

@@ -2,10 +2,11 @@
 
 import locale
 import logging
-from typing import List
+from typing import ClassVar
 
 import humanfriendly
 import requests
+from plexapi.exceptions import Unauthorized
 from plexapi.myplex import MyPlexAccount
 from plexapi.server import PlexServer
 
@@ -29,7 +30,7 @@ def __init__(self, **kwargs):
         self.username = kwargs["username"]
         self.account = MyPlexAccount(self.username, self.password)
 
-    available_servers: List[PlexServer] = []
+    available_servers: ClassVar[list[PlexServer]] = []
 
     @staticmethod
     def print_item_info(self, item, access_token):
@@ -60,7 +61,7 @@ def print_item_info(self, item, access_token):
                 except ValueError:
                     pass
             if media_info:
-                print(f'({", ".join(media_info)})')
+                print(f"({', '.join(media_info)})")
             print(f'  {self.item_prefix} "{download_filename}" "{download_url}"')
 
     @staticmethod
@@ -110,8 +111,7 @@ def main(self):
                         if self.relay is False:
                             log.debug(f"Skipping {this_server_connection.friendlyName} relay")
                             continue
-                        else:
-                            relay_status = " (relay)"
+                        relay_status = " (relay)"
                     print("\n")
                     print("=" * 79)
                     print(f'Server: "{this_server_connection.friendlyName}"{relay_status}')
@@ -122,7 +122,7 @@ def main(self):
                     for item in this_server_connection.search(self.title):
                         self.print_all_items_for_server(self, item, this_server.accessToken)
 
-                except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout) as e:
+                except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout, Unauthorized) as e:
                     print(f'ERROR: connection to "{this_server.name} {connection.address}" failed.')
                     log.debug(e)
                     continue