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

fix bug #2993

Browse Source
This commit is contained in:
jxxghp
2024-11-05 10:07:25 +08:00
parent 656cc1fe01
commit 08aa5fe50a
3 changed files with 92 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/emby/__init__.py
+30 -30
View File
@@ -184,10 +184,10 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
媒体数量统计 媒体数量统计
""" """
if server: if server:
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return None return None
servers = [server] servers = [server_obj]
else: else:
servers = self.get_instances().values() servers = self.get_instances().values()
media_statistics = [] media_statistics = []
@@ -205,9 +205,9 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
""" """
媒体库列表 媒体库列表
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if server: if server_obj:
return server.get_librarys(username=username, hidden=hidden) return server_obj.get_librarys(username=username, hidden=hidden)
return None return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0, def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
@@ -222,18 +222,18 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
:return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目 :return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if server: if server_obj:
return server.get_items(library_id, start_index, limit) return server_obj.get_items(library_id, start_index, limit)
return None return None
def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]: def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]:
""" """
媒体库项目详情 媒体库项目详情
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if server: if server_obj:
return server.get_iteminfo(item_id) return server_obj.get_iteminfo(item_id)
return None return None
def mediaserver_tv_episodes(self, server: str, def mediaserver_tv_episodes(self, server: str,
@@ -241,10 +241,10 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
""" """
获取剧集信息 获取剧集信息
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return None return None
_, seasoninfo = server.get_tv_episodes(item_id=item_id) _, seasoninfo = server_obj.get_tv_episodes(item_id=item_id)
if not seasoninfo: if not seasoninfo:
return [] return []
return [schemas.MediaServerSeasonInfo( return [schemas.MediaServerSeasonInfo(
@@ -257,29 +257,29 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
""" """
获取媒体服务器正在播放信息 获取媒体服务器正在播放信息
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_resume(num=count, username=username) return server_obj.get_resume(num=count, username=username)
def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]: def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]:
""" """
获取媒体库播放地址 获取媒体库播放地址
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return None return None
return server.get_play_url(item_id) return server_obj.get_play_url(item_id)
def mediaserver_latest(self, server: str, def mediaserver_latest(self, server: str = None,
count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]: count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]:
""" """
获取媒体服务器最新入库条目 获取媒体服务器最新入库条目
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_latest(num=count, username=username) return server_obj.get_latest(num=count, username=username)
def mediaserver_latest_images(self, def mediaserver_latest_images(self,
server: str = None, server: str = None,
@@ -296,18 +296,18 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
:param host_type: True为外网链接, False为内网链接 :param host_type: True为外网链接, False为内网链接
:return: 图片链接列表 :return: 图片链接列表
""" """
server: Emby = self.get_instance(server) server_obj: Emby = self.get_instance(server)
if not server: if not server_obj:
return [] return []
links = [] links = []
items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(num=count, username=username) items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(server=server, count=count,
username=username)
for item in items: for item in items:
if host_type and item.id: if host_type and item.id:
_link = server.generate_external_image_link(id=item.id, image_type="Backdrop") _link = server_obj.generate_external_image_link(item_id=item.id, image_type="Backdrop")
if _link: if _link:
links.append(_link) links.append(_link)
elif item.image: elif item.image:
links.append(item.image) links.append(item.image)
return links return links
app/modules/jellyfin/__init__.py
+29 -29
View File
@@ -182,10 +182,10 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
媒体数量统计 媒体数量统计
""" """
if server: if server:
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server_obj:
return None return None
servers = [server] servers = [server_obj]
else: else:
servers = self.get_instances().values() servers = self.get_instances().values()
media_statistics = [] media_statistics = []
@@ -203,9 +203,9 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
""" """
媒体库列表 媒体库列表
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if server: if server_obj:
return server.get_librarys(username=username, hidden=hidden) return server_obj.get_librarys(username=username, hidden=hidden)
return None return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0, def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
@@ -220,18 +220,18 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
:return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目 :return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if server: if server_obj:
return server.get_items(library_id, start_index, limit) return server_obj.get_items(library_id, start_index, limit)
return None return None
def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]: def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]:
""" """
媒体库项目详情 媒体库项目详情
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if server: if server_obj:
return server.get_iteminfo(item_id) return server_obj.get_iteminfo(item_id)
return None return None
def mediaserver_tv_episodes(self, server: str, def mediaserver_tv_episodes(self, server: str,
@@ -239,10 +239,10 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
""" """
获取剧集信息 获取剧集信息
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server_obj:
return None return None
_, seasoninfo = server.get_tv_episodes(item_id=item_id) _, seasoninfo = server_obj.get_tv_episodes(item_id=item_id)
if not seasoninfo: if not seasoninfo:
return [] return []
return [schemas.MediaServerSeasonInfo( return [schemas.MediaServerSeasonInfo(
@@ -255,29 +255,29 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
""" """
获取媒体服务器正在播放信息 获取媒体服务器正在播放信息
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_resume(num=count, username=username) return server_obj.get_resume(num=count, username=username)
def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]: def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]:
""" """
获取媒体库播放地址 获取媒体库播放地址
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server_obj:
return None return None
return server.get_play_url(item_id) return server_obj.get_play_url(item_id)
def mediaserver_latest(self, server: str, def mediaserver_latest(self, server: str = None,
count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]: count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]:
""" """
获取媒体服务器最新入库条目 获取媒体服务器最新入库条目
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_latest(num=count, username=username) return server_obj.get_latest(num=count, username=username)
def mediaserver_latest_images(self, def mediaserver_latest_images(self,
server: str = None, server: str = None,
@@ -294,15 +294,15 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
:param host_type: True为外网链接, False为内网链接 :param host_type: True为外网链接, False为内网链接
:return: 图片链接列表 :return: 图片链接列表
""" """
server: Jellyfin = self.get_instance(server) server_obj: Jellyfin = self.get_instance(server)
if not server: if not server:
return [] return []
links = [] links = []
items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(num=count, username=username) items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(server=server, count=count,
username=username)
for item in items: for item in items:
link = server.generate_image_link(item_id=item.id, image_type="Backdrop", host_type=host_type) link = server_obj.generate_image_link(item_id=item.id, image_type="Backdrop", host_type=host_type)
if link: if link:
links.append(link) links.append(link)
return links return links
app/modules/plex/__init__.py
+31 -30
View File
@@ -189,10 +189,10 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
媒体数量统计 媒体数量统计
""" """
if server: if server:
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return None return None
servers = [server] servers = [server_obj]
else: else:
servers = self.get_instances().values() servers = self.get_instances().values()
media_statistics = [] media_statistics = []
@@ -209,9 +209,9 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
""" """
媒体库列表 媒体库列表
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if server: if server_obj:
return server.get_librarys(hidden) return server_obj.get_librarys(hidden)
return None return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0, def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
@@ -226,18 +226,18 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
:return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目 :return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if server: if server_obj:
return server.get_items(library_id, start_index, limit) return server_obj.get_items(library_id, start_index, limit)
return None return None
def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]: def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]:
""" """
媒体库项目详情 媒体库项目详情
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if server: if server_obj:
return server.get_iteminfo(item_id) return server_obj.get_iteminfo(item_id)
return None return None
def mediaserver_tv_episodes(self, server: str, def mediaserver_tv_episodes(self, server: str,
@@ -245,10 +245,10 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
""" """
获取剧集信息 获取剧集信息
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return None return None
_, seasoninfo = server.get_tv_episodes(item_id=item_id) _, seasoninfo = server_obj.get_tv_episodes(item_id=item_id)
if not seasoninfo: if not seasoninfo:
return [] return []
return [schemas.MediaServerSeasonInfo( return [schemas.MediaServerSeasonInfo(
@@ -260,19 +260,20 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
""" """
获取媒体服务器正在播放信息 获取媒体服务器正在播放信息
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_resume(num=count) return server_obj.get_resume(num=count)
def mediaserver_latest(self, server: str, count: int = 20, **kwargs) -> List[schemas.MediaServerPlayItem]: def mediaserver_latest(self, server: str = None, count: int = 20,
**kwargs) -> List[schemas.MediaServerPlayItem]:
""" """
获取媒体服务器最新入库条目 获取媒体服务器最新入库条目
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return [] return []
return server.get_latest(num=count) return server_obj.get_latest(num=count)
def mediaserver_latest_images(self, def mediaserver_latest_images(self,
server: str = None, server: str = None,
@@ -287,26 +288,26 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
:param username: 用户名 :param username: 用户名
:return: 图片链接列表 :return: 图片链接列表
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return [] return []
links = [] links = []
items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(num=count, username=username) items: List[schemas.MediaServerPlayItem] = self.mediaserver_latest(server=server, count=count,
username=username)
for item in items: for item in items:
link = server.get_remote_image_by_id(item_id=item.id, link = server_obj.get_remote_image_by_id(item_id=item.id,
image_type="Backdrop", image_type="Backdrop",
plex_url=False) plex_url=False)
if link: if link:
links.append(link) links.append(link)
return links return links
def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]: def mediaserver_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]:
""" """
获取媒体库播放地址 获取媒体库播放地址
""" """
server: Plex = self.get_instance(server) server_obj: Plex = self.get_instance(server)
if not server: if not server_obj:
return None return None
return server.get_play_url(item_id) return server_obj.get_play_url(item_id)