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

fix(search): 支持单次搜索启用多个媒体数据源，合并显示所有源结果 (#6270)

Browse Source 
- 新增 is_media_source_enabled/is_media_source_selected，请求级 source 支持逗号分隔多数据源，缺省回退全局 SEARCH_SOURCE 配置
- 四个媒体模块的搜索/人物/合集方法统一接入多源判断
- 补充多数据源搜索相关测试
This commit is contained in:
jxxghp
2026-08-11 21:06:52 +08:00
parent 9221f6e74a
commit d7cf853bc8
6 changed files with 143 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/themoviedb/__init__.py
+7 -14
View File
@@ -16,6 +16,7 @@ from app.modules.themoviedb.tmdbapi import TmdbApi
from app.schemas.category import CategoryConfig
from app.schemas.types import MediaType, MediaImageType, ModuleType, MediaRecognizeType
from app.utils.http import RequestUtils
from app.utils.media import is_media_source_enabled, is_media_source_selected
from app.utils.zhconv import convert as zhconv_convert
@@ -744,9 +745,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 媒体信息列表
"""
if source and source != "themoviedb":
return None
if not source and settings.SEARCH_SOURCE and "themoviedb" not in settings.SEARCH_SOURCE:
if not is_media_source_enabled(source, "themoviedb"):
return None
if not meta.name:
return []
@@ -778,9 +777,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 人物信息列表
"""
if source and source != "themoviedb":
return None
if not source and settings.SEARCH_SOURCE and "themoviedb" not in settings.SEARCH_SOURCE:
if not is_media_source_enabled(source, "themoviedb"):
return None
if not name:
return []
@@ -798,9 +795,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 人物信息列表
"""
if source and source != "themoviedb":
return None
if not source and settings.SEARCH_SOURCE and "themoviedb" not in settings.SEARCH_SOURCE:
if not is_media_source_enabled(source, "themoviedb"):
return None
if not name:
return []
@@ -818,7 +813,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 合集信息列表
"""
if source and source != "themoviedb":
if source and not is_media_source_selected(source, "themoviedb"):
return None
if not name:
return []
@@ -836,7 +831,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 合集信息列表
"""
if source and source != "themoviedb":
if source and not is_media_source_selected(source, "themoviedb"):
return None
if not name:
return []
@@ -1232,9 +1227,7 @@ class TheMovieDbModule(_ModuleBase):
:param source: 请求级搜索数据源
:return: 媒体信息列表
"""
if source and source != "themoviedb":
return None
if not source and settings.SEARCH_SOURCE and "themoviedb" not in settings.SEARCH_SOURCE:
if not is_media_source_enabled(source, "themoviedb"):
return None
if not meta.name:
return []