From 50febd6b2cd7ae50b45ed22328144db7d4d03152 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 24 Oct 2024 07:14:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 9b188489..735b14e7 100644 --- a/update +++ b/update @@ -102,7 +102,7 @@ function install_backend_and_download_resources() { INFO "程序部分更新成功,前端版本:${frontend_version},后端版本:${1}" INFO "开始更新插件..." if ! download_and_unzip "${GITHUB_PROXY}https://github.com/jxxghp/MoviePilot-Plugins/archive/refs/heads/main.zip" "Plugins"; then - cp -a /plugins/* /app/app/plugins/ + cp -a /plugins.v2/* /app/app/plugins/ rm -rf /plugins WARN "插件下载失败,继续使用旧的插件来启动..." return 1 From 119919da51d50803b2569610d8bfdbc44fe3d328 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 24 Oct 2024 09:56:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E9=99=84=E5=B1=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=95=B4=E7=90=86=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filemanager/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/modules/filemanager/__init__.py b/app/modules/filemanager/__init__.py index efd6ee9a..4f099087 100644 --- a/app/modules/filemanager/__init__.py +++ b/app/modules/filemanager/__init__.py @@ -578,6 +578,8 @@ class FileManagerModule(_ModuleBase): # 识别文件名 metainfo = MetaInfoPath(org_path) for sub_item in file_list: + if sub_item.type == "dir" or not sub_item.extension: + continue if f".{sub_item.extension.lower()}" not in settings.RMT_SUBEXT: continue # 识别字幕文件名 @@ -665,7 +667,9 @@ class FileManagerModule(_ModuleBase): return False, f"{org_path} 上级目录获取失败" file_list: List[FileItem] = storage_oper.list(parent_item) # 匹配音轨文件 - pending_file_list: List[FileItem] = [file for file in file_list if Path(file.name).stem == org_path.name + pending_file_list: List[FileItem] = [file for file in file_list + if Path(file.name).stem == org_path.name + and file.type == "file" and file.extension and f".{file.extension.lower()}" in settings.RMT_AUDIOEXT] if len(pending_file_list) == 0: return True, f"{parent_item.path} 目录下没有找到匹配的音轨文件" From e0cfb4fd6d3a940855ac781532d8631ccf7606ab Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 24 Oct 2024 10:38:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E9=87=8D=E5=90=AF=E5=90=8Ev2?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update | 1 + 1 file changed, 1 insertion(+) diff --git a/update b/update index 735b14e7..2a3f7f3f 100644 --- a/update +++ b/update @@ -112,6 +112,7 @@ function install_backend_and_download_resources() { cp -a /plugins/* /app/app/plugins/ # 插件仓库 rsync -av --remove-source-files /tmp/Plugins/plugins/* /app/app/plugins/ > /dev/null + rsync -av --remove-source-files /tmp/Plugins/plugins.v2/* /app/app/plugins/ > /dev/null # 提前安装插件依赖 find /app/app/plugins -name requirements.txt -exec pip install --root-user-action=ignore ${PIP_OPTIONS} -r {} \; > /dev/null # 清理临时目录