diff --git a/README.md b/README.md index b9f3a80..24ded91 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/ - 目录监控（统一入库消息增强版） v1.0 - Sql执行器 v1.2 - 命令执行器 v1.2 -- 云盘助手(docs%2FCloudAssistant.md) v2.0 +- 云盘助手(docs%2FCloudAssistant.md) v2.0.1 - CloudDrive2助手 v1.2 - 软连接重定向 v1.0 - 云盘同步删除 v1.1 \ No newline at end of file diff --git a/docs/CloudAssistant.md b/docs/CloudAssistant.md index 6e93c91..92c8f6a 100644 --- a/docs/CloudAssistant.md +++ b/docs/CloudAssistant.md @@ -13,14 +13,14 @@ "monitor_dirs": [ { "monitor_mode": "监控模式 compatibility/fast", - "local_path": "/mnt/link/movies", + "link_path": "/mnt/link/movies", "mount_path": "/mnt/cloud/115/media/movies", "return_path": "/mnt/softlink/movies", "delete_local": "false", "local_preserve_hierarchy": 0, "delete_history": "false", "delete_source": "false", - "source_dirs": "/mnt/media/movies, /mnt/media/series", + "source_paths": "/mnt/media/movies, /mnt/media/series", "source_preserve_hierarchy": 0, "just_media": "true", "overwrite": "false", @@ -36,7 +36,7 @@ "monitor_dirs": [ { "monitor_mode": "监控模式 compatibility/fast", - "local_path": "/mnt/link/movies", + "link_path": "/mnt/link/movies", "mount_path": "/mnt/cloud/115/media/movies", "return_path": "/mnt/strm/movies", "library_dir": "/mnt/movies", @@ -48,7 +48,7 @@ "local_preserve_hierarchy": 0, "delete_history": "false", "delete_source": "false", - "source_dirs": "/mnt/media/movies, /mnt/media/series", + "source_paths": "/mnt/media/movies, /mnt/media/series", "source_preserve_hierarchy": 0, "just_media": "true", "overwrite": "false", @@ -67,7 +67,7 @@ cd2方式上传--softlink回本地（暂时移除） "monitor_dirs": [ { "monitor_mode": "监控模式 compatibility/fast", - "local_path": "/mnt/link/movies", + "link_path": "/mnt/link/movies", "mount_path": "/mnt/cloud/115/media/movies", "cd2_path": "/115/media/movies", "return_path": "/mnt/softlink/movies", @@ -75,7 +75,7 @@ cd2方式上传--softlink回本地（暂时移除） "local_preserve_hierarchy": 0, "delete_history": "false", "delete_source": "false", - "source_dirs": "/mnt/media/movies, /mnt/media/series", + "source_paths": "/mnt/media/movies, /mnt/media/series", "source_preserve_hierarchy": 0, "just_media": "true", "overwrite": "false", @@ -93,7 +93,7 @@ cd2方式上传--strm回本地（暂时移除） "monitor_dirs": [ { "monitor_mode": "监控模式 compatibility/fast", - "local_path": "/mnt/link/movies", + "link_path": "/mnt/link/movies", "mount_path": "/mnt/cloud/115/media/movies", "cd2_path": "/115/media/movies", "return_path": "/mnt/strm/movies", @@ -106,7 +106,7 @@ cd2方式上传--strm回本地（暂时移除） "local_preserve_hierarchy": 0, "delete_history": "false", "delete_source": "false", - "source_dirs": "/mnt/media/movies, /mnt/media/series", + "source_paths": "/mnt/media/movies, /mnt/media/series", "source_preserve_hierarchy": 0, "just_media": "true", "overwrite": "false", @@ -123,7 +123,7 @@ cd2方式上传--strm回本地（暂时移除） - username：cd2用户名 - password：cd2密码 - tranfer_type：转移类型，可选值：copy/move -- local_path: MoviePilot本地上传路径 +- link_path: MoviePilot本地刮削好的文件路径（MoviePilot媒体库目录） - mount_path：MoviePilot中云盘挂载路径 - cd2_path：cd2中云盘挂载路径 - return_path：MoviePilot中软链接/strm生成路径 @@ -132,7 +132,7 @@ cd2方式上传--strm回本地（暂时移除） - local_preserve_hierarchy：保留监控路径目录层级，例如 1：表示保留监控目录后一层目录结构，0：表示仅保留到监控目录 - delete_history：是否删除MoviePilot中转移历史记录 - delete_source：是否删除源文件，仅上述监控路径查询到转移记录时才生效，删除转移记录的源文件路径 -- source_dirs：源文件的目录，多个目录用逗号分隔 +- source_paths：转移前的源文件路径，多个目录用逗号分隔（MoviePilot下载目录） - source_preserve_hierarchy：保留源文件路径目录层级，0：表示仅监控到源文件目录，1：表示监控源文件目录及其一级子目录 - just_media：是否只监控媒体文件 - overwrite：是否覆盖已存在云盘文件 diff --git a/package.json b/package.json index 8e32d80..1216022 100644 --- a/package.json +++ b/package.json @@ -521,11 +521,12 @@ "name": "云盘助手", "description": "本地文件定时转移到云盘，软连接/strm回本地，定时清理无效软连接。", "labels": "云盘", - "version": "2.0", + "version": "2.0.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png", "author": "thsrite", "level": 3, "history": { + "v2.0.1": "修改参数名local_path->link_path、source_dirs->source_paths", "v2.0": "调整通知图片", "v1.9": "修复非媒体文件转移bug（需要主程序1.9.9+）", "v1.8": "支持可选开启实时监控", diff --git a/plugins/cloudassistant/__init__.py b/plugins/cloudassistant/__init__.py index a8d0af3..fcac365 100644 --- a/plugins/cloudassistant/__init__.py +++ b/plugins/cloudassistant/__init__.py @@ -64,7 +64,7 @@ class CloudAssistant(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png" # 插件版本 - plugin_version = "2.0" + plugin_version = "2.0.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -110,14 +110,14 @@ class CloudAssistant(_PluginBase): "monitor_dirs": [ { "monitor_mode": "模式 compatibility/fast", - "local_path": "/mnt/media/movies", + "link_path": "/mnt/media/movies", "mount_path": "/mnt/cloud/115/media/movies", "return_path": "/mnt/softlink/movies", "delete_local": "false", "local_preserve_hierarchy": 0, "delete_history": "false", "delete_source": "false", - "source_dirs": "/mnt/media/movies, /mnt/media/series", + "source_paths": "/mnt/media/movies, /mnt/media/series", "source_preserve_hierarchy": 0, "just_media": "true", "overwrite": "false", @@ -225,8 +225,11 @@ class CloudAssistant(_PluginBase): if not monitor_dir: continue - mon_path = monitor_dir.get("local_path") + # 读取监控目录配置 + mon_path = monitor_dir.get("link_path") + # 云盘挂载路径 target_path = monitor_dir.get("mount_path") + # 监控模式 monitor_mode = monitor_dir.get("monitor_mode") or "compatibility" self._dirconf[mon_path] = monitor_dir @@ -422,7 +425,7 @@ class CloudAssistant(_PluginBase): overwrite = monitor_dir.get("overwrite") or "false" upload_cloud = monitor_dir.get("upload_cloud") or "true" local_preserve_hierarchy = monitor_dir.get("local_preserve_hierarchy") or 0 - source_dirs = monitor_dir.get("source_dirs") or "" + source_paths = monitor_dir.get("source_paths") or "" source_preserve_hierarchy = monitor_dir.get("source_preserve_hierarchy") or 0 # 1、转移到云盘挂载路径 上传到cd2 @@ -512,7 +515,7 @@ class CloudAssistant(_PluginBase): self.__delete_local_file(file_path, mon_path, local_preserve_hierarchy) # 是否删除源文件 if str(delete_source) == "true" and transferhis: - self.__delete_source_file(transferhis, source_dirs, source_preserve_hierarchy) + self.__delete_source_file(transferhis, source_paths, source_preserve_hierarchy) # 发送消息汇总 if self._notify and transferhis: self.__msg_handler(transferhis) @@ -559,7 +562,7 @@ class CloudAssistant(_PluginBase): logger.warn(f"删除监控空目录：{file_dir}") shutil.rmtree(file_dir, ignore_errors=True) - def __delete_source_file(self, transferhis, source_dirs, source_preserve_hierarchy): + def __delete_source_file(self, transferhis, source_paths, source_preserve_hierarchy): """ 删除源文件 """ @@ -581,7 +584,7 @@ class CloudAssistant(_PluginBase): # 源文件保留层级 source_path = None - for source_dir in source_dirs.split(","): + for source_dir in source_paths.split(","): source_dir = source_dir.strip() if not source_dir: continue