Peach: Local-first video metadata scraper and media manager.
fix(covers): 缓存清理不再删除关注新作与想要清单的封面
longmeidao6cbdf575fbdf
diff --git a/src/peach/web_resource_sync.py b/src/peach/web_resource_sync.pyindex 11a990d19..7aca6eaee 100644--- a/src/peach/web_resource_sync.py+++ b/src/peach/web_resource_sync.py@@ -352,22 +352,30 @@ def _cache_owners(contract: ResourceSyncContract, excluded_ids: Sequence[int] = (),retired_ids: Sequence[int] = (),) -> tuple[set[int], set[str], set[Path]]:- """缓存还有主人的三把键:按 id 认的、按番号认的、快照路径。+ """缓存还有主人的三把键:按 id 认的、按封面键认的、快照路径。`excluded_ids` 是这一轮要永久删除的行,它们的缓存全都不算有主。`retired_ids` 是这一轮要标「已消失」的行,已经标过的也一样:快照与封面留给孤儿记录列表认片(ADR-0087),按 id 生成的转码、分片、时间轴与海报帧对一个读不到的文件没有用处,照孤儿清掉。++ 封面键除了馆藏的番号,还有没有番号的作品的 `ASSET-ID-<id>`,以及关注里没忽略的新作、+ 想要清单里还没入库的番号:库外这两类的封面由补封面装进同一个目录,详情页和卡片照样读。"""+ from .western_artwork import artwork_keywith contract.read_connection() as connection:rows = connection.execute("SELECT id,code,snapshot_path,disposal FROM asset WHERE COALESCE(disposal,'')!='trash'",).fetchall()+ outside = connection.execute(+ "SELECT code FROM feed_discovery WHERE ignored_at IS NULL"+ " UNION ALL SELECT code_key FROM want_item WHERE state<>'acquired'").fetchall()excluded = {int(item) for item in excluded_ids}retired = {int(item) for item in retired_ids}rows = [row for row in rows if int(row["id"]) not in excluded]active_ids = {int(row["id"]) for row in rowsif row["disposal"] is None and int(row["id"]) not in retired}- active_codes = {normalise_code_key(row["code"]) for row in rows if row["code"]}+ active_codes = {artwork_key(int(row["id"]), row["code"]) for row in rows}+ active_codes.update(normalise_code_key(row[0]) for row in outside if row[0])active_codes.discard("")translate = contract.snapshot_root is not Noneactive_snapshots = {normalized_path(row["snapshot_path"]) if translate else Path(row["snapshot_path"])diff --git a/tests/test_web_resource_sync.py b/tests/test_web_resource_sync.pyindex d6b4c8d9a..687895f33 100644--- a/tests/test_web_resource_sync.py+++ b/tests/test_web_resource_sync.py@@ -463,6 +463,26 @@ class PurgeMissingTests(unittest.TestCase):self.assertTrue(shared.is_file())self.assertNotIn("covers", preview["cache"]["by_kind"])+ def test_cache_cleanup_keeps_covers_of_followed_wanted_and_codeless_works(self):+ """关注新作、想要清单和无番号作品的封面不在馆藏番号里,同样有主。"""+ covers = self.root / "covers"+ covers.mkdir()+ con = sqlite3.connect(self.db_path)+ con.executemany("INSERT INTO feed_discovery(code,discovered_at,ignored_at) VALUES(?,'t',?)",+ [("NGOD-365", None), ("IGNO-001", "t")])+ con.execute("INSERT INTO want_item(code,code_key,origin,state,created_at,updated_at)"+ " VALUES('WANT-001','WANT-001','code','wanted','t','t')")+ con.commit();con.close()+ kept = [covers / name for name in ("NGOD-365.jpg", "NGOD-365.face.json", "WANT-001.jpg", "ASSET-ID-1.jpg")]+ gone = [covers / "IGNO-001.jpg", covers / "ORPH-001.jpg"]+ for path in (*kept, *gone):+ path.write_bytes(b"cover")+ self.contract.cover_root = covers+ self.contract.resource_cleanup_enabled = True+ plan = rm_sync._resource_orphan_plan(self.contract)+ self.assertEqual(sorted(path.name for _kind, path, _size in plan["files"]),+ ["IGNO-001.jpg", "ORPH-001.jpg"])+def test_cache_cleanup_never_crosses_the_database_data_root(self):"""临时数据库漏配缓存根时,宁可不清理,也不能越界碰真实 generated。"""with tempfile.TemporaryDirectory() as outside_tmp: