Archived
refactor: 拆分 4 个巨石模块为包,清理过时注释并删除作废文档
为什么:单文件 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/ 指纹未变;忽略注释的逐字等价性校验通过。
This commit is contained in:
1 parent
838d635bc5
commit
6288a98ecc
89 files changed
+5806
-5112
No files matched your search
@@ -0,0 +1,60 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Cookie 读取与解析。
|
||||
|
||||
(自 music_api.py 拆出,行为与原实现一致。)
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
# ============ Cookie 工具 ============
|
||||
|
||||
DEFAULT_COOKIE_FILE = "cookie.txt"
|
||||
|
||||
|
||||
def load_cookies(path: str = DEFAULT_COOKIE_FILE) -> dict[str, str]:
|
||||
"""从 cookie.txt 直接读取并解析为 dict
|
||||
|
||||
支持标准 ``NMTID=xxx; _ntes_nnid=xxx; ...`` 格式。
|
||||
文件不存在或解析失败返回空 dict(不抛异常,调用方决定如何处理)。
|
||||
utf-8-sig 剥记事本 BOM(BOM 会让首键变成 \\ufeffMUSIC_U 静默
|
||||
丢 Cookie);解析改逐行再按 ``;`` 切(原实现 ';|\\n' 二选一,混排时丢键值对)。
|
||||
"""
|
||||
if not os.path.isfile(path):
|
||||
return {}
|
||||
try:
|
||||
with open(path, encoding="utf-8-sig") as f:
|
||||
content = f.read()
|
||||
except OSError:
|
||||
return {}
|
||||
return parse_cookie_string(content)
|
||||
|
||||
|
||||
def parse_cookie_string(cookie_string: str) -> dict[str, str]:
|
||||
"""把 ``k1=v1; k2=v2`` 格式字符串解析为 dict
|
||||
|
||||
支持 ``;`` 或 ``\\n`` 作为分隔符。
|
||||
"""
|
||||
cookies: dict[str, str] = {}
|
||||
if not cookie_string:
|
||||
return cookies
|
||||
cookie_string = cookie_string.strip()
|
||||
if not cookie_string:
|
||||
return cookies
|
||||
# 先逐行再按 ; 切——原实现 ";|\\n" 二选一,混排时行内 \\n
|
||||
# 会混进 value、后半段键值对丢失
|
||||
pairs = []
|
||||
for line in cookie_string.splitlines():
|
||||
for part in line.split(";"):
|
||||
part = part.strip()
|
||||
if part:
|
||||
pairs.append(part)
|
||||
for pair in pairs:
|
||||
pair = pair.strip()
|
||||
if not pair or "=" not in pair:
|
||||
continue
|
||||
key, value = pair.split("=", 1)
|
||||
key = key.strip()
|
||||
value = value.strip()
|
||||
if key and value:
|
||||
cookies[key] = value
|
||||
return cookies
|
||||
Reference in new issue
Block a user