Peach: Local-first video metadata scraper and media manager.
fix(scan): 排除本地预告片的独立作品卡片
longmeidao9add7ba3bcfe
diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 1351a2b26..f94fbe0a5 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -898,6 +898,10 @@ Python 源文件纳入 `src/peach/library_sharing.py` 与 `src/peach/library_pro普通 Toast 与扫描任务卡共用 Agent Progress 外框,16px 半径由通知栈内的既有 token 解析,细边框与接触阴影分别复用 `border-button-default`、`elevation-xs`,不改变内容排版。浏览器回归核对桌面、手机和明暗主题下的外框一致性,并以同一任务、同一内容回放外框基线生成对比图。+## 本地预告片识别++本地预告片识别复用 `catalog_rules.is_local_trailer` 与现有 `scan.is_sidecar`,行为约定来自 [Kodi 本地预告片](https://kodi.wiki/view/Trailers)与 [Jellyfin 附属文件命名](https://jellyfin.org/docs/general/server/media/movies/#file-suffix)(2026-10-23 核对)。仅参照公开命名规则,不复制上游源码或引入媒体服务器依赖。`trailer` 裸名及 `-trailer`、`.trailer`、`_trailer`、空格加 `trailer` 的末尾标记不区分大小写,扩展名沿用现有视频集合。扫描、推送发现、首次预检、后台探测、资料采集和馆藏查询使用同一判据;已登记记录只在作品列表、版本组与库存计数中排除,保留媒体和个人记录,不按时长猜测。隔离回归复现正片与预告片共存的目录,并验证短正片、普通片名和账本只读性。Python 3.14 标准库 `re`(PSF 许可)已随运行时提供,无新增依赖与安装体积;不采用额外视频解析库,因为本项只需读取文件名。取证范围见[本地预告片证据](reference-snapshots/local-trailer-evidence.md)。+## 媒体库与根目录身份身份生成复用 Python 3.14 标准库 [`uuid`](https://docs.python.org/3.14/library/uuid.html) 的 UUIDv4、UUIDv5(PSF 许可,随运行时维护,Windows/macOS/Linux,无新增安装体积);路径归属复用 `platform.resolve_root`、`PureWindowsPath`,配置写入复用 `fsutil.atomic_write_text`,扫描沿用 SQLite upsert 与现有断点。当前树与 Git 中的媒体库分组、目录索引、来源探测和下载渠道共同消费这些身份。diff --git a/docs/reference-snapshots/local-trailer-evidence.md b/docs/reference-snapshots/local-trailer-evidence.mdnew file mode 100644index 000000000..b29ccdbcf--- /dev/null+++ b/docs/reference-snapshots/local-trailer-evidence.md@@ -0,0 +1,14 @@+# 本地预告片命名证据++核对日期:2026-10-23。本文件是人工取证笔记,记录网页命名事实与 Peach 的采用范围,不是上游原文,因此不登记进 `docs/reference-sources.json`。++## 公开约定++- **实测**:[Kodi 官方 Trailers 页面](https://kodi.wiki/view/Trailers)的 Local 一节要求本地预告片与正片同目录,文件主名追加 `-trailer`。页面提供的固定历史版本抓取返回 `Cache miss`,本次证据使用官方当前页面,不声称取得固定版本原文。+- **实测**:[Jellyfin 官方 Movies 页面](https://jellyfin.org/docs/general/server/media/movies/#file-name)列出裸名 `trailer`;[File Suffix 一节](https://jellyfin.org/docs/general/server/media/movies/#file-suffix)列出连字符、点、下划线和空格分隔的末尾预告片标记。网页内容按 CC-BY-ND-4.0 发布;本实现只参照文件命名事实,不复制或改写上游文档作为代码。++## Peach 的采用范围++Peach 复用标准库正则表达式独立实现文件名判据,扩展名沿用现有扫描器。它排除预告片的独立作品卡片,不新增预告片播放入口,不扩展到 `sample`、花絮或 `trailers/` 子目录约定。命名明确时不依赖正片先到达,也不读取视频内容;普通短正片和未匹配末尾标记的片名照常登记。++已登记的预告片保留原始行、评分与播放记录,查询时排除;不增加迁移,不清理真实 ledger。临时文件与临时账本用例覆盖截图中的目录、推送发现、首次预检、后台探测、资料采集、列表、搜索、补全、版本组及库存计数。未部署 Kodi 或 Jellyfin,二者完整服务的端到端兼容性未验证。diff --git a/src/peach/catalog_rules.py b/src/peach/catalog_rules.pyindex 8238b87a7..252d42c84 100644--- a/src/peach/catalog_rules.py+++ b/src/peach/catalog_rules.py@@ -15,6 +15,21 @@ from collections.abc import Iterablefrom pathlib import PureWindowsPath+VIDEO_EXTENSIONS = frozenset({+ '.mp4', '.m4v', '.mkv', '.avi', '.wmv', '.mov', '.ts', '.flv', '.rmvb', '.mpg',+ '.m2ts', '.strm', '.iso',+})+_LOCAL_TRAILER = re.compile(+ r'(?:^|[-._ ])trailer(?:' + '|'.join(re.escape(ext) for ext in sorted(VIDEO_EXTENSIONS)) + r')\Z',+ re.IGNORECASE,+)+++def is_local_trailer(name: str | None) -> bool:+ """Kodi/Jellyfin 的裸名或末尾 trailer 标记;时长不参与判定。"""+ return bool(_LOCAL_TRAILER.search(name or ''))++LENGTH_TAGS = {"短片-2分内", "中片-10分内", "长片-30分内", "超长片-30分上"}TECH_TAGS = {"1080P", "720P", "4K", "2K", "2160P", "480P", "低画质", "高帧率",diff --git a/src/peach/library_processing.py b/src/peach/library_processing.pyindex 6ca8fa7eb..0861f924c 100644--- a/src/peach/library_processing.py+++ b/src/peach/library_processing.py@@ -20,7 +20,7 @@ from urllib.parse import urlparsefrom filelock import FileLock, Timeoutfrom PIL import Image-from .catalog_rules import (compile_code_patterns, is_jav_code, normalise_code_key,+from .catalog_rules import (compile_code_patterns, is_jav_code, is_local_trailer, normalise_code_key,release_code_from_filename, same_release_code, scrapes_as_jav)from .field_owners import SCAN_FILENAME, write_owned_fieldsfrom .profiles import read_settings@@ -1917,7 +1917,7 @@ def _collection_rows(db_path, *, locations, online_roots, asset_ids):connection.row_factory = sqlite3.Row# 路径归属只比字面,避免逐行 resolve() 访问挂载服务。rows = [dict(row) for row in connection.execute(query, parameters)- if row['location'] in locations+ if not is_local_trailer(row['name']) and row['location'] in locationsand any(translate_ledger_path(row['path']).is_relative_to(root) for root in online_roots)]genre_decisions = load_genre_decisions(connection)return rows, genre_decisionsdiff --git a/src/peach/media_probe.py b/src/peach/media_probe.pyindex b7c4bbea2..62bf8001d 100644--- a/src/peach/media_probe.py+++ b/src/peach/media_probe.py@@ -27,6 +27,7 @@ from .media import resolve_case_insensitivefrom .media_sources import cost_forfrom .strm import skip_background_readfrom .processing_control import CURRENT, checkpoint+from .catalog_rules import is_local_trailerfrom . import junk, record_rehome#: 一次探测最多等多久。ffprobe 只读文件头,网盘上实测一两秒。@@ -156,7 +157,8 @@ def probe_path(db_path, ffprobe: str | None, location: str, path: str, *, configdef _record(db_path, ffprobe: str, rows: Sequence, report: Callable[[int, int], None], *,protected_ids=(), on_junk=lambda result: None) -> int:"""探完一条写一条。`report` 抛出来(任务被停)时,还没开始的那些不再探。"""- rows = [row for row in rows if not skip_background_read(row[1])]+ rows = [row for row in rows if not skip_background_read(row[1])+ and not is_local_trailer(PureWindowsPath(row[1]).name)]if not rows:return 0done = 0diff --git a/src/peach/processing_inventory.py b/src/peach/processing_inventory.pyindex 5817336ad..355c8086b 100644--- a/src/peach/processing_inventory.py+++ b/src/peach/processing_inventory.py@@ -36,7 +36,7 @@ class InventoryPreview:self.lock = threading.Lock()def _files(self, config):- from .scan import _walk, medium_of, walk_root_for+ from .scan import _walk, is_sidecar, medium_of, walk_root_forknown = {self.meter._media_key(row['path'], row['location']) for row in self.rows}seen = set()for key, source in self.meter.rows.items():@@ -54,7 +54,7 @@ class InventoryPreview:relative = Path(directory).relative_to(top).partsfor entry in entries:row = None- if medium_of(entry.name) == 'video':+ if medium_of(entry.name) == 'video' and not is_sidecar(entry.name, frozenset()):path = str(PureWindowsPath(root, *relative, entry.name))owner = self.meter._media_key(path, location)identity = location, path.casefold()diff --git a/src/peach/processing_traffic_plan.py b/src/peach/processing_traffic_plan.pyindex 37471ba36..6d847def8 100644--- a/src/peach/processing_traffic_plan.py+++ b/src/peach/processing_traffic_plan.py@@ -7,6 +7,8 @@ import sqlite3from statistics import medianfrom contextlib import closing+from .catalog_rules import is_local_trailer+MIB = 1024 ** 2@@ -30,7 +32,8 @@ def ledger_rows(db_path, asset_ids=None):parameters = asset_idswith closing(sqlite3.connect(db_path, timeout=30)) as connection:connection.row_factory = sqlite3.Row- return [dict(row) for row in connection.execute(query, parameters)]+ return [dict(row) for row in connection.execute(query, parameters)+ if not is_local_trailer(row['name'])]def typical_size(directory, pattern, fallback):diff --git a/src/peach/repository.py b/src/peach/repository.pyindex 7cafa90ad..9a0f4b435 100644--- a/src/peach/repository.py+++ b/src/peach/repository.py@@ -6,7 +6,7 @@ from contextlib import contextmanagerfrom dataclasses import dataclassfrom pathlib import Path-from .catalog_rules import is_jav_code, normalise_code_key+from .catalog_rules import is_jav_code, is_local_trailer, normalise_code_keyfrom .entities import normalize_entity_namefrom .regions import infer_region@@ -30,6 +30,8 @@ class LedgerDatabase:)connection.row_factory = sqlite3.Rowconnection.create_function("is_jav_code", 1, is_jav_code, deterministic=True)+ connection.create_function(+ "peach_is_local_trailer", 1, is_local_trailer, deterministic=True)connection.create_function("normalise_code_key", 1, normalise_code_key, deterministic=True)# 产地推断要和 Python 侧同一份实现。SQL 里重写一遍前缀名单的话,账本筛出来的diff --git a/src/peach/scan.py b/src/peach/scan.pyindex 386142342..cdc6513a0 100644--- a/src/peach/scan.py+++ b/src/peach/scan.py@@ -20,7 +20,7 @@字幕 sidecar 顺带在这里登记:遍历时每个目录的文件名已经在手上,配对判据只看同目录,`subtitles.py` 负责判定,本模块只负责把结论落进 `asset_subtitle`。-刮削器与播放器写在正片旁边的附属文件不登记(`is_sidecar`):NFO、Kodi 命名的海报与背景图、+刮削器与播放器写在正片旁边的附属文件不登记(`is_sidecar`):本地预告片、NFO、Kodi 命名的海报与背景图、`extrafanart/` 里的剧照、截图工具拼出的缩略图。它们描述一部片,本身不是作品,登记进来就会在馆藏里冒出成百张「图片」,把真正的图集淹掉。@@ -45,9 +45,9 @@ from . import folder_rules, junk, record_rehome, subtitles, wantsfrom .platform import is_windows_path, is_unmapped, resolve_location, resolve_rootfrom .processing_control import checkpointfrom .fsutil import atomic_write_text+from .catalog_rules import VIDEO_EXTENSIONS, is_local_trailer-VIDEO = {".mp4", ".m4v", ".mkv", ".avi", ".wmv", ".mov", ".ts", ".flv", ".rmvb", ".mpg",- ".m2ts", ".strm", ".iso"}+VIDEO = VIDEO_EXTENSIONSIMAGE = {".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp"}AUDIO = {".mp3", ".flac", ".wav", ".m4a", ".ogg", ".opus"}ARCHIVE = {".zip", ".rar", ".7z", ".tar", ".gz"}@@ -123,7 +123,7 @@ def medium_of(name: str) -> str:def video_stems(names) -> frozenset[str]:"""一个目录里视频文件的片名(casefold),`is_sidecar` 拿它判同目录有没有正片。"""return frozenset(os.path.splitext(name)[0].casefold() for name in names- if medium_of(name) == "video")+ if medium_of(name) == "video" and not is_local_trailer(name))def is_sidecar(name: str, videos: frozenset[str], *, artwork_dir: bool = False) -> bool:@@ -137,6 +137,8 @@ def is_sidecar(name: str, videos: frozenset[str], *, artwork_dir: bool = False)stem, suffix = os.path.splitext(name)if suffix.lower() == ".nfo":return True+ if is_local_trailer(name):+ return Trueif medium_of(name) != "image":return Falseif artwork_dir or _DERIVED_THUMB.search(stem):diff --git a/src/peach/web_catalog.py b/src/peach/web_catalog.pyindex 8a8bd0403..162478280 100644--- a/src/peach/web_catalog.py+++ b/src/peach/web_catalog.py@@ -168,11 +168,13 @@ AGENCY_SEARCH_CLAUSE = ()-#: 「这条资源在普通馆藏里看得见」的判据:是视频,且在库——不在回收站,也没有标「已消失」+#: 普通馆藏展示在库正片,排除预告片、回收站和标「已消失」的资源。#: (`disposal` 为空,ADR-0087)。列表、搜索和补全#: 共用这一份。各写各的后果是补全会补出回收站里的作品——那一条点开是已经删掉的片,#: 而列表本身从来不显示它,所以只会在补全这一个表面上露出来。-VISIBLE_CATALOG_ASSET = "a.medium='video' AND a.disposal IS NULL"+VISIBLE_CATALOG_ASSET = (+ "a.medium='video' AND a.disposal IS NULL AND NOT peach_is_local_trailer(a.name)"+)def region_filter(value, trash: bool) -> tuple[list[str], list[str]]:@@ -676,7 +678,7 @@ def _read_group_rows(contract: WebContract) -> list[dict]:"SELECT id,name,path,code,size,duration,width,height,ctx_orient,disposal,catalog_title,field_owners ""FROM asset ""WHERE medium='video' "- "AND COALESCE(disposal,'')<>'vanished' ORDER BY id",+ "AND COALESCE(disposal,'')<>'vanished' AND NOT peach_is_local_trailer(name) ORDER BY id",)]if not rows:return []@@ -1114,6 +1116,7 @@ def q_related(contract: WebContract, aid, limit=24):"FROM asset a JOIN asset_entity shared ""ON shared.asset_id=a.id WHERE a.medium='video' AND a.id<>? ""AND (a.feedback IS NULL OR a.feedback<>'dislike') AND a.disposal IS NULL "+ "AND NOT peach_is_local_trailer(a.name) "f"AND shared.entity_id IN ({source_marks}) GROUP BY a.id ""ORDER BY count(DISTINCT shared.entity_id) DESC,a.id LIMIT 4000",(aid, *source_entity_ids),@@ -1209,7 +1212,9 @@ JAV_ASSET_PREDICATE = ()JAV_ASSET_CLAUSE = "AND " + JAV_ASSET_PREDICATE + " "#: 筛选项、侧栏读数与顶部三层排掉标「已消失」的行;回收站里的照旧算(`q_facets`、`q_tops`)。-PRESENT_ASSET_CLAUSE = "AND COALESCE(a.disposal,'')<>'vanished' "+PRESENT_ASSET_CLAUSE = (+ "AND COALESCE(a.disposal,'')<>'vanished' AND NOT peach_is_local_trailer(a.name) "+)#: 首页的状态筛选(新鲜 / 看过 / 已标记 / 稍后看)。作品列表、顶部三层和筛选面板diff --git a/src/peach/web_entity.py b/src/peach/web_entity.pyindex 74ab5aa88..52f53bba6 100644--- a/src/peach/web_entity.py+++ b/src/peach/web_entity.py@@ -101,7 +101,9 @@ def _missing_entity_result(connection, kind: str, name: str, entity_id: int | No#: 资料页与索引页数作品的口径:视频,且没有标「已消失」(ADR-0087)。回收站里的照旧算;#: 代表作的取图不套这一条。-COUNTED_VIDEO = "a.medium='video' AND COALESCE(a.disposal,'')<>'vanished'"+COUNTED_VIDEO = (+ "a.medium='video' AND COALESCE(a.disposal,'')<>'vanished' AND NOT peach_is_local_trailer(a.name)"+)def scope_predicate(kind: str, column: str, subject: str = "?") -> str:diff --git a/src/peach/web_stats.py b/src/peach/web_stats.pyindex f092f0fc0..63e7b0590 100644--- a/src/peach/web_stats.py+++ b/src/peach/web_stats.py@@ -396,8 +396,8 @@ def _storage_volumes() -> list[dict[str, object]]:#: 库存一节只数盘上还在的:标「已消失」的行留着只为个人记录(ADR-0087),不算库存。#: 回收站里的照旧算进来。播放与消费一节是个人记录本身,不套这一条。-PRESENT = "COALESCE(disposal,'')<>'vanished'"-PRESENT_A = "COALESCE(a.disposal,'')<>'vanished'"+PRESENT = "COALESCE(disposal,'')<>'vanished' AND NOT peach_is_local_trailer(name)"+PRESENT_A = "COALESCE(a.disposal,'')<>'vanished' AND NOT peach_is_local_trailer(a.name)"#: 视频的时长与画质分档,顺序同 `media_probe.context_fields` 的判据:由短到长、由高到低。diff --git a/tests/test_media_probe.py b/tests/test_media_probe.pyindex a73072b60..402556f83 100644--- a/tests/test_media_probe.py+++ b/tests/test_media_probe.py@@ -83,6 +83,14 @@ class ProbeUnmeasuredTests(unittest.TestCase):self.assertEqual(self.probed, [])self.assertIsNone(self.row(pending)[0])+ def test_registered_trailer_is_not_read_or_changed_by_background_probe(self):+ main = self.add(ROOT + r'\ABC-123.mp4')+ trailer = self.add(ROOT + r'\ABC-123-trailer.mp4')+ self.assertEqual(self.probe(), 1)+ self.assertEqual(self.probed, ['ABC-123.mp4'])+ self.assertEqual(self.row(main)[0], 1800)+ self.assertIsNone(self.row(trailer)[0])+def test_without_ffprobe_the_scan_still_finishes_and_leaves_rows_pending(self):pending = self.add(ROOT + r"\a.mp4")self.assertEqual(self.probe(ffprobe=None), 0)diff --git a/tests/test_metadata_library.py b/tests/test_metadata_library.pyindex c07bda809..9bb8b6748 100644--- a/tests/test_metadata_library.py+++ b/tests/test_metadata_library.py@@ -88,6 +88,19 @@ def _archive_pages(url):class LibraryNfoTests(unittest.TestCase):+ def test_collection_selects_main_video_and_preserves_registered_trailer(self):+ from peach.library_processing import _collection_rows+ db = fresh_ledger(self.root)+ with closing(sqlite3.connect(db)) as connection, connection:+ for name in ('ABC-123.mp4', 'ABC-123-trailer.mp4'):+ connection.execute('INSERT INTO asset(location,path,name,medium) VALUES(?,?,?,?)',+ ('local', str(self.root / name), name, 'video'))+ before = db.read_bytes()+ rows, _ = _collection_rows(db, locations={'local': (str(self.root),)},+ online_roots=[self.root], asset_ids=None)+ self.assertEqual([row['name'] for row in rows], ['ABC-123.mp4'])+ self.assertEqual(db.read_bytes(), before)+def test_task_sidecar_index_does_not_walk_the_folder_for_each_video(self):from peach.library_nfo import SidecarIndexclass CountedFiles(dict):diff --git a/tests/test_processing_inventory.py b/tests/test_processing_inventory.pyindex 514cf6b49..7df884975 100644--- a/tests/test_processing_inventory.py+++ b/tests/test_processing_inventory.py@@ -61,6 +61,23 @@ class InventoryTests(unittest.TestCase):self.assertEqual(result['workload']['jav_titles'], 4)self.assertEqual(self.db.read_bytes(), before)+ def test_trailers_are_excluded_from_discovered_and_registered_workloads(self):+ for name in ('ABC-123.mp4', 'ABC-123-trailer.mp4', 'ABC-123.TRAILER.MKV', 'short.mp4'):+ (self.media / name).touch()+ before = self.db.read_bytes()+ discovered = preview(self.config, self.db, 'all', None)+ self.assertEqual(discovered['workload']['video_files'], 2)+ self.assertEqual(discovered['workload']['jav_files'], 1)+ self.assertEqual(self.db.read_bytes(), before)+ with closing(sqlite3.connect(self.db)) as connection, connection:+ for name in ('ABC-123.mp4', 'ABC-123-trailer.mp4'):+ connection.execute('INSERT INTO asset(location,path,name,medium) VALUES(?,?,?,?)',+ ('mounted', 'A:\\Cloud\\' + name, name, 'video'))+ before = self.db.read_bytes()+ registered = preview(self.config, self.db, 'all', None)+ self.assertEqual(registered['workload']['video_files'], 1)+ self.assertEqual(self.db.read_bytes(), before)+def test_each_query_advances_a_batch_and_preserves_deduplication(self):for number in range(1100):(self.media / f'ABW-001-CD{number}.mp4').touch()diff --git a/tests/test_push_discovery.py b/tests/test_push_discovery.pyindex 5ef3a86c2..4b6f6f1ea 100644--- a/tests/test_push_discovery.py+++ b/tests/test_push_discovery.py@@ -387,10 +387,10 @@ class IngestPathTests(_ServiceCase):def test_a_scraper_sidecar_is_found_but_not_registered(self):folder = self.media / "ABC-123"(folder / "extrafanart").mkdir(parents=True)- for name in ("ABC-123.mp4", "ABC-123.nfo", "poster.jpg", "extrafanart/1.jpg"):+ for name in ("ABC-123.mp4", "ABC-123.nfo", "poster.jpg", "extrafanart/1.jpg", "ABC-123-trailer.mp4"):(folder / name).write_bytes(b"0" * 4)kwargs = {"declared_roots": self.declared, "mounts": self.mounts}- for parts in (("ABC-123.nfo",), ("poster.jpg",), ("extrafanart", "1.jpg")):+ for parts in (("ABC-123.nfo",), ("poster.jpg",), ("extrafanart", "1.jpg"), ("ABC-123-trailer.mp4",)):result = scan.ingest_path(self.db, "local", self.ledger("local", "ABC-123", *parts),**kwargs)self.assertEqual((result.found, result.sidecar), (True, True), parts)diff --git a/tests/test_rm_web.py b/tests/test_rm_web.pyindex 5e1c5bbd1..751a4085c 100644--- a/tests/test_rm_web.py+++ b/tests/test_rm_web.py@@ -25,6 +25,24 @@ from support.ledger import fresh_ledgerclass WebDataTests(unittest.TestCase):+ def test_registered_trailers_stay_out_of_catalog_and_counts_without_changing_records(self):+ with self.contract.write_transaction() as connection:+ connection.execute("UPDATE asset SET name='ABC-001.mp4',duration=7200 WHERE id=1")+ connection.execute("UPDATE asset SET name='ABC-001-trailer.mp4',code='ABC-001',"+ "duration=90,play_count=3,rating=4 WHERE id=2")+ with self.contract.read_connection() as connection:+ before = [tuple(row) for row in connection.execute('SELECT * FROM asset ORDER BY id')]+ self.assertEqual([row['id'] for row in q_items(self.contract, {})['items']], [1])+ self.assertEqual(q_items(self.contract, {'q': 'trailer'})['total'], 0)+ groups = rm_web.q_suggest(self.contract, 'trailer')['groups']+ self.assertEqual([row['id'] for group in groups if group['kind'] == 'asset'+ for row in group['items']], [])+ self.assertEqual(rm_web.q_facets(self.contract)['stats']['total'], 1)+ self.assertEqual(rm_web.q_stats(self.contract)['attribution']['videos'], 1)+ self.assertEqual([row['id'] for row in web_catalog._catalog_group_rows(self.contract)], [1])+ with self.contract.read_connection() as connection:+ self.assertEqual([tuple(row) for row in connection.execute('SELECT * FROM asset ORDER BY id')], before)+def test_catalog_projects_dates_and_counts_used_for_table_sorting(self):with self.contract.write_transaction() as connection:connection.execute("UPDATE asset SET first_seen=?,last_played=?,o_count=2,rating=80 WHERE id=1",diff --git a/tests/test_scan.py b/tests/test_scan.pyindex bf5f7f479..9c62a6cb1 100644--- a/tests/test_scan.py+++ b/tests/test_scan.py@@ -307,6 +307,29 @@ class SidecarTests(_ScanCase):r"R:\media\写真\cover.jpg", r"R:\media\写真\extrafanart\1.jpg",r"R:\media\写真\poster-1.jpg"})+ def test_movie_trailers_are_sidecars_and_short_main_features_are_kept(self):+ self._layout(['ABC-123/ABC-123.mp4', 'ABC-123/ABC-123-trailer.mp4',+ 'ABC-123/ABC-123.nfo', 'ABC-123/ABC-123-poster.jpg',+ 'ABC-123/extrafanart/1.jpg', 'ABC-123/ABC-123-short.mp4'])+ result, _ = self._scan(r'R:\media\ABC-123', declared_roots=self.DECLARED,+ mounts={'local': (self.media,)}, windows=False)+ self.assertEqual((result.files, result.sidecars), (2, 4))+ self.assertEqual(set(self._paths()), {+ r'R:\media\ABC-123\ABC-123.mp4', r'R:\media\ABC-123\ABC-123-short.mp4'})+ self.assertTrue((self.media / 'ABC-123/ABC-123-trailer.mp4').is_file())++ def test_trailer_names_use_an_explicit_terminal_marker(self):+ self.assertEqual(scan.video_stems(['ABC-123.mp4', 'ABC-123-trailer.mp4']),+ frozenset({'abc-123'}))+ for name in ('ABC-123-trailer.mp4', 'ABC-123.TRAILER.MKV', 'ABC-123_trailer.mov',+ 'ABC-123 trailer.m4v', 'trailer.mp4'):+ with self.subTest(name=name):+ self.assertTrue(scan.is_sidecar(name, frozenset()))+ for name in ('ABC-123.mp4', 'Trailer Park.mp4', 'ABC-123-trailer-park.mp4',+ 'ABC-123trailer.mp4', 'ABC-123-trailer.mp4.bak', 'trailer.jpg'):+ with self.subTest(name=name):+ self.assertFalse(scan.is_sidecar(name, frozenset()))+def test_the_rule_reads_names_only(self):videos = scan.video_stems(["ABC-1.mp4", "notes.txt"])self.assertEqual(videos, frozenset({"abc-1"}))diff --git a/tests/test_web_library_shortcuts.py b/tests/test_web_library_shortcuts.pyindex 7612cbf05..1c67b5639 100644--- a/tests/test_web_library_shortcuts.py+++ b/tests/test_web_library_shortcuts.py@@ -26,7 +26,7 @@ class LibraryShortcutsTests(unittest.TestCase):CREATE TABLE entity_redirect(old_id INTEGER,target_id INTEGER);CREATE TABLE entity_alias(entity_id INTEGER,alias TEXT);INSERT INTO entity_alias VALUES(3,'故事');- CREATE TABLE asset(id INTEGER PRIMARY KEY,medium TEXT,disposal TEXT,size INTEGER,snapshot_path TEXT);+ CREATE TABLE asset(id INTEGER PRIMARY KEY,medium TEXT,disposal TEXT,size INTEGER,snapshot_path TEXT,name TEXT);CREATE TABLE asset_entity(asset_id INTEGER,entity_id INTEGER,role TEXT);""")self.contract = WebContract(self.path)@@ -75,7 +75,8 @@ class LibraryShortcutsTests(unittest.TestCase):def test_favorites_include_entity_art_logos_and_available_representatives(self):with closing(sqlite3.connect(self.path)) as c, c:- c.execute("INSERT INTO asset VALUES(10,'video',NULL,100,'sample.jpg')")+ c.execute("INSERT INTO asset(id,medium,disposal,size,snapshot_path) "+ "VALUES(10,'video',NULL,100,'sample.jpg')")c.execute("INSERT INTO asset_entity VALUES(10,3,'tag')")with mock.patch.object(WebContract, 'has_logo', return_value=True), \mock.patch.object(WebContract, 'logo_version', return_value='logo-v'), \@@ -89,6 +90,17 @@ class LibraryShortcutsTests(unittest.TestCase):stored = json.loads(c.execute('SELECT settings_json FROM profile').fetchone()[0])self.assertNotIn('image_url', stored['libraryShortcuts']['favorites'][0])+ def test_favorite_representative_uses_the_main_feature(self):+ with closing(sqlite3.connect(self.path)) as c, c:+ c.executemany("INSERT INTO asset(id,name,medium,size,snapshot_path) VALUES(?,?,'video',?,?)", [+ (10, 'ABC-123.mp4', 100, 'main.jpg'),+ (11, 'ABC-123-trailer.mp4', 1000, 'trailer.jpg'),+ ])+ c.executemany("INSERT INTO asset_entity VALUES(?,3,'tag')", [(10,), (11,)])+ with mock.patch.object(WebContract, 'has_avatar', return_value=True):+ tag = self.write(action='favorite', entity_id=3, on=True)['favorites'][0]+ self.assertEqual(tag['image_url'], '/avatar?id=10')+def test_creator_favorite_projects_bound_official_and_archive_avatars(self):from peach.web_catalog import entity_refwith closing(sqlite3.connect(self.path)) as c, c: