Archived
snowy-yang
6288a98ecc
为什么：单文件 1100~1900 行的巨石模块让「改一处要通读全文」；同时注释里残留 大量已删台账的编号，以及「Flask/FastAPI 双栈迁移期」这类已失实的架构描述， 会误导后来者按不复存在的架构去改代码。 拆分（对外导入路径不变，行为零变更）： - music_downloader.py -> music_downloader/（models/downloader/cover/_http/_log/_concurrency） - auth_system.py -> auth_system/（db/security/users/credits/ledger/mail/cards/backup...） - music_api.py -> music_api/（api/client/crypto/qr/cookies/compat/constants/errors） - services/runtime.py -> services/（api_service/_shared/_taskcore/downloads/batch/podcast/ streaming/tasks）；services/runtime.py 保留为兼容门面 兼容性做法：各包用 __init__.py 以 __all__ 原样再导出全部符号，既有调用点 （auth_system.xxx / services.xxx / from music_api import Y）零改动；路径常量改为经包属性 动态读取（auth_system.DB_PATH），否则测试的 monkeypatch 会静默失效并写到生产库。 修复 9 处代码损伤（上一轮注释清理把 `()` 当「空括号残留」删掉所致；用「与拆分前逐字 等价」校验逐一定位，静态检查只会报出其中 4 处）： - core/config.py ).strip() or '*' - core/state.py threading.Lock() x2 - qr_login.py datetime.now() / .strip() - music_downloader/downloader.py .lower() - services/podcast.py set() / time.time() x2 清理与删除： - 删除 部署文档.md / 功能介绍.md / README_私有包警告.txt - 清理指向已删台账与文档的过时编号注释；把「迁移期 / 两栈 / 双框架 / 已迁移」等 失实描述改写为现状描述（保留 `<-> Flask /path` 映射表等仍有价值的契约来源说明） - _mkpkg.py：公开包剔除清单去掉已不存在的文档名；私有包警告改为自包含 - pyproject.toml：补 pythonpath = ["."]，使裸跑 pytest 不再 import core 失败 验证：ruff 全通过；pyright 0 errors / 0 warnings（102 文件）；pytest 144 passed； 真实 uvicorn 冒烟 6 条路由符合预期且生产 data/ 指纹未变；忽略注释的逐字等价性校验通过。
80 lines
3.2 KiB
Python
80 lines
3.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""下载/播客任务登记。
|
|
|
|
与原实现的唯一差异：不依赖请求上下文（flask.g），请求级账本键由 Billing 显式携带。
|
|
其余（归属、容量闸、task_id 白名单与碰撞换新、账本承接与撞名重试）逐条对齐。
|
|
"""
|
|
import logging
|
|
import re
|
|
import uuid
|
|
from collections.abc import Callable
|
|
from typing import Any
|
|
|
|
from core.config import MAX_ACTIVE_TASKS_PER_USER, MAX_TERMINAL_TASKS, MAX_TOTAL_TASKS
|
|
from core.state import DOWNLOAD_TASKS, DOWNLOAD_TASKS_LOCK
|
|
from web.billing import Billing
|
|
|
|
logger = logging.getLogger('web.tasks')
|
|
|
|
_TASK_ID_RE = re.compile(r'^[A-Za-z0-9_-]{1,32}$')
|
|
|
|
|
|
async def register_download_task(billing: Billing, task: dict[str, Any],
|
|
task_id_hint: str = '') -> str | None:
|
|
"""任务登记：失败返回错误描述，成功返回 None。task['task_id'] 为最终 id。"""
|
|
user_id = billing.user.id
|
|
task['user_id'] = user_id
|
|
task['billing_reserved'] = billing.need
|
|
|
|
with DOWNLOAD_TASKS_LOCK:
|
|
tid = (task_id_hint or '').strip() or uuid.uuid4().hex[:12]
|
|
if not _TASK_ID_RE.match(tid):
|
|
tid = uuid.uuid4().hex[:12]
|
|
while tid in DOWNLOAD_TASKS:
|
|
tid = uuid.uuid4().hex[:12]
|
|
active = sum(1 for t in DOWNLOAD_TASKS.values()
|
|
if t.get('user_id') == user_id
|
|
and t.get('status') in ('queued', 'running', 'paused'))
|
|
if active >= MAX_ACTIVE_TASKS_PER_USER:
|
|
return f'您有 {active} 个任务正在进行，请等待完成或取消后再提交'
|
|
active_total = sum(1 for t in DOWNLOAD_TASKS.values()
|
|
if t.get('status') in ('queued', 'running', 'paused'))
|
|
if active_total >= MAX_TOTAL_TASKS:
|
|
return '当前任务队列已满，请稍后再试'
|
|
if len(DOWNLOAD_TASKS) - active_total >= MAX_TERMINAL_TASKS:
|
|
return '当前任务队列已满，请稍后再试'
|
|
task['task_id'] = tid
|
|
DOWNLOAD_TASKS[tid] = task
|
|
|
|
# 账本承接（撞名重试）
|
|
try:
|
|
renamed = await billing.rename_to(tid)
|
|
retries = 0
|
|
while not renamed and retries < 5:
|
|
retries += 1
|
|
with DOWNLOAD_TASKS_LOCK:
|
|
DOWNLOAD_TASKS.pop(tid, None)
|
|
tid = uuid.uuid4().hex[:12]
|
|
while tid in DOWNLOAD_TASKS:
|
|
tid = uuid.uuid4().hex[:12]
|
|
task['task_id'] = tid
|
|
DOWNLOAD_TASKS[tid] = task
|
|
renamed = await billing.rename_to(tid)
|
|
if not renamed:
|
|
raise RuntimeError('任务账本键撞名，请重新提交')
|
|
billing.ledger_key = tid
|
|
except Exception:
|
|
with DOWNLOAD_TASKS_LOCK:
|
|
if DOWNLOAD_TASKS.get(tid) is task:
|
|
DOWNLOAD_TASKS.pop(tid, None)
|
|
raise
|
|
return None
|
|
|
|
|
|
async def start_task(task_id: str, worker: Callable, args: tuple = ()) -> str | None:
|
|
"""启动 worker 线程（复用 services 的 _start_task_thread，失败收敛终态并退费）。"""
|
|
import asyncio
|
|
|
|
import services.runtime as services
|
|
return await asyncio.to_thread(services._start_task_thread, task_id, worker, args)
|