fix 首页继续观看、最近添加排除黑名单媒体库

app/chain/mediaserver.py

@@ -48,13 +48,33 @@ class MediaServerChain(ChainBase):
         """
         获取媒体服务器正在播放信息
         """
-        return self.run_module("mediaserver_playing", count=count, server=server, username=username)
+        playing_items = self.run_module("mediaserver_playing", count=100, server=server, username=username)
+        # 判断是否在同步的媒体数据中
+        exists_items = []
+        for item in playing_items:
+            if self.dboper.exists(mtype=item.type,
+                                  title=item.title,
+                                  year=item.year):
+                exists_items.append(item)
+                if len(exists_items) == count:
+                    break
+        return exists_items
 
     def latest(self, count: int = 20, server: str = None, username: str = None) -> List[schemas.MediaServerPlayItem]:
         """
         获取媒体服务器最新入库条目
         """
-        return self.run_module("mediaserver_latest", count=count, server=server, username=username)
+        latest_items = self.run_module("mediaserver_latest", count=100, server=server, username=username)
+        # 判断是否在同步的媒体数据中
+        exists_items = []
+        for item in latest_items:
+            if self.dboper.exists(mtype=item.type,
+                                  title=item.title,
+                                  year=item.subtitle):
+                exists_items.append(item)
+                if len(exists_items) == count:
+                    break
+        return exists_items
 
     def get_play_url(self, server: str, item_id: Union[str, int]) -> Optional[str]:
         """

app/modules/emby/emby.py

@@ -1002,6 +1002,7 @@ class Emby(metaclass=Singleton):
                     ret_resume.append(schemas.MediaServerPlayItem(
                         id=item.get("Id"),
                         title=title,
+                        year=item.get("ProductionYear"),
                         subtitle=subtitle,
                         type=item_type,
                         image=image,

app/modules/jellyfin/jellyfin.py

@@ -679,6 +679,7 @@ class Jellyfin(metaclass=Singleton):
                     ret_resume.append(schemas.MediaServerPlayItem(
                         id=item.get("Id"),
                         title=title,
+                        year=item.get("ProductionYear"),
                         subtitle=subtitle,
                         type=item_type,
                         image=image,

app/modules/plex/plex.py

@@ -626,6 +626,7 @@ class Plex(metaclass=Singleton):
             ret_resume.append(schemas.MediaServerPlayItem(
                 id=item.key,
                 title=title,
+                year=item.year,
                 subtitle=subtitle,
                 type=item_type,
                 image=image,

app/schemas/mediaserver.py

@@ -151,6 +151,7 @@ class MediaServerPlayItem(BaseModel):
     """
     id: Optional[Union[str, int]] = None
     title: Optional[str] = None
+    year: Optional[str] = None
     subtitle: Optional[str] = None
     type: Optional[str] = None
     image: Optional[str] = None