From dcb057c7fa5828be8ce5261451aed35c3b6f8f66 Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 28 Jun 2024 22:28:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 3 ++- plugins/cloudlinkmonitor/__init__.py | 9 ++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 34f41aa..5c28ebf 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/ - [Emby观影报告 v1.5](docs%2FEmbyReporter.md) - 演员订阅 v2.1 - [短剧刮削 v3.2](docs%2FShortPlayMonitor.md) -- 云盘实时监控 v2.2 +- 云盘实时监控 v2.3 - 源文件恢复 v1.2 - [微信消息转发 v2.7](docs%2FWeChatForward.md) - 订阅下载统计 v1.5 diff --git a/package.json b/package.json index 4b35d01..64be5aa 100644 --- a/package.json +++ b/package.json @@ -254,11 +254,12 @@ "name": "云盘实时监控", "description": "监控云盘目录文件变化，自动转移链接。", "labels": "云盘", - "version": "2.2", + "version": "2.3", "icon": "Linkease_A.png", "author": "thsrite", "level": 1, "history": { + "v2.3": "去除无效变量", "v2.2": "优化配置一二级分类流程", "v2.1": "可配置是否存储转移记录", "v2.0": "修复不刮削不生效bug", diff --git a/plugins/cloudlinkmonitor/__init__.py b/plugins/cloudlinkmonitor/__init__.py index 73da69e..bc44b44 100644 --- a/plugins/cloudlinkmonitor/__init__.py +++ b/plugins/cloudlinkmonitor/__init__.py @@ -60,7 +60,7 @@ class CloudLinkMonitor(_PluginBase): # 插件图标 plugin_icon = "Linkease_A.png" # 插件版本 - plugin_version = "2.2" + plugin_version = "2.3" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -491,10 +491,9 @@ class CloudLinkMonitor(_PluginBase): self.chain.obtain_images(mediainfo=mediainfo) # 刮削单个文件 - if settings.SCRAP_METADATA: - self.chain.scrape_metadata(path=transferinfo.target_path, - mediainfo=mediainfo, - transfer_type=transfer_type) + self.chain.scrape_metadata(path=transferinfo.target_path, + mediainfo=mediainfo, + transfer_type=transfer_type) """ { "title_year season": { From 896be2ea8a337c1b591c84fed545a4f78d70cd12 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 30 Jun 2024 19:35:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20CloudLinkMonitorv2.4=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 3 +- plugins/cloudlinkmonitor/__init__.py | 303 ++++++++++++++++----------- 3 files changed, 179 insertions(+), 129 deletions(-) diff --git a/README.md b/README.md index 5c28ebf..e261643 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/ - [Emby观影报告 v1.5](docs%2FEmbyReporter.md) - 演员订阅 v2.1 - [短剧刮削 v3.2](docs%2FShortPlayMonitor.md) -- 云盘实时监控 v2.3 +- 云盘实时监控 v2.4 - 源文件恢复 v1.2 - [微信消息转发 v2.7](docs%2FWeChatForward.md) - 订阅下载统计 v1.5 diff --git a/package.json b/package.json index 64be5aa..2313b57 100644 --- a/package.json +++ b/package.json @@ -254,11 +254,12 @@ "name": "云盘实时监控", "description": "监控云盘目录文件变化，自动转移链接。", "labels": "云盘", - "version": "2.3", + "version": "2.4", "icon": "Linkease_A.png", "author": "thsrite", "level": 1, "history": { + "v2.4": "修复二级目录", "v2.3": "去除无效变量", "v2.2": "优化配置一二级分类流程", "v2.1": "可配置是否存储转移记录", diff --git a/plugins/cloudlinkmonitor/__init__.py b/plugins/cloudlinkmonitor/__init__.py index bc44b44..a2f53a9 100644 --- a/plugins/cloudlinkmonitor/__init__.py +++ b/plugins/cloudlinkmonitor/__init__.py @@ -25,7 +25,7 @@ from app.db.transferhistory_oper import TransferHistoryOper from app.log import logger from app.modules.filetransfer import FileTransferModule from app.plugins import _PluginBase -from app.schemas import Notification, NotificationType, TransferInfo +from app.schemas import NotificationType, TransferInfo from app.schemas.types import EventType, MediaType, SystemConfigKey from app.utils.string import StringUtils from app.utils.system import SystemUtils @@ -60,7 +60,7 @@ class CloudLinkMonitor(_PluginBase): # 插件图标 plugin_icon = "Linkease_A.png" # 插件版本 - plugin_version = "2.3" + plugin_version = "2.4" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -82,6 +82,9 @@ class CloudLinkMonitor(_PluginBase): _enabled = False _notify = False _onlyonce = False + _history = False + _scrape = False + _category = False _cron = None filetransfer = None _size = 0 @@ -96,9 +99,6 @@ class CloudLinkMonitor(_PluginBase): _dirconf: Dict[str, Optional[Path]] = {} # 存储源目录转移方式 _transferconf: Dict[str, Optional[str]] = {} - _scraperconf: Dict[str, Optional[bool]] = {} - _historyconf: Dict[str, Optional[bool]] = {} - _categoryconf: Dict[str, Optional[bool]] = {} _medias = {} # 退出事件 _event = threading.Event() @@ -112,15 +112,15 @@ class CloudLinkMonitor(_PluginBase): # 清空配置 self._dirconf = {} self._transferconf = {} - self._scraperconf = {} - self._historyconf = {} - self._categoryconf = {} # 读取配置 if config: self._enabled = config.get("enabled") self._notify = config.get("notify") self._onlyonce = config.get("onlyonce") + self._history = config.get("history") + self._scrape = config.get("scrape") + self._category = config.get("category") self._mode = config.get("mode") self._transfer_type = config.get("transfer_type") self._monitor_dirs = config.get("monitor_dirs") or "" @@ -135,8 +135,9 @@ class CloudLinkMonitor(_PluginBase): if self._enabled or self._onlyonce: # 定时服务管理器 self._scheduler = BackgroundScheduler(timezone=settings.TZ) - # 追加入库消息统一发送服务 - self._scheduler.add_job(self.send_msg, trigger='interval', seconds=15) + if self._notify: + # 追加入库消息统一发送服务 + self._scheduler.add_job(self.send_msg, trigger='interval', seconds=15) # 读取目录配置 monitor_dirs = self._monitor_dirs.split("\n") @@ -147,27 +148,6 @@ class CloudLinkMonitor(_PluginBase): if not mon_path: continue - # 是否添加一级二级分类 - _category = True - if mon_path.count("@") == 1: - _category = mon_path.split("@")[1] - _category = True if _category == "True" else False - mon_path = mon_path.split("@")[0] - - # 是否存储历史记录 - _history = True - if mon_path.count("%") == 1: - _history = mon_path.split("%")[1] - _history = True if _history == "True" else False - mon_path = mon_path.split("%")[0] - - # 是否刮削 - _scraper_type = False - if mon_path.count("$") == 1: - _scraper_type = mon_path.split("$")[1] - _scraper_type = True if _scraper_type == "True" else False - mon_path = mon_path.split("$")[0] - # 自定义转移方式 _transfer_type = self._transfer_type if mon_path.count("#") == 1: @@ -193,15 +173,6 @@ class CloudLinkMonitor(_PluginBase): else: self._dirconf[mon_path] = None - # 是否二级分类 - self._categoryconf[mon_path] = _category - - # 是否存历史 - self._historyconf[mon_path] = _history - - # 是否刮削 - self._scraperconf[mon_path] = _scraper_type - # 转移方式 self._transferconf[mon_path] = _transfer_type @@ -228,20 +199,20 @@ class CloudLinkMonitor(_PluginBase): observer.schedule(FileMonitorHandler(mon_path, self), path=mon_path, recursive=True) observer.daemon = True observer.start() - logger.info(f"{mon_path} 的目录监控服务启动") + logger.info(f"{mon_path} 的云盘实时监控服务启动") except Exception as e: err_msg = str(e) if "inotify" in err_msg and "reached" in err_msg: logger.warn( - f"目录监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启：" + f"云盘实时监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启：" + """ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_instances=524288 | sudo tee -a /etc/sysctl.conf sudo sysctl -p """) else: - logger.error(f"{mon_path} 启动目录监控失败：{err_msg}") - self.systemmessage.put(f"{mon_path} 启动目录监控失败：{err_msg}") + logger.error(f"{mon_path} 启动目云盘实时监控失败：{err_msg}") + self.systemmessage.put(f"{mon_path} 启动云盘实时监控失败：{err_msg}") # 运行一次定时服务 if self._onlyonce: @@ -274,7 +245,9 @@ class CloudLinkMonitor(_PluginBase): "monitor_dirs": self._monitor_dirs, "exclude_keywords": self._exclude_keywords, "interval": self._interval, - "cron": self._cron, + "history": self._history, + "category": self._category, + "scrape": self._scrape, "size": self._size }) @@ -288,24 +261,24 @@ class CloudLinkMonitor(_PluginBase): if not event_data or event_data.get("action") != "cloud_link_sync": return self.post_message(channel=event.event_data.get("channel"), - title="开始同步监控目录 ...", + title="开始同步云盘实时监控目录 ...", userid=event.event_data.get("user")) self.sync_all() if event: self.post_message(channel=event.event_data.get("channel"), - title="监控目录同步完成！", userid=event.event_data.get("user")) + title="云盘实时监控目录同步完成！", userid=event.event_data.get("user")) def sync_all(self): """ 立即运行一次，全量同步目录中所有文件 """ - logger.info("开始全量同步监控目录 ...") + logger.info("开始全量同步云盘实时监控目录 ...") # 遍历所有监控目录 for mon_path in self._dirconf.keys(): # 遍历目录下所有文件 for file_path in SystemUtils.list_files(Path(mon_path), settings.RMT_MEDIAEXT): self.__handle_file(event_path=str(file_path), mon_path=mon_path) - logger.info("全量同步监控目录完成！") + logger.info("全量同步云盘实时监控目录完成！") def event_handler(self, event, mon_path: str, text: str, event_path: str): """ @@ -393,12 +366,6 @@ class CloudLinkMonitor(_PluginBase): target: Path = self._dirconf.get(mon_path) # 查询转移方式 transfer_type = self._transferconf.get(mon_path) - # 是否刮削 - scraper_type = self._scraperconf.get(mon_path) - # 是否存历史 - history_type = self._historyconf.get(mon_path) - # 是否添加二级分类 - category_type = self._categoryconf.get(mon_path) # 识别媒体信息 mediainfo: MediaInfo = self.chain.recognize_media(meta=file_meta) @@ -433,22 +400,17 @@ class CloudLinkMonitor(_PluginBase): else: episodes_info = None - if category_type: - # 转移 - transferinfo: TransferInfo = self.chain.transfer(mediainfo=mediainfo, - path=file_path, - transfer_type=transfer_type, - target=target, - meta=file_meta, - episodes_info=episodes_info) - else: - # 转移 - transferinfo: TransferInfo = self.filetransfer.transfer_media(in_path=file_path, - in_meta=file_meta, - mediainfo=mediainfo, - transfer_type=transfer_type, - target_dir=target, - episodes_info=episodes_info) + if self._category and mediainfo.category: + target = target / mediainfo.category + + # 转移文件 + transferinfo: TransferInfo = self.filetransfer.transfer_media(in_path=file_path, + in_meta=file_meta, + mediainfo=mediainfo, + transfer_type=transfer_type, + target_dir=target, + episodes_info=episodes_info, + need_scrape=self._scrape) if not transferinfo: logger.error("文件转移模块运行失败") return @@ -457,7 +419,7 @@ class CloudLinkMonitor(_PluginBase): # 转移失败 logger.warn(f"{file_path.name} 入库失败：{transferinfo.message}") - if history_type: + if self._history: # 新增转移失败历史记录 self.transferhis.add_fail( src_path=file_path, @@ -475,7 +437,7 @@ class CloudLinkMonitor(_PluginBase): ) return - if history_type: + if self._history: # 新增转移成功历史记录 self.transferhis.add_success( src_path=file_path, @@ -486,7 +448,7 @@ class CloudLinkMonitor(_PluginBase): ) # 刮削 - if scraper_type: + if self._scrape: # 更新媒体图片 self.chain.obtain_images(mediainfo=mediainfo) @@ -509,49 +471,50 @@ class CloudLinkMonitor(_PluginBase): } } """ - # 发送消息汇总 - media_list = self._medias.get(mediainfo.title_year + " " + file_meta.season) or {} - if media_list: - media_files = media_list.get("files") or [] - if media_files: - file_exists = False - for file in media_files: - if str(file_path) == file.get("path"): - file_exists = True - break - if not file_exists: - media_files.append({ - "path": str(file_path), - "mediainfo": mediainfo, - "file_meta": file_meta, - "transferinfo": transferinfo - }) + if self._notify: + # 发送消息汇总 + media_list = self._medias.get(mediainfo.title_year + " " + file_meta.season) or {} + if media_list: + media_files = media_list.get("files") or [] + if media_files: + file_exists = False + for file in media_files: + if str(file_path) == file.get("path"): + file_exists = True + break + if not file_exists: + media_files.append({ + "path": str(file_path), + "mediainfo": mediainfo, + "file_meta": file_meta, + "transferinfo": transferinfo + }) + else: + media_files = [ + { + "path": str(file_path), + "mediainfo": mediainfo, + "file_meta": file_meta, + "transferinfo": transferinfo + } + ] + media_list = { + "files": media_files, + "time": datetime.datetime.now() + } else: - media_files = [ - { - "path": str(file_path), - "mediainfo": mediainfo, - "file_meta": file_meta, - "transferinfo": transferinfo - } - ] - media_list = { - "files": media_files, - "time": datetime.datetime.now() - } - else: - media_list = { - "files": [ - { - "path": str(file_path), - "mediainfo": mediainfo, - "file_meta": file_meta, - "transferinfo": transferinfo - } - ], - "time": datetime.datetime.now() - } - self._medias[mediainfo.title_year + " " + file_meta.season] = media_list + media_list = { + "files": [ + { + "path": str(file_path), + "mediainfo": mediainfo, + "file_meta": file_meta, + "transferinfo": transferinfo + } + ], + "time": datetime.datetime.now() + } + self._medias[mediainfo.title_year + " " + file_meta.season] = media_list # 广播事件 self.eventmanager.send_event(EventType.TransferComplete, { @@ -752,6 +715,64 @@ class CloudLinkMonitor(_PluginBase): } ] }, + { + 'component': 'VForm', + 'content': [ + { + 'component': 'VRow', + 'content': [ + { + 'component': 'VCol', + 'props': { + 'cols': 12, + 'md': 4 + }, + 'content': [ + { + 'component': 'VSwitch', + 'props': { + 'model': 'history', + 'label': '存储历史记录', + } + } + ] + }, + { + 'component': 'VCol', + 'props': { + 'cols': 12, + 'md': 4 + }, + 'content': [ + { + 'component': 'VSwitch', + 'props': { + 'model': 'scrape', + 'label': '是否刮削', + } + } + ] + }, + { + 'component': 'VCol', + 'props': { + 'cols': 12, + 'md': 4 + }, + 'content': [ + { + 'component': 'VSwitch', + 'props': { + 'model': 'category', + 'label': '二级目录', + } + } + ] + } + ] + } + ] + }, { 'component': 'VRow', 'content': [ @@ -829,11 +850,38 @@ class CloudLinkMonitor(_PluginBase): }, 'content': [ { - 'component': 'VTextField', + 'component': 'VSelect', 'props': { - 'model': 'cron', - 'label': '定时全量同步周期', - 'placeholder': '5位cron表达式，留空关闭' + 'model': 'mode', + 'label': '监控模式', + 'items': [ + {'title': '兼容模式', 'value': 'compatibility'}, + {'title': '性能模式', 'value': 'fast'} + ] + } + } + ] + }, + { + 'component': 'VCol', + 'props': { + 'cols': 12, + 'md': 4 + }, + 'content': [ + { + 'component': 'VSelect', + 'props': { + 'model': 'transfer_type', + 'label': '转移方式', + 'items': [ + {'title': '移动', 'value': 'move'}, + {'title': '复制', 'value': 'copy'}, + {'title': '硬链接', 'value': 'link'}, + {'title': '软链接', 'value': 'filesoftlink'}, + {'title': 'Rclone复制', 'value': 'rclone_copy'}, + {'title': 'Rclone移动', 'value': 'rclone_move'} + ] } } ] @@ -848,9 +896,9 @@ class CloudLinkMonitor(_PluginBase): { 'component': 'VTextField', 'props': { - 'model': 'size', - 'label': '监控文件大小（GB）', - 'placeholder': '0' + 'model': 'interval', + 'label': '入库消息延迟', + 'placeholder': '10' } } ] @@ -874,9 +922,7 @@ class CloudLinkMonitor(_PluginBase): 'rows': 5, 'placeholder': '每一行一个目录，支持以下几种配置方式，转移方式支持 move、copy、link、softlink、rclone_copy、rclone_move：\n' '监控目录:转移目的目录\n' - '监控目录:转移目的目录$是否刮削（True/False）\n' '监控目录:转移目的目录#转移方式\n' - '监控目录:转移目的目录#转移方式$是否刮削（True/False）\n' } } ] @@ -919,7 +965,7 @@ class CloudLinkMonitor(_PluginBase): 'props': { 'type': 'info', 'variant': 'tonal', - 'text': '监控目录增加`@False/True`，默认True，拼接一级二级目录，False则不拼接一级二级目录。' + 'text': '入库消息延迟默认10s，如网络较慢可酌情调大，有助于发送统一入库消息。' } } ] @@ -940,7 +986,7 @@ class CloudLinkMonitor(_PluginBase): 'props': { 'type': 'info', 'variant': 'tonal', - 'text': '入库消息延迟默认10s，如网络较慢可酌情调大，有助于发送统一入库消息。' + 'text': '插件自定义转移后电影、电视剧、动漫根目录，不走设定--目录设置。' } } ] @@ -974,6 +1020,9 @@ class CloudLinkMonitor(_PluginBase): "enabled": False, "notify": False, "onlyonce": False, + "history": False, + "scrape": False, + "category": False, "mode": "fast", "transfer_type": settings.TRANSFER_TYPE, "monitor_dirs": "", From dd06c2f00def1cd90d5761df62e21703197cbdac Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 30 Jun 2024 19:35:54 +0800 Subject: [PATCH 3/6] fix ui --- plugins/cloudlinkmonitor/__init__.py | 66 ---------------------------- 1 file changed, 66 deletions(-) diff --git a/plugins/cloudlinkmonitor/__init__.py b/plugins/cloudlinkmonitor/__init__.py index a2f53a9..f315afa 100644 --- a/plugins/cloudlinkmonitor/__init__.py +++ b/plugins/cloudlinkmonitor/__init__.py @@ -839,72 +839,6 @@ class CloudLinkMonitor(_PluginBase): } ] }, - { - 'component': 'VRow', - 'content': [ - { - 'component': 'VCol', - 'props': { - 'cols': 12, - 'md': 4 - }, - 'content': [ - { - 'component': 'VSelect', - 'props': { - 'model': 'mode', - 'label': '监控模式', - 'items': [ - {'title': '兼容模式', 'value': 'compatibility'}, - {'title': '性能模式', 'value': 'fast'} - ] - } - } - ] - }, - { - 'component': 'VCol', - 'props': { - 'cols': 12, - 'md': 4 - }, - 'content': [ - { - 'component': 'VSelect', - 'props': { - 'model': 'transfer_type', - 'label': '转移方式', - 'items': [ - {'title': '移动', 'value': 'move'}, - {'title': '复制', 'value': 'copy'}, - {'title': '硬链接', 'value': 'link'}, - {'title': '软链接', 'value': 'filesoftlink'}, - {'title': 'Rclone复制', 'value': 'rclone_copy'}, - {'title': 'Rclone移动', 'value': 'rclone_move'} - ] - } - } - ] - }, - { - 'component': 'VCol', - 'props': { - 'cols': 12, - 'md': 4 - }, - 'content': [ - { - 'component': 'VTextField', - 'props': { - 'model': 'interval', - 'label': '入库消息延迟', - 'placeholder': '10' - } - } - ] - } - ] - }, { 'component': 'VRow', 'content': [ From 4a51ee96b5172644561b92b38d5708627c04c8c0 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 30 Jun 2024 19:36:34 +0800 Subject: [PATCH 4/6] fix ui --- plugins/cloudlinkmonitor/__init__.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/plugins/cloudlinkmonitor/__init__.py b/plugins/cloudlinkmonitor/__init__.py index f315afa..f30caf3 100644 --- a/plugins/cloudlinkmonitor/__init__.py +++ b/plugins/cloudlinkmonitor/__init__.py @@ -906,27 +906,6 @@ class CloudLinkMonitor(_PluginBase): } ] }, - { - 'component': 'VRow', - 'content': [ - { - 'component': 'VCol', - 'props': { - 'cols': 12, - }, - 'content': [ - { - 'component': 'VAlert', - 'props': { - 'type': 'info', - 'variant': 'tonal', - 'text': '插件自定义转移后电影、电视剧、动漫根目录，不走设定--目录设置。' - } - } - ] - } - ] - }, { 'component': 'VRow', 'content': [ From 898a1fe83b2a61274a2684e116cc0bbec1a11898 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 30 Jun 2024 19:46:22 +0800 Subject: [PATCH 5/6] fix log --- docs/CloudAssistant.md | 24 ------------------------ plugins/cloudassistant/__init__.py | 13 +++++++------ 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/docs/CloudAssistant.md b/docs/CloudAssistant.md index 1adbc8d..18121d0 100644 --- a/docs/CloudAssistant.md +++ b/docs/CloudAssistant.md @@ -3,30 +3,6 @@ ### 使用说明 提供四种方式，具体看示例 - -2.0.1版本修改以下标注的字段名称，字段顺序没变，按序修改即可。 -{ - "transfer_type": "copy/move", - "return_mode": "softlink", - "monitor_dirs": [ - { - "monitor_mode": "监控模式 compatibility/fast", - `"dest_path": "/mnt/link/movies",` - "mount_path": "/mnt/cloud/115/media/movies", - "return_path": "/mnt/softlink/movies", - `"delete_dest": "false",` - `"dest_preserve_hierarchy": 0,` - "delete_history": "false", - `"delete_src": "false",` - `"src_paths": "/mnt/media/movies, /mnt/media/series",` - `"src_preserve_hierarchy": 0,` - `"only_media": "true",` - "overwrite": "false", - "upload_cloud": "true" - } - ] -} - ``` 直接转移--softlink回本地 diff --git a/plugins/cloudassistant/__init__.py b/plugins/cloudassistant/__init__.py index 4b60daf..c1c1336 100644 --- a/plugins/cloudassistant/__init__.py +++ b/plugins/cloudassistant/__init__.py @@ -239,7 +239,7 @@ class CloudAssistant(_PluginBase): if target_path and Path(target_path).is_relative_to(Path(mon_path)): logger.warn(f"{target_path} 是监控目录 {mon_path} 的子目录，无法监控") self.systemmessage.put(f"{target_path} 是下载目录 {mon_path} 的子目录，无法监控", - title="目录监控") + title="云盘助手媒体库监控") continue except Exception as e: logger.debug(str(e)) @@ -256,24 +256,25 @@ class CloudAssistant(_PluginBase): observer.schedule(CloudFileMonitorHandler(mon_path, self), path=mon_path, recursive=True) observer.daemon = True observer.start() - logger.info(f"{mon_path} 的目录监控服务启动") + logger.info(f"{mon_path} 的云盘助手媒体库监控服务启动") except Exception as e: err_msg = str(e) if "inotify" in err_msg and "reached" in err_msg: logger.warn( - f"目录监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启：" + f"云盘助手媒体库监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启：" + """ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_instances=524288 | sudo tee -a /etc/sysctl.conf sudo sysctl -p """) else: - logger.error(f"{mon_path} 启动目录监控失败：{err_msg}") - self.systemmessage.put(f"{mon_path} 启动目录监控失败：{err_msg}", title="目录监控") + logger.error(f"{mon_path} 启动云盘助手媒体库监控失败：{err_msg}") + self.systemmessage.put(f"{mon_path} 启动云盘助手媒体库监控失败：{err_msg}", + title="云盘助手媒体库监控") # 运行一次定时服务 if self._onlyonce: - logger.info("目录监控服务启动，立即运行一次") + logger.info("云盘助手媒体库监控服务启动，立即运行一次") self._scheduler.add_job(func=self.sync_all, trigger='date', run_date=datetime.datetime.now( tz=pytz.timezone(settings.TZ)) + datetime.timedelta(seconds=3) From 9ec1e73e5a582aec6ab13f86d2b34f1b115adc78 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 30 Jun 2024 20:35:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E8=A6=86=E7=9B=96?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 3 ++- plugins/cloudassistant/__init__.py | 13 ++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e261643..fd86695 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.5 +- 云盘助手(docs%2FCloudAssistant.md) v2.0.6 - CloudDrive2助手 v1.2 - 软连接重定向 v1.0 - 云盘同步删除 v1.3 diff --git a/package.json b/package.json index 2313b57..788c815 100644 --- a/package.json +++ b/package.json @@ -524,11 +524,12 @@ "name": "云盘助手", "description": "本地文件定时转移到云盘，软连接/strm回本地，定时清理无效软连接。", "labels": "云盘", - "version": "2.0.5", + "version": "2.0.6", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png", "author": "thsrite", "level": 3, "history": { + "v2.0.6": "修复覆盖模式操作", "v2.0.5": "修复媒体文件转移完但刮削文件未转移删除目录的问题", "v2.0.4": "修复挂载目录log", "v2.0.3": "修复默认值bug", diff --git a/plugins/cloudassistant/__init__.py b/plugins/cloudassistant/__init__.py index c1c1336..8130dd1 100644 --- a/plugins/cloudassistant/__init__.py +++ b/plugins/cloudassistant/__init__.py @@ -65,7 +65,7 @@ class CloudAssistant(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png" # 插件版本 - plugin_version = "2.0.5" + plugin_version = "2.0.6" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -440,7 +440,10 @@ class CloudAssistant(_PluginBase): if Path(mount_file).exists(): logger.info(f"云盘文件 {mount_file} 已存在且未开启覆盖，跳过上传") upload = False - + else: + if Path(mount_file).exists(): + logger.info(f"云盘文件 {mount_file} 已存在且开启覆盖，删除原云盘文件") + Path(mount_file).unlink() if upload: # 媒体文件转移 if Path(file_path).suffix.lower() in [ext.strip() for ext in @@ -593,6 +596,7 @@ class CloudAssistant(_PluginBase): continue if transferhis.src.startswith(source_dir): source_path = source_dir + logger.info(f"获取到源文件 {transferhis.src} 根目录 {source_path}") break # 删除源文件空目录 @@ -751,11 +755,6 @@ class CloudAssistant(_PluginBase): os.makedirs(target_file) return 1 else: - # 文件 - if Path(target_file).exists(): - logger.info(f"目标文件 {target_file} 已存在") - return 1 - if not Path(target_file).parent.exists(): logger.info(f"创建目标文件夹 {Path(target_file).parent}") os.makedirs(Path(target_file).parent)