From 5718b33fd83c48062da8fec6e76a42f4b4b3ff8b Mon Sep 17 00:00:00 2001 From: yubanmeiqin9048 <64676973+yubanmeiqin9048@users.noreply.github.com> Date: Thu, 10 Aug 2023 23:03:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=20=E7=9B=AE=E5=BD=95=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E6=94=AF=E6=8C=81=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/plugins/dirmonitor/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py index e70c4acc..d74f8202 100644 --- a/app/plugins/dirmonitor/__init__.py +++ b/app/plugins/dirmonitor/__init__.py @@ -1,3 +1,4 @@ +import re import threading import traceback from pathlib import Path @@ -157,7 +158,7 @@ class DirMonitor(_PluginBase): # 命中过滤关键字不处理 if self._exclude_keywords: for keyword in self._exclude_keywords.split("\n"): - if keyword and keyword in event_path: + if keyword and re.findall(keyword, event_path): logger.debug(f"{event_path} 命中过滤关键字 {keyword}") return From d717222f4cc38c44914e97d1b2533b96d6156e7e Mon Sep 17 00:00:00 2001 From: yubanmeiqin9048 <64676973+yubanmeiqin9048@users.noreply.github.com> Date: Thu, 10 Aug 2023 23:04:10 +0800 Subject: [PATCH 2/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1d0542a3..fec9f808 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ docker pull jxxghp/moviepilot:latest - **DOWNLOAD_MOVIE_PATH:** 电影下载保存目录,**必须是DOWNLOAD_PATH的下级路径**,不设置则下载到DOWNLOAD_PATH - **DOWNLOAD_TV_PATH:** 电视剧下载保存目录,**必须是DOWNLOAD_PATH的下级路径**,不设置则下载到DOWNLOAD_PATH - **DOWNLOAD_CATEGORY:** 下载二级分类开关,`true`/`false`,默认`false`,开启后会根据配置`category.yaml`自动在下载目录下建立二级目录分类 -- **REFRESH_MEDIASERVER:** 入库刷新媒体库,默认`True` -- **SCRAP_METADATA:** 刮削入库的媒体文件,默认`True` +- **REFRESH_MEDIASERVER:** 入库刷新媒体库,`true`/`false`,默认`true` +- **SCRAP_METADATA:** 刮削入库的媒体文件,`true`/`false`,默认`true` - **TORRENT_TAG:** 种子标签,默认为`MOVIEPILOT`,设置后只有MoviePilot添加的下载才会处理,留空所有下载器中的任务均会处理 - **LIBRARY_PATH:** 媒体库目录,多个目录使用`,`分隔 - **LIBRARY_MOVIE_NAME:** 电影媒体库目录名,默认`电影`