From 2366d455c7d1ae16c84e0bcbffb94ed762c16832 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Fri, 13 Nov 2026 22:12:02 +0100 Subject: refactor(core): split task workflows into focused helpers Decompose receiver verification, source scanning, and Webmention delivery into explicit claim, check, reconciliation, and outcome-recording stages. Extract Huey backend parsing helpers and add focused tests for the new task boundaries while preserving existing processing semantics. --- webmentions_ssg/tasks/extension.py | 124 ++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'webmentions_ssg/tasks/extension.py') diff --git a/webmentions_ssg/tasks/extension.py b/webmentions_ssg/tasks/extension.py index 94875ff..b77a140 100644 --- a/webmentions_ssg/tasks/extension.py +++ b/webmentions_ssg/tasks/extension.py @@ -9,7 +9,7 @@ from __future__ import annotations from collections.abc import Callable from functools import update_wrapper, wraps from typing import Any -from urllib.parse import urlsplit, urlunsplit +from urllib.parse import SplitResult, urlsplit, urlunsplit from flask import Flask from huey import Huey as BaseHuey @@ -18,6 +18,63 @@ from huey.api import TaskWrapper from .json_serializer import JSONSerializer +def _redis_backend(parsed: SplitResult) -> tuple[type[BaseHuey], dict[str, Any]]: + """Select a Redis Huey flavour while retaining the underlying URL scheme.""" + from huey import ( + PriorityRedisExpireHuey, + PriorityRedisHuey, + RedisExpireHuey, + RedisHuey, + ) + + scheme = parsed.scheme.lower() + base_scheme, separator, flavour = scheme.partition("+") + backends = { + "": RedisHuey, + "priority": PriorityRedisHuey, + "expire": RedisExpireHuey, + "priority+expire": PriorityRedisExpireHuey, + } + if flavour not in backends or (separator and not flavour): + raise RuntimeError(f"Unsupported HUEY_URL scheme: {scheme!r}") + + fixed_url = urlunsplit(parsed._replace(scheme=base_scheme)) + return backends[flavour], {"url": fixed_url} + + +def _path_backend(url: str, scheme: str) -> tuple[type[BaseHuey], dict[str, Any]]: + """Extract a relative or absolute SQLite/file storage path.""" + from huey import FileHuey, SqliteHuey + + if scheme == "sqlite": + backend, option, description, example = ( + SqliteHuey, + "filename", + "SQLite Huey", + "sqlite:///huey.db (relative) or sqlite:////var/huey.db (absolute)", + ) + missing = "SQLite Huey URL must include a database path." + else: + backend, option, description, example = ( + FileHuey, + "path", + "File Huey", + "file:///huey-queue (relative) or file:////var/huey-queue (absolute)", + ) + missing = "File Huey URL must include a directory path." + + prefix = f"{scheme}:///" + if not url.startswith(prefix): + raise RuntimeError(f"{description} URLs must look like {example}") + + # Four slashes retain the initial '/' of an absolute path; three do not. + path = url.removeprefix(prefix) + if not path: + raise RuntimeError(missing) + + return backend, {option: path} + + class _LazyTask: """Stable public task handle which follows the extension's current backend. @@ -211,75 +268,18 @@ class Huey: parsed = urlsplit(url) scheme = parsed.scheme.lower() - base_scheme, separator, flavour = scheme.partition("+") - if base_scheme in {"redis", "rediss"}: - from huey import ( - PriorityRedisExpireHuey, - PriorityRedisHuey, - RedisExpireHuey, - RedisHuey, - ) - - backends = { - "": RedisHuey, - "priority": PriorityRedisHuey, - "expire": RedisExpireHuey, - "priority+expire": PriorityRedisExpireHuey, - } - if flavour not in backends or (separator and not flavour): - raise RuntimeError(f"Unsupported HUEY_URL scheme: {scheme!r}") - - fixed_url = urlunsplit(parsed._replace(scheme=base_scheme)) - return backends[flavour], {"url": fixed_url} - - if scheme == "sqlite": - from huey import SqliteHuey - - prefix = "sqlite:///" - - if not url.startswith(prefix): - raise RuntimeError( - "SQLite Huey URLs must look like sqlite:///huey.db (relative) " - "or sqlite:////var/huey.db (absolute)" - ) - - # Preserve a leading slash only when the URL has four slashes. - filename = url.removeprefix(prefix) - - if not filename: - raise RuntimeError("SQLite Huey URL must include a database path.") - - return SqliteHuey, {"filename": filename} - - if scheme == "file": - from huey import FileHuey - - prefix = "file:///" - - if not url.startswith(prefix): - raise RuntimeError( - "File Huey URLs must look like file:///huey-queue (relative) " - "or file:////var/huey-queue (absolute)" - ) - - # file:////path is absolute; file:///path is relative here. - path = url.removeprefix(prefix) - - if not path: - raise RuntimeError("File Huey URL must include a directory path.") - - return FileHuey, {"path": path} - + if scheme.partition("+")[0] in {"redis", "rediss"}: + return _redis_backend(parsed) + if scheme in {"sqlite", "file"}: + return _path_backend(url, scheme) if scheme in {"postgres", "postgresql"}: from huey import PostgresHuey return PostgresHuey, {"dsn": url} - if scheme == "memory": from huey import MemoryHuey return MemoryHuey, {} - if scheme == "blackhole": from huey import BlackHoleHuey -- cgit v1.3.1