diff --git a/app/modules/emby/emby.py b/app/modules/emby/emby.py index 59616b9b..10105185 100644 --- a/app/modules/emby/emby.py +++ b/app/modules/emby/emby.py @@ -972,11 +972,14 @@ class Emby(metaclass=Singleton): link = self.get_play_url(item.get("Id")) if item_type == MediaType.MOVIE.value: title = item.get("Name") + subtitle = item.get("Year") else: if item.get("ParentIndexNumber") == 1: - title = f'{item.get("SeriesName")} 第{item.get("IndexNumber")}集' + title = f'{item.get("SeriesName")}' + subtitle = f'第{item.get("IndexNumber")}集' 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.get("BackdropImageTags"): 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")) ret_resume.append(schemas.MediaServerPlayItem( id=item.get("Id"), - name=title, + title=title, + subtitle=subtitle, type=item_type, image=image, link=link, @@ -1023,7 +1027,7 @@ class Emby(metaclass=Singleton): image = self.__get_local_image_by_id(item_id=item.get("Id")) ret_latest.append(schemas.MediaServerPlayItem( id=item.get("Id"), - name=item.get("Name"), + title=item.get("Name"), type=item_type, image=image, link=link diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index f6d85c26..7ce17b3a 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -660,14 +660,18 @@ class Jellyfin(metaclass=Singleton): image = self.__get_local_image_by_id(item.get("Id")) if item_type == MediaType.MOVIE.value: title = item.get("Name") + subtitle = item.get("Year") else: if item.get("ParentIndexNumber") == 1: - title = f'{item.get("SeriesName")} 第{item.get("IndexNumber")}集' + title = f'{item.get("SeriesName")}' + subtitle = f'第{item.get("IndexNumber")}集' 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( id=item.get("Id"), - name=title, + title=title, + subtitle=subtitle, type=item_type, image=image, link=link, @@ -700,7 +704,7 @@ class Jellyfin(metaclass=Singleton): image = self.__get_local_image_by_id(item_id=item.get("Id")) ret_latest.append(schemas.MediaServerPlayItem( id=item.get("Id"), - name=item.get("Name"), + title=item.get("Name"), type=item_type, image=image, link=link diff --git a/app/modules/plex/plex.py b/app/modules/plex/plex.py index d1d64e97..d0c86a2c 100644 --- a/app/modules/plex/plex.py +++ b/app/modules/plex/plex.py @@ -612,17 +612,21 @@ class Plex(metaclass=Singleton): for item in items: item_type = MediaType.MOVIE.value if item.TYPE == "movie" else MediaType.TV.value if item_type == MediaType.MOVIE.value: - name = item.title + title = item.title + subtitle = item.year else: if item.parentIndex == 1: - name = "%s 第%s集" % (item.grandparentTitle, item.index) + title = item.grandparentTitle + subtitle = f"第{item.index}集" 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) image = item.artUrl ret_resume.append(schemas.MediaServerPlayItem( id=item.key, - name=name, + title=title, + subtitle=subtitle, type=item_type, image=image, link=link, @@ -646,7 +650,7 @@ class Plex(metaclass=Singleton): image = item.posterUrl ret_resume.append(schemas.MediaServerPlayItem( id=item.key, - name=title, + title=title, type=item_type, image=image, link=link diff --git a/app/schemas/mediaserver.py b/app/schemas/mediaserver.py index 2bf2d832..582ad2d7 100644 --- a/app/schemas/mediaserver.py +++ b/app/schemas/mediaserver.py @@ -150,7 +150,8 @@ class MediaServerPlayItem(BaseModel): 媒体服务器可播放项目信息 """ id: Optional[Union[str, int]] = None - name: Optional[str] = None + title: Optional[str] = None + subtitle: Optional[str] = None type: Optional[str] = None image: Optional[str] = None link: Optional[str] = None