Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(review): 保留旧库缓存失效并登记恢复历史版本

Peach local maintenance16a63cbe24dd
diff --git a/docs/REUSE.md b/docs/REUSE.md
index b3bda0ed5..71561ed73 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -413,7 +413,7 @@ JAV 作品详情与馆藏视频共用 `IdentityCell` 的头像、标识和首字
## 复核队列
-复核快照在一次请求内复用人物、厂牌和系列的身份解析,下一份快照重新读取账本,别名合并后不会沿用旧身份。已批准及当前自动否决的候选在加载作品预览、头像和取景前移出显示集合;稍后和人工忽略仍各自保留。封面存在性复用 `/cover` 的文件及来源判定,不加载全库封面取景边车。接口只传结构化候选,不重复携带 CSV 的 `candidates_json`,批准仍从原候选文件核验。缓存按实际读取的资料、身份、复核和标签决定表失效,同一版本的并发请求复用一次计算;前端分组与分页计算随输入变化更新。复用标准库 `functools.cache`、现有聚合缓存和 React `useMemo`,无新增依赖或存量数据转换。
+复核快照在一次请求内复用人物、厂牌和系列的身份解析,下一份快照重新读取账本,别名合并后不会沿用旧身份。已批准及当前自动否决的候选在加载作品预览、头像和取景前移出显示集合;稍后和人工忽略仍各自保留。封面存在性复用 `/cover` 的文件及来源判定,不加载全库封面取景边车。接口只传结构化候选,不重复携带 CSV 的 `candidates_json`,批准仍从原候选文件核验。缓存按实际读取的资料、身份、复核和标签决定表失效,同一版本的并发请求复用一次计算;未提供版本号的旧库仍按提交通知失效,不保留为无限期快照;前端分组与分页计算随输入变化更新。复用标准库 `functools.cache`、现有聚合缓存和 React `useMemo`,无新增依赖或存量数据转换。
复核状态复用 `review_decision`、候选 CSV、TanStack Query 和 BoardUI `Tabs`。`/api/review` 的根段提供待处理,`queues.later` 与 `queues.ignored` 提供独立分类和计数;页面地址保存状态与分类。旧 `skipped` 直接投影为稍后处理,人工 `rejected` 投影为已忽略,自动判定不混入人工忽略。迁移 `0050` 只新增 `review_decision_history`,不重写旧决定。显式恢复先在同一事务保存原决定,再删除当前拒绝或跳过决定;已批准和不在当前候选中的资料不可恢复。只读镜像校验三个状态完整性,旧缓存缺状态时报告未取得。无新增依赖。
diff --git a/migrations/0050_review_restoration_history.sql b/migrations/0050_review_restoration_history.sql
index 5e4da19d5..e48784c16 100644
--- a/migrations/0050_review_restoration_history.sql
+++ b/migrations/0050_review_restoration_history.sql
@@ -12,3 +12,14 @@ CREATE TABLE review_decision_history(
CREATE INDEX idx_review_decision_history_item
ON review_decision_history(category,item_key,restored_at DESC);
+
+INSERT INTO ledger_revision(tbl) VALUES('review_decision_history');
+CREATE TRIGGER rev_review_decision_history_insert AFTER INSERT ON review_decision_history BEGIN
+ UPDATE ledger_revision SET n=n+1 WHERE tbl='review_decision_history';
+END;
+CREATE TRIGGER rev_review_decision_history_update AFTER UPDATE ON review_decision_history BEGIN
+ UPDATE ledger_revision SET n=n+1 WHERE tbl='review_decision_history';
+END;
+CREATE TRIGGER rev_review_decision_history_delete AFTER DELETE ON review_decision_history BEGIN
+ UPDATE ledger_revision SET n=n+1 WHERE tbl='review_decision_history';
+END;
diff --git a/src/peach/web_state.py b/src/peach/web_state.py
index 6d4355361..55058e055 100644
--- a/src/peach/web_state.py
+++ b/src/peach/web_state.py
@@ -338,9 +338,13 @@ class WebContract:
# 指定依赖表的聚合共用一次计算;提交后仍按这些表的代次核验。
with self.cache_lock:
lock = self.aggregate_locks.setdefault(key, threading.RLock())
- self.revision_cache_keys.add(key)
with lock:
revision = self.ledger_revision(tables)
+ with self.cache_lock:
+ if revision is None:
+ self.revision_cache_keys.discard(key)
+ else:
+ self.revision_cache_keys.add(key)
return self.cached(key, fn, ttl=CACHE_TTL if revision is None else math.inf,
version=(tuple(tables), revision, *inputs))
diff --git a/tests/test_ledger_revision.py b/tests/test_ledger_revision.py
index 7cea48699..ef6ea2f65 100644
--- a/tests/test_ledger_revision.py
+++ b/tests/test_ledger_revision.py
@@ -117,6 +117,14 @@ class LedgerRevisionTests(unittest.TestCase):
self.assertEqual(self.contract.cached_until_changed("review", self.compute, "csv-2"), 2)
self.assertEqual(len([key for key in self.contract.cache if key == "review"]), 1)
+ def test_scoped_cache_without_revisions_honors_commit_invalidation(self):
+ with closing(sqlite3.connect(self.db_path)) as connection, connection:
+ connection.execute("DROP TABLE ledger_revision")
+ self.assertEqual(self.contract.cached_until_changed('review', self.compute, tables=('genre_decision',)), 1)
+ self.assertEqual(self.contract.cached_until_changed('review', self.compute, tables=('genre_decision',)), 1)
+ self.contract.cache_bust()
+ self.assertEqual(self.contract.cached_until_changed('review', self.compute, tables=('genre_decision',)), 2)
+
def test_a_ledger_without_revisions_falls_back_to_the_time_limit(self):
with closing(sqlite3.connect(self.db_path)) as connection, connection:
connection.execute("DROP TABLE ledger_revision")
diff --git a/tests/test_migrations.py b/tests/test_migrations.py
index dcc4c2c34..a02e9978a 100644
--- a/tests/test_migrations.py
+++ b/tests/test_migrations.py
@@ -28,6 +28,16 @@ class MigrationTests(unittest.TestCase):
self.assertEqual([item.version for item in upgrade(self.db, MIGRATIONS)], ['0050'])
self.assertEqual(connection.execute('SELECT * FROM review_decision ORDER BY item_key').fetchall(), before)
self.assertEqual(connection.execute('SELECT COUNT(*) FROM review_decision_history').fetchone()[0], 0)
+ def revision():
+ return connection.execute("SELECT n FROM ledger_revision WHERE tbl='review_decision_history'").fetchone()[0]
+ self.assertEqual(revision(), 0)
+ connection.execute("INSERT INTO review_decision_history(category,item_key,status,reviewer,note,decided_at,restored_at) VALUES('creator_tags','kept','skipped','本人','旧记录','old','now')")
+ self.assertEqual(revision(), 1)
+ connection.execute("UPDATE review_decision_history SET note='保留原文' WHERE item_key='kept'")
+ self.assertEqual(revision(), 2)
+ connection.execute("DELETE FROM review_decision_history WHERE item_key='kept'")
+ self.assertEqual(revision(), 3)
+ connection.commit()
self.assertEqual(connection.execute('PRAGMA integrity_check').fetchone()[0], 'ok')
self.assertEqual(connection.execute('PRAGMA foreign_key_check').fetchall(), [])
self.assertEqual(upgrade(self.db, MIGRATIONS), [])