This commit is contained in:
jxxghp 2024-05-28 08:16:51 +08:00
parent 7defcff0e5
commit dd40ef54c0
6 changed files with 12 additions and 5 deletions

View File

@ -27,7 +27,10 @@ def play_item(itemid: str) -> schemas.Response:
return schemas.Response(success=False, msg="参数错误")
if not settings.MEDIASERVER:
return schemas.Response(success=False, msg="未配置媒体服务器")
mediaserver = settings.MEDIASERVER.split(",")[0]
# 查找一个不为空的值
mediaserver = next((server for server in settings.MEDIASERVER.split(",") if server), None)
if not mediaserver:
return schemas.Response(success=False, msg="未配置媒体服务器")
play_url = MediaServerChain().get_play_url(server=mediaserver, item_id=itemid)
# 重定向到play_url
if not play_url:

View File

@ -80,6 +80,8 @@ class MediaServerChain(ChainBase):
self.dboper.empty()
# 遍历媒体服务器
for mediaserver in mediaservers:
if not mediaserver:
continue
logger.info(f"开始同步媒体库 {mediaserver} 的数据 ...")
for library in self.librarys(mediaserver):
# 同步黑名单 跳过

View File

@ -359,7 +359,7 @@ class Settings(BaseSettings):
"""
if not self.DOWNLOADER:
return None
return self.DOWNLOADER.split(",")[0]
return next((d for d in settings.DOWNLOADER.split(",") if d), None)
@property
def DOWNLOADERS(self):
@ -368,7 +368,7 @@ class Settings(BaseSettings):
"""
if not self.DOWNLOADER:
return []
return self.DOWNLOADER.split(",")
return [d for d in settings.DOWNLOADER.split(",") if d]
def __init__(self, **kwargs):
super().__init__(**kwargs)

View File

@ -619,6 +619,8 @@ class PluginManager(metaclass=Singleton):
with concurrent.futures.ThreadPoolExecutor() as executor:
futures = []
for m in settings.PLUGIN_MARKET.split(","):
if not m:
continue
futures.append(executor.submit(__get_plugin_info, m))
for future in concurrent.futures.as_completed(futures):
plugins = future.result()

View File

@ -338,7 +338,7 @@ class FilterModule(_ModuleBase):
info_values = [str(info_value).upper()]
# 过滤值转化为数组
if value.find(",") != -1:
values = [str(val).upper() for val in value.split(",")]
values = [str(val).upper() for val in value.split(",") if val]
else:
values = [str(value).upper()]
# 没有交集为不匹配

View File

@ -126,7 +126,7 @@ class CategoryHelper(metaclass=Singleton):
info_values = [str(info_value).upper()]
if value.find(",") != -1:
values = [str(val).upper() for val in value.split(",")]
values = [str(val).upper() for val in value.split(",") if val]
else:
values = [str(value).upper()]