fix: 修复订阅筛选清空与任务进度竞态

This commit is contained in:
jxxghp
2026-08-27 12:02:04 +08:00
parent cd4e79ef57
commit 49d30e5fdf
5 changed files with 155 additions and 9 deletions
+9 -3
View File
@@ -48,6 +48,12 @@ def compute_subscribe_completed_episode(subscribe: "Subscribe") -> Optional[int]
class Subscribe(OptionalMediaIdentityMixin, BaseModel):
"""订阅输入与响应模型,媒体身份必须为空对或完整有效对。"""
# 表单用空字符串表达“全部”时必须保留显式清空语义,更新接口才能覆盖存量规则。
CLEARABLE_FILTER_FIELDS: ClassVar[frozenset[str]] = frozenset({
"filter", "include", "exclude", "quality", "resolution", "effect",
"audio_quality", "audio_format",
})
# 公共创建和更新接口不得接收系统字段和运行事实;其余字段默认作为订阅输入透传。
PUBLIC_WRITE_EXCLUDED_FIELDS: ClassVar[frozenset[str]] = frozenset({
"id", "poster", "backdrop", "vote", "description", "lack_episode", "completed_episode",
@@ -186,14 +192,14 @@ class Subscribe(OptionalMediaIdentityMixin, BaseModel):
音乐等媒体类型的 season、total_episode、episode_priority 等数值或容器字段
在表单中常以空字符串提交,而 Pydantic 不会把空字符串自动转为 None,会直接抛出
校验异常导致接口返回 422。这里把空字符串键移除,等价于该字段未提供,从而复用字段
默认值(如 ``total_episode`` 回退为 0、``sites`` 回退为空列表)。媒体身份键保留为
None,以便更新接口区分“未提交”与“显式清空完整身份对”。
默认值(如 ``total_episode`` 回退为 0、``sites`` 回退为空列表)。媒体身份键以及可清空
的筛选字段保留为 None,以便更新接口区分“未提交”与“显式清空”。
"""
if isinstance(data, dict):
data = dict(data)
for key, value in list(data.items()):
if isinstance(value, str) and value == "":
if key in {"media_source", "media_id"}:
if key in {"media_source", "media_id"} or key in cls.CLEARABLE_FILTER_FIELDS:
data[key] = None
else:
data.pop(key)