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

fix

Browse Source
This commit is contained in:
jxxghp 2024-01-03 21:29:23 +08:00
parent 163a855d5c
commit a60fde3b91
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/modules/emby/emby.py
View File

@ -972,11 +972,14 @@ class Emby(metaclass=Singleton):
link = self.get_play_url(item.get("Id")) link = self.get_play_url(item.get("Id"))
if item_type == MediaType.MOVIE.value: if item_type == MediaType.MOVIE.value:
title = item.get("Name") title = item.get("Name")
subtitle = item.get("Year")
else: else:
if item.get("ParentIndexNumber") == 1: if item.get("ParentIndexNumber") == 1:
title = f'{item.get("SeriesName")} 第{item.get("IndexNumber")}集' title = f'{item.get("SeriesName")}'
subtitle = f'第{item.get("IndexNumber")}集'
else: else:
title = f'{item.get("SeriesName")} 第{item.get("ParentIndexNumber")}季第{item.get("IndexNumber")}集' title = f'{item.get("SeriesName")}'
subtitle = f'第{item.get("ParentIndexNumber")}季 第{item.get("IndexNumber")}集'
if item_type == MediaType.MOVIE.value: if item_type == MediaType.MOVIE.value:
if item.get("BackdropImageTags"): if item.get("BackdropImageTags"):
image = self.__get_backdrop_url(item_id=item.get("Id"), image = self.__get_backdrop_url(item_id=item.get("Id"),
@ -990,7 +993,8 @@ class Emby(metaclass=Singleton):
image = self.__get_local_image_by_id(item.get("SeriesId")) image = self.__get_local_image_by_id(item.get("SeriesId"))
ret_resume.append(schemas.MediaServerPlayItem( ret_resume.append(schemas.MediaServerPlayItem(
id=item.get("Id"), id=item.get("Id"),
name=title, title=title,
subtitle=subtitle,
type=item_type, type=item_type,
image=image, image=image,
link=link, link=link,
@ -1023,7 +1027,7 @@ class Emby(metaclass=Singleton):
image = self.__get_local_image_by_id(item_id=item.get("Id")) image = self.__get_local_image_by_id(item_id=item.get("Id"))
ret_latest.append(schemas.MediaServerPlayItem( ret_latest.append(schemas.MediaServerPlayItem(
id=item.get("Id"), id=item.get("Id"),
name=item.get("Name"), title=item.get("Name"),
type=item_type, type=item_type,
image=image, image=image,
link=link link=link

12
app/modules/jellyfin/jellyfin.py
View File

@ -660,14 +660,18 @@ class Jellyfin(metaclass=Singleton):
image = self.__get_local_image_by_id(item.get("Id")) image = self.__get_local_image_by_id(item.get("Id"))
if item_type == MediaType.MOVIE.value: if item_type == MediaType.MOVIE.value:
title = item.get("Name") title = item.get("Name")
subtitle = item.get("Year")
else: else:
if item.get("ParentIndexNumber") == 1: if item.get("ParentIndexNumber") == 1:
title = f'{item.get("SeriesName")} 第{item.get("IndexNumber")}集' title = f'{item.get("SeriesName")}'
subtitle = f'第{item.get("IndexNumber")}集'
else: else:
title = f'{item.get("SeriesName")} 第{item.get("ParentIndexNumber")}季第{item.get("IndexNumber")}集' title = f'{item.get("SeriesName")}'
subtitle = f'第{item.get("ParentIndexNumber")}季 第{item.get("IndexNumber")}集'
ret_resume.append(schemas.MediaServerPlayItem( ret_resume.append(schemas.MediaServerPlayItem(
id=item.get("Id"), id=item.get("Id"),
name=title, title=title,
subtitle=subtitle,
type=item_type, type=item_type,
image=image, image=image,
link=link, link=link,
@ -700,7 +704,7 @@ class Jellyfin(metaclass=Singleton):
image = self.__get_local_image_by_id(item_id=item.get("Id")) image = self.__get_local_image_by_id(item_id=item.get("Id"))
ret_latest.append(schemas.MediaServerPlayItem( ret_latest.append(schemas.MediaServerPlayItem(
id=item.get("Id"), id=item.get("Id"),
name=item.get("Name"), title=item.get("Name"),
type=item_type, type=item_type,
image=image, image=image,
link=link link=link

14
app/modules/plex/plex.py
View File

@ -612,17 +612,21 @@ class Plex(metaclass=Singleton):
for item in items: for item in items:
item_type = MediaType.MOVIE.value if item.TYPE == "movie" else MediaType.TV.value item_type = MediaType.MOVIE.value if item.TYPE == "movie" else MediaType.TV.value
if item_type == MediaType.MOVIE.value: if item_type == MediaType.MOVIE.value:
name = item.title title = item.title
subtitle = item.year
else: else:
if item.parentIndex == 1: if item.parentIndex == 1:
name = "%s 第%s集" % (item.grandparentTitle, item.index) title = item.grandparentTitle
subtitle = f"第{item.index}集"
else: else:
name = "%s 第%s季第%s集" % (item.grandparentTitle, item.parentIndex, item.index) title = item.grandparentTitle
subtitle = f"第{item.parentIndex}季 第{item.index}集"
link = self.get_play_url(item.key) link = self.get_play_url(item.key)
image = item.artUrl image = item.artUrl
ret_resume.append(schemas.MediaServerPlayItem( ret_resume.append(schemas.MediaServerPlayItem(
id=item.key, id=item.key,
name=name, title=title,
subtitle=subtitle,
type=item_type, type=item_type,
image=image, image=image,
link=link, link=link,
@ -646,7 +650,7 @@ class Plex(metaclass=Singleton):
image = item.posterUrl image = item.posterUrl
ret_resume.append(schemas.MediaServerPlayItem( ret_resume.append(schemas.MediaServerPlayItem(
id=item.key, id=item.key,
name=title, title=title,
type=item_type, type=item_type,
image=image, image=image,
link=link link=link

3
app/schemas/mediaserver.py
View File

@ -150,7 +150,8 @@ class MediaServerPlayItem(BaseModel):
媒体服务器可播放项目信息 媒体服务器可播放项目信息
""" """
id: Optional[Union[str, int]] = None id: Optional[Union[str, int]] = None
name: Optional[str] = None title: Optional[str] = None
subtitle: Optional[str] = None
type: Optional[str] = None type: Optional[str] = None
image: Optional[str] = None image: Optional[str] = None
link: Optional[str] = None link: Optional[str] = None