codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #536

Browse Source
This commit is contained in:
jxxghp
2023-09-10 17:35:58 +08:00
parent 1bd7b5c77e
commit afb5874350
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/chain/transfer.py
View File

@ -175,12 +175,17 @@ class TransferChain(ChainBase):
continue continue
# 整理屏蔽词不处理 # 整理屏蔽词不处理
is_blocked = False
if transfer_exclude_words: if transfer_exclude_words:
for keyword in transfer_exclude_words: for keyword in transfer_exclude_words:
if not keyword: if not keyword:
continue continue
if keyword and re.findall(keyword, file_path_str): if keyword and re.search(r"%s" % keyword, file_path_str, re.IGNORECASE):
logger.info(f"{file_path} 命中整理屏蔽词 {keyword}，不处理") logger.info(f"{file_path} 命中整理屏蔽词 {keyword}，不处理")
is_blocked = True
break
if is_blocked:
err_msgs.append(f"{file_path.name} 命中整理屏蔽词")
continue continue
# 转移成功的不再处理 # 转移成功的不再处理

2
app/plugins/dirmonitor/__init__.py
View File

@ -223,7 +223,7 @@ class DirMonitor(_PluginBase):
for keyword in transfer_exclude_words: for keyword in transfer_exclude_words:
if not keyword: if not keyword:
continue continue
if keyword and re.findall(keyword, event_path): if keyword and re.search(r"%s" % keyword, event_path, re.IGNORECASE):
logger.info(f"{event_path} 命中整理屏蔽词 {keyword}，不处理") logger.info(f"{event_path} 命中整理屏蔽词 {keyword}，不处理")
return return