Archived
refactor: 两个根级游离模块并入 music_api 包,消除分层倒置
为什么:podcast_api.py(560 行) 与 qr_login.py(397 行) 既不属于任何包、也不是 入口脚本,却同时被 services 层与 web 层引用——`services/downloads.py` 直接 `from qr_login import ...`、`services/podcast.py` 直接 `import podcast_api`, 业务层反向依赖顶层游离模块,是本次架构体检里唯一的无争议分层倒置。 两者本就依赖 music_api(前者取 url_v1/APIConstants/APIException,后者取 QRLoginManager),与 music_api 下已有的 qr.py / compat.py 是同一层的同类物。 迁移(git 保留重命名历史): - podcast_api.py -> music_api/podcast.py - qr_login.py -> music_api/qr_client.py **命名避让**:不叫 music_api/qr_login.py——music_api/__init__ 已经从 .compat 导出了一个**同名函数** qr_login,同名子模块会与之互相遮蔽。改叫 qr_client (其核心导出即 QRLoginClient),并在验证里专门确认 music_api.qr_login 仍是 可调用函数、music_api.podcast 是模块,两者不冲突。 内部导入顺带改为精确子模块,不再绕道包门面: - podcast.py:from music_api import APIConstants/APIException/url_v1 → from .compat import url_v1 / from .constants import ... / from .errors import ... - qr_client.py:删掉那层 try/except ImportError 包装(它给的是「请确保 music_api.py 文件存在」这类顶层脚本时代的提示,作为包内模块已无意义), 改 from .cookies/.errors/.qr 相对导入 - CLI 用法文本 python qr_login.py → python -m music_api.qr_client (相对导入后直接跑脚本会失败,必须走 -m;全仓确认无脚本/文档引用旧入口) - 路径安全性已核对:qr_client 用的是 CWD 相对的 cookie.txt,不是 __file__ 相对, 迁移不改其解析结果 引用点全部更新(AST 扫描确认覆盖全集,替换后残留 0): - podcast:services/podcast.py(1 + 5 处调用) · web/routers/podcast.py(1 + 6) · web/routers/download.py(2 处函数内 + 3),导入名统一为 `podcast` - qr_login:services/downloads.py · web/routers/admin.py · web/routers/user.py(×2) - services/__init__.py 依赖自检列表去掉这两个名字(已并入 music_api) - pyproject include 去掉两个顶层文件名(music_api 目录已覆盖) 验证: - 11 + 3 个符号在新位置全部 hasattr 通过;podcast_api / qr_login 已 ModuleNotFoundError;6 个调用方模块均可 import;services 依赖自检仍生效 - 门禁:ruff 0 · pyright 0 errors/0 warnings · pytest 184 passed - 真实 uvicorn 冒烟 10/10,含 /podcast/parse 与 /podcast/hot 返回 401 (模块导入失败会是 500,路由缺失会是 404,401 证明两者都正常) - 生产 data/ 指纹 before == after
This commit is contained in:
1 parent
1d86ec87ec
commit
095171e0b7
13 files changed
+37
-41
No files matched your search
+6
-6
@@ -12,13 +12,13 @@ from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import auth_system
|
||||
import podcast_api
|
||||
from core.state import (
|
||||
DOWNLOAD_TASKS,
|
||||
DOWNLOAD_TASKS_LOCK,
|
||||
)
|
||||
from music_api import (
|
||||
APIException,
|
||||
podcast,
|
||||
)
|
||||
from music_downloader import (
|
||||
DownloadCanceled,
|
||||
@@ -121,7 +121,7 @@ def _podcast_resolve_audio(program: dict[str, Any], quality: str,
|
||||
song_id = program.get('main_song_id')
|
||||
if not song_id:
|
||||
raise DownloadException("该单集缺少音频信息(mainSong)")
|
||||
url_info = podcast_api.resolve_episode_url(song_id, cookies, quality)
|
||||
url_info = podcast.resolve_episode_url(song_id, cookies, quality)
|
||||
if not url_info or not url_info.get('url'):
|
||||
raise DownloadException("未获取到音频直链(单集可能已下架或受版权限制)")
|
||||
return url_info
|
||||
@@ -151,7 +151,7 @@ def _podcast_download_worker(task_id: str) -> None:
|
||||
cookies = params['cookies']
|
||||
remote_ip = params.get('remote_ip') or '-'
|
||||
|
||||
program = podcast_api.get_program_detail(program_id, cookies)
|
||||
program = podcast.get_program_detail(program_id, cookies)
|
||||
url_info = _podcast_resolve_audio(program, quality, cookies)
|
||||
|
||||
serial = int(program.get('serial_num') or 0)
|
||||
@@ -315,14 +315,14 @@ def _podcast_zip_worker(task_id: str) -> None:
|
||||
|
||||
# 组装单集清单:整台电台(正序全量)或指定单集ID列表
|
||||
if radio_id:
|
||||
episodes = podcast_api.list_radio_all_program_ids(radio_id, cookies, max_count=limit)
|
||||
episodes = podcast.list_radio_all_program_ids(radio_id, cookies, max_count=limit)
|
||||
if not episodes:
|
||||
raise DownloadException("该电台暂无可下载的单集")
|
||||
else:
|
||||
episodes = []
|
||||
for pid in (preset_ids or []):
|
||||
try:
|
||||
prog = podcast_api.get_program_detail(pid, cookies)
|
||||
prog = podcast.get_program_detail(pid, cookies)
|
||||
episodes.append({
|
||||
'id': prog['id'],
|
||||
'name': prog['name'],
|
||||
@@ -394,7 +394,7 @@ def _podcast_zip_worker(task_id: str) -> None:
|
||||
label = f"[{idx}/{len(episodes)}] {ep['name'][:24]}"
|
||||
_update_progress(f"{label} 解析中...")
|
||||
try:
|
||||
prog = ep.get('detail') or podcast_api.get_program_detail(ep['id'], cookies)
|
||||
prog = ep.get('detail') or podcast.get_program_detail(ep['id'], cookies)
|
||||
url_info = _podcast_resolve_audio(prog, quality, cookies)
|
||||
_update_progress(f"{label} 下载中...")
|
||||
ext = (url_info.get('type') or 'mp3').lower().lstrip('.')
|
||||
|
||||
Reference in new issue
Block a user