Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(feeds): 订阅源列表按人排,同一个人的 JavDB 与 DMM 行挨在一起

longmeidaoc9ca23ab0ea9
diff --git a/src/peach/feeds.py b/src/peach/feeds.py
index 04c70ec3a..9e20333c6 100644
--- a/src/peach/feeds.py
+++ b/src/peach/feeds.py
@@ -402,12 +402,13 @@ def sources(connection: sqlite3.Connection) -> list[dict]:
`page_name` 是上次拉取时这一页在站上挂的名字(`settle` 写进 `feed_source.name`)。
同一个人的两页在表里名字一样,只有它说得出哪一行是旧艺名那页。排序按人物走,
- 同一个人的几页挨在一起,不被页名拆开。"""
+ 同一个人的几页挨在一起,不被页名或类型拆开;同一个人里 JavDB 演员页在前、DMM 片单在后。"""
rows = connection.execute(
"SELECT s.*, e.canonical_name AS entity_name,"
" (SELECT count(*) FROM feed_item i WHERE i.source_id=s.id) AS seen"
" FROM feed_source s LEFT JOIN entity e ON e.id=s.entity_id"
- " ORDER BY s.kind, coalesce(e.canonical_name, s.name), s.id").fetchall()
+ " ORDER BY coalesce(e.canonical_name, s.name), s.kind<>?, s.id",
+ (KIND_JAVDB_ACTOR,)).fetchall()
return [{
"id": int(row["id"]),
"kind": row["kind"],
diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.py
index 120059500..403763161 100644
--- a/tests/test_feeds_web.py
+++ b/tests/test_feeds_web.py
@@ -1250,6 +1250,9 @@ class PerformerFeedSwitchTest(FeedWebFixture):
result = self._switch(True)
self.assertEqual(len(result["sources"]), 2)
reports = {report["source"]: report for report in self._settled()["results"]}
+ # 同一个人的几条源挨在一起,JavDB 演员页在前。
+ self.assertEqual([source["kind"] for source in self._sources()],
+ [feeds.KIND_JAVDB_ACTOR, feeds.KIND_DMM_ACTRESS])
sources = {source["kind"]: source for source in self._sources()}
dmm = sources[feeds.KIND_DMM_ACTRESS]
self.assertEqual((dmm["url"], dmm["kind_label"], dmm["page_name"], dmm["name"]),