nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-03-20 03:57:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #5573 from wikrin/refactor-static-methods-conversion"

Browse Source 
This reverts commit b8fc20b981, reversing
changes made to e09cfc6704.
This commit is contained in:
jxxghp
2026-03-14 18:21:31 +08:00
parent f38cb274e4
commit 6065c29891
20 changed files with 79 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/chain/transfer.py
View File

@@ -988,12 +988,12 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
if not task.target_directory:
if task.target_path:
# 指定目标路径，`手动整理`场景下使用，忽略源目录匹配，使用指定目录匹配
task.target_directory = DirectoryHelper.get_dir(media=task.mediainfo,
task.target_directory = DirectoryHelper().get_dir(media=task.mediainfo,
dest_path=task.target_path,
target_storage=task.target_storage)
else:
# 启用源目录匹配时，根据源目录匹配下载目录，否则按源目录同盘优先原则，如无源目录，则根据媒体信息获取目标目录
task.target_directory = DirectoryHelper.get_dir(media=task.mediainfo,
task.target_directory = DirectoryHelper().get_dir(media=task.mediainfo,
storage=task.fileitem.storage,
src_path=Path(task.fileitem.path),
target_storage=task.target_storage)
@@ -1077,7 +1077,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
# 全局锁，避免定时服务重复
with downloader_lock:
# 获取下载器监控目录
download_dirs = DirectoryHelper.get_download_dirs()
download_dirs = DirectoryHelper().get_download_dirs()
# 如果没有下载器监控的目录则不处理
if not any(dir_info.monitor_type == "downloader" and dir_info.storage == "local"