fix: close data integrity and hot-reload review findings

Backfill same-day snapshots for newly added or restored videos, preserve successful fan snapshots on resume, persist incomplete state before forced re-runs, and split collection completion from backup completion so failed backups can retry without API calls. Reject missing data payloads instead of treating them as empty folders, guard against mass-unfav on suspicious empty remote folders, rebuild Bilibili clients when credentials change, recompute primary folder ownership from active relations with per-folder fav_time, preserve original titles for dropped invalid videos, poll config every 60 seconds, and fix favsort verify interval and mixed resource types.
This commit is contained in:
kairee committed 2026-10-31 20:58:36 +08:00
1 parent 178ab64b18
commit 6a21b5d905
21 files changed
+895 -82

No files matched your search

+26 -5
View File
@@ -19,7 +19,6 @@ import time
from dataclasses import dataclass, field
from typing import Any
from ..bilibili.client import BilibiliClient
from ..config import AppConfig, ConfigStore, FolderConfig
from ..repository import Repository
@@ -113,18 +112,29 @@ class FolderSyncService:
self,
config_store: ConfigStore,
repository: Repository,
client: BilibiliClient,
client=None,
*,
client_provider=None,
clock=time.time,
logger=None,
capacity_warn: int = CAPACITY_WARN,
allow_empty_folders: bool = False,
) -> None:
if client is None and client_provider is None:
raise ValueError("必须提供 client 或 client_provider")
self.config_store = config_store
self.repo = repository
self.client = client
self.client_provider = client_provider
self._clock = clock
self.logger = logger
self.capacity_warn = capacity_warn
self.allow_empty_folders = allow_empty_folders
def _client(self):
if self.client_provider is not None:
return self.client_provider.get()
return self.client
def _now(self) -> int:
return int(self._clock())
@@ -135,6 +145,7 @@ class FolderSyncService:
def run(self, *, full_refresh: bool = False) -> SyncSummary:
cfg = self.config_store.get()
client = self._client()
now = self._now()
summary = SyncSummary(started_at=now)
self._log(
@@ -151,7 +162,9 @@ class FolderSyncService:
for folder in cfg.folders:
try:
result = self._sync_folder(cfg, folder, now=now, force_full=full_refresh)
result = self._sync_folder(
client, cfg, folder, now=now, force_full=full_refresh
)
except Exception as exc: # noqa: BLE001 单个夹失败不阻塞其它夹
result = FolderSyncResult(
media_id=folder.media_id,
@@ -191,6 +204,7 @@ class FolderSyncService:
def _sync_folder(
self,
client,
cfg: AppConfig,
folder: FolderConfig,
*,
@@ -206,13 +220,20 @@ class FolderSyncService:
>= cfg.schedule.full_folder_refresh_hours * 3600
)
resources = self.client.fav_ids(folder.media_id)
resources = client.fav_ids(folder.media_id)
remote_map = {item.aid: item for item in resources if item.type == 2}
remote = set(remote_map)
local = self.repo.folder_active_aids(folder.media_id)
added = remote - local
removed = local - remote
if not remote and local and not self.allow_empty_folders:
raise RuntimeError(
f"收藏夹 {folder.media_id} 远端返回 0 条,但本地仍有 {len(local)} 条;"
f"疑似接口异常,已跳过差集。确认收藏夹确实被清空后,"
f"可使用 --allow-empty-folder 重试"
)
result = FolderSyncResult(
media_id=folder.media_id,
year=folder.year,
@@ -228,7 +249,7 @@ class FolderSyncService:
targets |= remote
if targets:
infos = self.client.fav_infos(
infos = client.fav_infos(
folder.media_id,
sorted(targets),
folder_mid=cfg.bilibili.read.mid,