mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-08-15 19:14:01 +08:00
a2e70b443d
* wip(v3): 移植监控与整理韧性修复到 v3 基线 包含：监控看门狗隔离/挂载探测、整理队列持久化、文件系统子进程代理、 写入原子化。迁移重挂到 v3 链 8a4c7e1d2f90 -> 7f5c1d2e3a4b -> e3d9f4b7c806。 tmdb 相关测试尚未通过，待定位。 * fix(v3): 修正移植引入的 16 项测试失败 - poller.py：合并时我方保留的行仍用旧变量名 merged_snapshot，而 v3 已统一 改名为 current_snapshot，导致 NameError 被外层 except 吞掉、快照从未保存 - smb.py：采纳 f-string 拆分写法，恢复 Python 3.11 可解析 - dispatcher 测试：历史查重由 _should_skip_by_history 统一承担，mock 点随之调整 - tmdb 缓存测试：补充 v3 新增的 media_source/media_id 字段 - tmdb 重试测试：为 fake 补充 match_multi/async_match_multi 尚余 3 项与 v3 识别流程的连接失败处理有关，待单独判断。 * fix(v3): 测试适配 v3 的 media_source/media_id 重构 v3 将媒体标识从 tmdbid 统一重构为 media_source + media_id，recognize_media 的 tmdbid 参数已被 **kwargs 静默吞掉——传了也不生效，流程会误降级到名称搜索。 tmdb 重试用例改用新参数后恢复正确路径。 同时修正 fake 的 match_multi 语义：真实实现（tmdbapi.match_multi）吞掉所有 异常并返回 None，连接失败与「未找到」在该路径上本就不可区分，fake 需保持一致。 至此移植引入的 19 项失败全部清零。 --------- Co-authored-by: Aqr-K <Aqr-K@users.noreply.github.com>
349 lines
10 KiB
Python
349 lines
10 KiB
Python
from pathlib import Path
|
|
from unittest.mock import MagicMock
|
|
|
|
from watchfiles import Change
|
|
|
|
from app.monitor import DirectoryChangeEvent, LocalDirectoryWatcher, Monitor
|
|
from app.monitor.dispatcher import TransferDispatcher
|
|
from app.schemas import TransferDirectoryConf
|
|
from app.schemas.types import MediaType
|
|
|
|
|
|
class CallbackRecorder:
|
|
"""
|
|
测试用目录监控回调记录器。
|
|
"""
|
|
|
|
def __init__(self):
|
|
"""
|
|
初始化事件记录列表。
|
|
"""
|
|
self.events = []
|
|
|
|
def event_handler(self, event, text: str, event_path: str, file_size: int = None):
|
|
"""
|
|
记录目录监控分发出来的事件。
|
|
:param event: 目录监控事件
|
|
:param text: 事件描述
|
|
:param event_path: 事件路径
|
|
:param file_size: 文件大小
|
|
"""
|
|
self.events.append((event, text, event_path, file_size))
|
|
|
|
|
|
def _build_monitor_with_dispatcher(handle_file: MagicMock = None):
|
|
"""
|
|
构造带分发器的测试用 Monitor 骨架。
|
|
:param handle_file: 替换分发器 handle_file 的替身
|
|
:return: (Monitor 骨架, 分发器)
|
|
"""
|
|
monitor = object.__new__(Monitor)
|
|
dispatcher = TransferDispatcher(all_exts=[".mkv"], cache={})
|
|
if handle_file is not None:
|
|
dispatcher.handle_file = handle_file
|
|
monitor._dispatcher = dispatcher
|
|
return monitor, dispatcher
|
|
|
|
|
|
def test_handle_changes_dispatches_added_and_modified_files(tmp_path):
|
|
"""
|
|
新增和修改文件应转换成目录监控整理回调。
|
|
"""
|
|
added_file = tmp_path / "a_added.mkv"
|
|
modified_file = tmp_path / "b_modified.mkv"
|
|
skipped_dir = tmp_path / "c_dir"
|
|
added_file.write_bytes(b"added")
|
|
modified_file.write_bytes(b"modified")
|
|
skipped_dir.mkdir()
|
|
|
|
callback = CallbackRecorder()
|
|
watcher = LocalDirectoryWatcher(tmp_path, callback=callback, force_polling=True)
|
|
watcher._handle_changes({
|
|
(Change.added, added_file.as_posix()),
|
|
(Change.modified, modified_file.as_posix()),
|
|
(Change.deleted, added_file.as_posix()),
|
|
(Change.added, skipped_dir.as_posix()),
|
|
})
|
|
|
|
assert len(callback.events) == 2
|
|
assert (
|
|
Change.added,
|
|
"新增",
|
|
added_file.as_posix(),
|
|
5,
|
|
) == (
|
|
callback.events[0][0].change_type,
|
|
callback.events[0][1],
|
|
callback.events[0][2],
|
|
callback.events[0][3],
|
|
)
|
|
assert (
|
|
Change.modified,
|
|
"修改",
|
|
modified_file.as_posix(),
|
|
8,
|
|
) == (
|
|
callback.events[1][0].change_type,
|
|
callback.events[1][1],
|
|
callback.events[1][2],
|
|
callback.events[1][3],
|
|
)
|
|
|
|
|
|
def test_handle_changes_skips_missing_paths(tmp_path):
|
|
"""
|
|
事件到达时已经消失的路径不应触发整理。
|
|
"""
|
|
missing_file = tmp_path / "missing.mkv"
|
|
|
|
callback = CallbackRecorder()
|
|
watcher = LocalDirectoryWatcher(tmp_path, callback=callback, force_polling=True)
|
|
watcher._handle_changes({(Change.added, missing_file.as_posix())})
|
|
|
|
assert callback.events == []
|
|
|
|
|
|
def test_handle_changes_expands_added_directory_files(tmp_path):
|
|
"""
|
|
整体移入的新增目录应递归转换成内部文件事件且不重复分发。
|
|
"""
|
|
added_dir = tmp_path / "task"
|
|
nested_dir = added_dir / "season"
|
|
nested_dir.mkdir(parents=True)
|
|
movie_file = added_dir / "movie.mkv"
|
|
episode_file = nested_dir / "episode.mkv"
|
|
ignored_file = added_dir / ".DS_Store"
|
|
movie_file.write_bytes(b"movie")
|
|
episode_file.write_bytes(b"episode")
|
|
ignored_file.write_bytes(b"ignored")
|
|
|
|
callback = CallbackRecorder()
|
|
watcher = LocalDirectoryWatcher(tmp_path, callback=callback, force_polling=False)
|
|
watcher._handle_changes({
|
|
(Change.added, added_dir.as_posix()),
|
|
(Change.added, movie_file.as_posix()),
|
|
})
|
|
|
|
assert [
|
|
(event.change_type, event_path, file_size)
|
|
for event, _, event_path, file_size in callback.events
|
|
] == [
|
|
(Change.added, movie_file.as_posix(), 5),
|
|
(Change.added, episode_file.as_posix(), 7),
|
|
]
|
|
|
|
|
|
def test_event_handler_routes_file_events_to_transfer_handler():
|
|
"""
|
|
文件事件应继续按 local 存储交给整理流程。
|
|
"""
|
|
handle_file = MagicMock()
|
|
monitor, _ = _build_monitor_with_dispatcher(handle_file)
|
|
event_path = Path("/downloads/movie.mkv")
|
|
event = DirectoryChangeEvent(
|
|
change_type=Change.added,
|
|
src_path=event_path.as_posix(),
|
|
is_directory=False
|
|
)
|
|
|
|
monitor.event_handler(
|
|
event=event,
|
|
text="新增",
|
|
event_path=event_path.as_posix(),
|
|
file_size=1024
|
|
)
|
|
|
|
handle_file.assert_called_once_with(
|
|
storage="local",
|
|
event_path=event_path,
|
|
file_size=1024
|
|
)
|
|
|
|
|
|
def test_event_handler_ignores_directory_events():
|
|
"""
|
|
目录事件不应进入文件整理流程。
|
|
"""
|
|
handle_file = MagicMock()
|
|
monitor, _ = _build_monitor_with_dispatcher(handle_file)
|
|
event_path = Path("/downloads/folder")
|
|
event = DirectoryChangeEvent(
|
|
change_type=Change.added,
|
|
src_path=event_path.as_posix(),
|
|
is_directory=True
|
|
)
|
|
|
|
monitor.event_handler(
|
|
event=event,
|
|
text="新增",
|
|
event_path=event_path.as_posix()
|
|
)
|
|
|
|
handle_file.assert_not_called()
|
|
|
|
|
|
def test_event_handler_ignores_download_temp_files():
|
|
"""
|
|
下载器临时文件不应进入整理流程。
|
|
"""
|
|
handle_file = MagicMock()
|
|
monitor, _ = _build_monitor_with_dispatcher(handle_file)
|
|
event_path = Path("/downloads/movie.mkv.!qB")
|
|
event = DirectoryChangeEvent(
|
|
change_type=Change.modified,
|
|
src_path=event_path.as_posix(),
|
|
is_directory=False
|
|
)
|
|
|
|
monitor.event_handler(
|
|
event=event,
|
|
text="修改",
|
|
event_path=event_path.as_posix(),
|
|
file_size=1024
|
|
)
|
|
|
|
handle_file.assert_not_called()
|
|
|
|
|
|
def test_event_handler_ignores_non_transferable_files():
|
|
"""
|
|
非可整理后缀文件不应进入整理流程。
|
|
"""
|
|
handle_file = MagicMock()
|
|
monitor, _ = _build_monitor_with_dispatcher(handle_file)
|
|
event_path = Path("/downloads/movie.nfo")
|
|
event = DirectoryChangeEvent(
|
|
change_type=Change.added,
|
|
src_path=event_path.as_posix(),
|
|
is_directory=False
|
|
)
|
|
|
|
monitor.event_handler(
|
|
event=event,
|
|
text="新增",
|
|
event_path=event_path.as_posix(),
|
|
file_size=1024
|
|
)
|
|
|
|
handle_file.assert_not_called()
|
|
|
|
|
|
def test_handle_file_skips_transfer_when_history_exists(monkeypatch):
|
|
"""
|
|
已有整理记录的源文件不应再次进入整理链。
|
|
"""
|
|
dispatcher = TransferDispatcher(all_exts=[".mkv"], cache={})
|
|
event_path = Path("/downloads/movie.mkv")
|
|
lookups = []
|
|
|
|
class FakeTransferHistoryOper:
|
|
"""
|
|
测试用整理历史查询。
|
|
"""
|
|
|
|
def get_by_src(self, src: str, storage: str = None):
|
|
"""
|
|
记录查询参数并返回已有记录。
|
|
"""
|
|
lookups.append((src, storage))
|
|
return object()
|
|
|
|
transfer_chain = MagicMock()
|
|
logger_info = MagicMock()
|
|
logger_debug = MagicMock()
|
|
monkeypatch.setattr("app.monitor.dispatcher.TransferHistoryOper", FakeTransferHistoryOper)
|
|
monkeypatch.setattr("app.monitor.dispatcher.TransferChain", transfer_chain)
|
|
monkeypatch.setattr("app.monitor.dispatcher.logger.info", logger_info)
|
|
monkeypatch.setattr("app.monitor.dispatcher.logger.debug", logger_debug)
|
|
|
|
handled = dispatcher.handle_file(
|
|
storage="local",
|
|
event_path=event_path,
|
|
file_size=1024,
|
|
)
|
|
|
|
assert not handled
|
|
assert lookups == [(event_path.as_posix(), "local")]
|
|
transfer_chain.assert_not_called()
|
|
logger_info.assert_not_called()
|
|
logger_debug.assert_not_called()
|
|
|
|
|
|
def test_handle_file_invokes_transfer_when_history_missing(monkeypatch):
|
|
"""
|
|
没有整理记录的源文件应继续进入整理链。
|
|
"""
|
|
dispatcher = TransferDispatcher(all_exts=[".mkv"], cache={})
|
|
event_path = Path("/downloads/movie.mkv")
|
|
|
|
class FakeTransferHistoryOper:
|
|
"""
|
|
测试用空整理历史查询。
|
|
"""
|
|
|
|
def get_by_src(self, src: str, storage: str = None):
|
|
"""
|
|
返回空整理记录。
|
|
"""
|
|
return None
|
|
|
|
transfer_chain_instance = MagicMock()
|
|
transfer_chain = MagicMock(return_value=transfer_chain_instance)
|
|
monkeypatch.setattr("app.monitor.dispatcher.TransferHistoryOper", FakeTransferHistoryOper)
|
|
monkeypatch.setattr("app.monitor.dispatcher.TransferChain", transfer_chain)
|
|
|
|
handled = dispatcher.handle_file(
|
|
storage="local",
|
|
event_path=event_path,
|
|
file_size=1024,
|
|
)
|
|
|
|
assert handled
|
|
transfer_chain_instance.do_transfer.assert_called_once()
|
|
fileitem = transfer_chain_instance.do_transfer.call_args.kwargs["fileitem"]
|
|
assert fileitem.storage == "local"
|
|
assert fileitem.path == event_path.as_posix()
|
|
assert fileitem.size == 1024
|
|
|
|
|
|
def test_handle_file_prefers_music_type_from_monitor_directory(monkeypatch):
|
|
"""音乐目录监控触发整理时应透传音乐类型，避免音频按影视名称识别。"""
|
|
dispatcher = TransferDispatcher(all_exts=[".flac"], cache={})
|
|
event_path = Path("/downloads/music/album/track.flac")
|
|
directories = [
|
|
TransferDirectoryConf(
|
|
storage="local",
|
|
download_path="/downloads",
|
|
media_type=MediaType.MOVIE.value,
|
|
monitor_type="monitor",
|
|
),
|
|
TransferDirectoryConf(
|
|
storage="local",
|
|
download_path="/downloads/music",
|
|
media_type=MediaType.MUSIC.value,
|
|
monitor_type="monitor",
|
|
),
|
|
]
|
|
transfer_chain_instance = MagicMock()
|
|
|
|
# 历史查重已由 _should_skip_by_history 统一承担（含失败重试预算与版本变化判定），
|
|
# 这里放行以便验证 mtype 的传递
|
|
monkeypatch.setattr(dispatcher, "_should_skip_by_history", MagicMock(return_value=False))
|
|
monkeypatch.setattr(
|
|
"app.monitor.dispatcher.DirectoryHelper",
|
|
MagicMock(return_value=MagicMock(get_download_dirs=MagicMock(return_value=directories))),
|
|
)
|
|
monkeypatch.setattr(
|
|
"app.monitor.dispatcher.TransferChain",
|
|
MagicMock(return_value=transfer_chain_instance),
|
|
)
|
|
|
|
handled = dispatcher.handle_file(
|
|
storage="local",
|
|
event_path=event_path,
|
|
file_size=1024,
|
|
)
|
|
|
|
assert handled
|
|
assert transfer_chain_instance.do_transfer.call_args.kwargs["mtype"] == MediaType.MUSIC
|