GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 07:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2' into v2

Browse Source
This commit is contained in:
jxxghp
2025-01-17 20:31:40 +08:00
parent 35cc214492 bae7bff70d
commit 3e692c790e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/__init__.py
+3
View File
@@ -531,6 +531,9 @@ class ChainBase(metaclass=ABCMeta):
# 管理员发过了，此消息不发了 # 管理员发过了，此消息不发了
logger.info(f"用户 {send_message.username} 不存在，消息无法发送到对应用户") logger.info(f"用户 {send_message.username} 不存在，消息无法发送到对应用户")
continue continue
elif send_message.username == settings.SUPERUSER:
# 管理员同名已发送
admin_sended = True
else: else:
# 按原消息发送全体 # 按原消息发送全体
if not admin_sended: if not admin_sended:
app/modules/filemanager/__init__.py
+5 -1
View File
@@ -1262,7 +1262,11 @@ class FileManagerModule(_ModuleBase):
fileitem = storage_oper.get_item(media_path) fileitem = storage_oper.get_item(media_path)
if not fileitem: if not fileitem:
continue continue
media_files = self.list_files(fileitem, True) try:
media_files = self.list_files(fileitem, True)
except Exception as e:
logger.debug(f"获取媒体文件列表失败：{str(e)}")
continue
if media_files: if media_files:
for media_file in media_files: for media_file in media_files:
if f".{media_file.extension.lower()}" in settings.RMT_MEDIAEXT: if f".{media_file.extension.lower()}" in settings.RMT_MEDIAEXT: