fix 修改若看参数名,具体看教程

This commit is contained in:
thsrite
2024-06-25 19:33:57 +08:00
parent 4ce233b7a6
commit ae4139f14c
3 changed files with 52 additions and 47 deletions

View File

@@ -16,12 +16,12 @@
"dest_path": "/mnt/link/movies",
"mount_path": "/mnt/cloud/115/media/movies",
"return_path": "/mnt/softlink/movies",
"delete_local": "false",
"local_preserve_hierarchy": 0,
"delete_dest": "false",
"dest_preserve_hierarchy": 0,
"delete_history": "false",
"delete_source": "false",
"delete_src": "false",
"src_paths": "/mnt/media/movies, /mnt/media/series",
"source_preserve_hierarchy": 0,
"src_preserve_hierarchy": 0,
"just_media": "true",
"overwrite": "false",
"upload_cloud": "true"
@@ -44,12 +44,12 @@
"cloud_path": "/CloudNas",
"cloud_url": "http://localhost:19798",
"cloud_scheme": "http/https",
"delete_local": "false",
"local_preserve_hierarchy": 0,
"delete_dest": "false",
"dest_preserve_hierarchy": 0,
"delete_history": "false",
"delete_source": "false",
"delete_src": "false",
"src_paths": "/mnt/media/movies, /mnt/media/series",
"source_preserve_hierarchy": 0,
"src_preserve_hierarchy": 0,
"just_media": "true",
"overwrite": "false",
"upload_cloud": "true"
@@ -71,12 +71,12 @@ cd2方式上传--softlink回本地暂时移除
"mount_path": "/mnt/cloud/115/media/movies",
"cd2_path": "/115/media/movies",
"return_path": "/mnt/softlink/movies",
"delete_local": "false",
"local_preserve_hierarchy": 0,
"delete_dest": "false",
"dest_preserve_hierarchy": 0,
"delete_history": "false",
"delete_source": "false",
"delete_src": "false",
"src_paths": "/mnt/media/movies, /mnt/media/series",
"source_preserve_hierarchy": 0,
"src_preserve_hierarchy": 0,
"just_media": "true",
"overwrite": "false",
"upload_cloud": "true"
@@ -102,12 +102,12 @@ cd2方式上传--strm回本地暂时移除
"cloud_path": "/CloudNas",
"cloud_url": "http://localhost:19798",
"cloud_scheme": "http/https",
"delete_local": "false",
"local_preserve_hierarchy": 0,
"delete_dest": "false",
"dest_preserve_hierarchy": 0,
"delete_history": "false",
"delete_source": "false",
"delete_src": "false",
"src_paths": "/mnt/media/movies, /mnt/media/series",
"source_preserve_hierarchy": 0,
"src_preserve_hierarchy": 0,
"just_media": "true",
"overwrite": "false",
"upload_cloud": "true"
@@ -117,26 +117,26 @@ cd2方式上传--strm回本地暂时移除
```
- return_mode: 云盘文件回本地模式softlink/strm
- cd2_urlcd2地址
- usernamecd2用户名
- passwordcd2密码
- return_pathMoviePilot中软链接/strm生成路径
- monitor_mode监控模式 compatibility/fast
- tranfer_type转移类型可选值copy/move
- dest_path: MoviePilot本地刮削好的文件路径MoviePilot媒体库目录
- mount_pathMoviePilot中云盘挂载路径
- cd2_pathcd2中云盘挂载路径
- return_pathMoviePilot中软链接/strm生成路径
- monitor_mode监控模式 compatibility/fast
- delete_local是否删除本地文件
- local_preserve_hierarchy保留监控路径目录层级例如 1表示保留监控目录后一层目录结构0表示仅保留到监控目录
- delete_dest是否删除媒体库文件
- dest_preserve_hierarchy保留监控路径目录层级例如 1表示保留监控目录后一层目录结构0表示仅保留到监控目录
- delete_history是否删除MoviePilot中转移历史记录
- delete_source是否删除源文件仅上述监控路径查询到转移记录时才生效删除转移记录的源文件路径
- delete_src是否删除源文件仅上述监控路径查询到转移记录时才生效删除转移记录的源文件路径
- src_paths转移前的源文件路径多个目录用逗号分隔MoviePilot下载目录
- source_preserve_hierarchy保留源文件路径目录层级0表示仅监控到源文件目录1表示监控源文件目录及其一级子目录
- src_preserve_hierarchy保留源文件路径目录层级0表示仅监控到源文件目录1表示监控源文件目录及其一级子目录
-
- just_media是否只监控媒体文件
- overwrite是否覆盖已存在云盘文件
- upload_cloud: 是否上传到云盘,false则直接软连接或者strm回本地
- upload_cloud: 是否上传到云盘, false则直接软连接或者strm回本地
- strm配置具体看[CloudStrm.md](CloudStrm.md)
- library_dirstrm模式下媒体服务器内源文件路径
@@ -144,6 +144,11 @@ cd2方式上传--strm回本地暂时移除
- cloud_pathstrm模式下cd2/alist挂载本地跟路径
- cloud_urlstrm模式下cd2/alist地址
- cloud_schemestrm模式下cd2/alist地址 http/httpsstrm模式可参考云盘Strm生成插件
-
[//]: # (- cd2_urlcd2地址)
[//]: # (- usernamecd2用户名)
[//]: # (- passwordcd2密码)
[//]: # (- cd2_pathcd2中云盘挂载路径)
路径:

View File

@@ -526,7 +526,7 @@
"author": "thsrite",
"level": 3,
"history": {
"v2.0.1": "修改参数名local_path->dest_path、source_dirs->src_paths",
"v2.0.1": "修改若看参数名,具体看教程",
"v2.0": "调整通知图片",
"v1.9": "修复非媒体文件转移bug需要主程序1.9.9+",
"v1.8": "支持可选开启实时监控",

View File

@@ -113,12 +113,12 @@ class CloudAssistant(_PluginBase):
"dest_path": "/mnt/media/movies",
"mount_path": "/mnt/cloud/115/media/movies",
"return_path": "/mnt/softlink/movies",
"delete_local": "false",
"local_preserve_hierarchy": 0,
"delete_dest": "false",
"dest_preserve_hierarchy": 0,
"delete_history": "false",
"delete_source": "false",
"delete_src": "false",
"src_paths": "/mnt/media/movies, /mnt/media/series",
"source_preserve_hierarchy": 0,
"src_preserve_hierarchy": 0,
"just_media": "true",
"overwrite": "false",
"upload_cloud": "true"
@@ -419,14 +419,14 @@ class CloudAssistant(_PluginBase):
mount_path = monitor_dir.get("mount_path")
# cd2_path = monitor_dir.get("cd2_path")
return_path = monitor_dir.get("return_path")
delete_local = monitor_dir.get("delete_local") or "false"
delete_source = monitor_dir.get("delete_source") or "false"
delete_dest = monitor_dir.get("delete_dest") or "false"
delete_src = monitor_dir.get("delete_src") or "false"
delete_history = monitor_dir.get("delete_history") or "false"
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
dest_preserve_hierarchy = monitor_dir.get("dest_preserve_hierarchy") or 0
src_paths = monitor_dir.get("src_paths") or ""
source_preserve_hierarchy = monitor_dir.get("source_preserve_hierarchy") or 0
src_preserve_hierarchy = monitor_dir.get("src_preserve_hierarchy") or 0
# 1、转移到云盘挂载路径 上传到cd2
# 挂载的路径
@@ -503,7 +503,7 @@ class CloudAssistant(_PluginBase):
"file_path": str(file_path),
"target_cloud_file": mount_file,
"target_soft_file": target_return_file,
"delete_local": delete_local,
"delete_dest": delete_dest,
"delete_history": delete_history,
"time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
})
@@ -511,11 +511,11 @@ class CloudAssistant(_PluginBase):
self.save_data(key="history", value=history)
# 移动模式删除空目录
if str(delete_local) == "true":
self.__delete_local_file(file_path, mon_path, local_preserve_hierarchy)
if str(delete_dest) == "true":
self.__delete_dest_file(file_path, mon_path, dest_preserve_hierarchy)
# 是否删除源文件
if str(delete_source) == "true" and transferhis:
self.__delete_source_file(transferhis, src_paths, source_preserve_hierarchy)
if str(delete_src) == "true" and transferhis:
self.__delete_src_file(transferhis, src_paths, src_preserve_hierarchy)
# 发送消息汇总
if self._notify and transferhis:
self.__msg_handler(transferhis)
@@ -541,7 +541,7 @@ class CloudAssistant(_PluginBase):
self.downloadhis.delete_downloadfile(downloadfile.id)
logger.info(f"删除下载文件记录:{downloadfile.id} {transferhis.download_hash}")
def __delete_local_file(self, file_path: Path, mon_path: str, local_preserve_hierarchy: int):
def __delete_dest_file(self, file_path: Path, mon_path: str, dest_preserve_hierarchy: int):
"""
删除监控文件
"""
@@ -551,7 +551,7 @@ class CloudAssistant(_PluginBase):
# 保留层级
mon_path_depth = len(Path(mon_path).parts)
retain_depth = mon_path_depth + int(local_preserve_hierarchy)
retain_depth = mon_path_depth + int(dest_preserve_hierarchy)
for file_dir in file_path.parents:
if len(file_dir.parts) <= retain_depth:
@@ -562,7 +562,7 @@ class CloudAssistant(_PluginBase):
logger.warn(f"删除监控空目录:{file_dir}")
shutil.rmtree(file_dir, ignore_errors=True)
def __delete_source_file(self, transferhis, src_paths, source_preserve_hierarchy):
def __delete_src_file(self, transferhis, src_paths, src_preserve_hierarchy):
"""
删除源文件
"""
@@ -596,7 +596,7 @@ class CloudAssistant(_PluginBase):
if source_path:
# 保留层级
source_path_depth = len(Path(source_path).parts)
retain_depth = source_path_depth + int(source_preserve_hierarchy)
retain_depth = source_path_depth + int(src_preserve_hierarchy)
for file_dir in Path(transferhis.src).parents:
if len(file_dir.parts) <= retain_depth:
@@ -1528,7 +1528,7 @@ class CloudAssistant(_PluginBase):
},
{
'component': 'td',
'text': history.get("delete_local")
'text': history.get("delete_dest")
},
{
'component': 'td',