CI and images / lint (push) Successful in 3s
CI and images / extension-version (push) Successful in 3s
CI and images / frontend-build (push) Successful in 25s
CI and images / backend-lint-and-test (push) Successful in 32s
CI and images / integration (push) Successful in 2m27s
CI and images / sign-extension (push) Successful in 3s
CI and images / build-agent (push) Successful in 5s
CI and images / build-web (push) Successful in 1m48s
CI and images / smoke-web (push) Successful in 54s
CI and images / promote (push) Successful in 1s
Discord was the last focus platform still on gallery-dl. This adds the native path, mirrored from gallery-dl 1.32.13's discord extractor: - discord_client: API v10 with the user token and gallery-dl's request profile (dated Firefox UA, Referer). Walks a server, category, forum, channel or thread in gallery-dl's order and pages each channel newest-first. Files are attachments, then embeds, then forwards, numbered across the message. The resume cursor is <channel>:<before>. Text-only messages are not posts, since gallery-dl never made them. - discord_downloader: gallery-dl's on-disk layout, cleaned the way it cleans names on Linux (only `/` and control characters change), so existing files are skipped_disk rather than fetched again. Sidecars carry identity only. The message record keeps gallery-dl's keys, so parse_sidecar, derive_post_url and the drop grouping read it unchanged. - The ledger keys on the attachment id (or a hash of an embed's URL path), not the file's position, which an edit can renumber. Migration 0111. - DiscordIngester: token auth, body canary off (files-only drops are normal). Registered as native, verified by token, and serialised per-platform, since every source shares one user token. - ingest_core: optional `skip_feed` client seam (#4413). A tick's early-out on a multi-channel source now ends the quiet channel, not the whole walk. Clients without the seam behave as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LVjrnpQjRgHdvq95rASoiR
63 lines
2.4 KiB
Python
63 lines
2.4 KiB
Python
"""Per-platform download concurrency cap.
|
|
|
|
Some platforms (Patreon) are API-rate-sensitive enough that two *simultaneous*
|
|
walks can trip the server's rate limit even with each source pacing its own
|
|
requests. The platform-cooldown handles the AFTERMATH of a 429; this is the
|
|
preventive half — it serializes downloads PER PLATFORM to one at a time.
|
|
|
|
Different platforms still run concurrently up to the worker's concurrency; only
|
|
a second walk on the SAME serialized platform waits. The lock lives in Redis
|
|
(the Celery broker) with a TTL, so a SIGKILL'd worker can't wedge a platform —
|
|
the lock auto-expires shortly after the download hard time limit.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
import redis
|
|
|
|
from ..config import get_config
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
# Platforms walked one-at-a-time. gallery-dl platforms are intentionally NOT
|
|
# here: each runs as a self-pacing subprocess and they're lower-volume. The
|
|
# native-ingester platforms are serialized (one paced scrape/API walk at a time).
|
|
# Add a platform here to cap it to a single concurrent walk. Discord most of
|
|
# all: every source walks on the operator's ONE user token, and parallel walks
|
|
# on a user account are both how its rate limit trips and what gets it flagged.
|
|
SERIALIZED_PLATFORMS = frozenset({"patreon", "subscribestar", "discord"})
|
|
|
|
_LOCK_PREFIX = "fc:download_lock:"
|
|
|
|
_client: redis.Redis | None = None
|
|
|
|
|
|
def _redis() -> redis.Redis:
|
|
# One client per worker process (Celery prefork forks before tasks run, so
|
|
# each process lazily builds its own). redis-py pools connections.
|
|
global _client
|
|
if _client is None:
|
|
_client = redis.from_url(get_config().celery_broker_url)
|
|
return _client
|
|
|
|
|
|
def platform_lock(platform: str, *, ttl_seconds: int):
|
|
"""A non-blocking Redis lock for `platform`, or None when the platform is
|
|
not serialized. Caller does `.acquire(blocking=False)` / `.release()`.
|
|
|
|
Returns None (rather than raising) on any Redis error so a broker hiccup
|
|
degrades to the prior behaviour (uncapped) instead of stalling downloads.
|
|
"""
|
|
if platform not in SERIALIZED_PLATFORMS:
|
|
return None
|
|
try:
|
|
return _redis().lock(
|
|
f"{_LOCK_PREFIX}{platform}",
|
|
timeout=ttl_seconds,
|
|
blocking=False,
|
|
)
|
|
except redis.RedisError as exc: # pragma: no cover - broker outage
|
|
log.warning("platform_lock unavailable for %s: %s", platform, exc)
|
|
return None
|