diff --git a/app/chain/mediaserver.py b/app/chain/mediaserver.py index a252f162..0c61b9f3 100644 --- a/app/chain/mediaserver.py +++ b/app/chain/mediaserver.py @@ -28,7 +28,7 @@ class MediaServerChain(ChainBase): """ return self.run_module("mediaserver_librarys", server=server) - def items(self, server: str, library_id: Union[str, int]) -> Generator[schemas.MediaServerItem]: + def items(self, server: str, library_id: Union[str, int]) -> List[schemas.MediaServerItem]: """ 获取媒体服务器所有项目 """ diff --git a/app/modules/emby/__init__.py b/app/modules/emby/__init__.py index 932d6d68..3a3d0c9c 100644 --- a/app/modules/emby/__init__.py +++ b/app/modules/emby/__init__.py @@ -130,7 +130,7 @@ class EmbyModule(_ModuleBase): return None return self.emby.get_librarys() - def mediaserver_items(self, server: str, library_id: str) -> Optional[Generator[schemas.MediaServerItem]]: + def mediaserver_items(self, server: str, library_id: str) -> Optional[List[schemas.MediaServerItem]]: """ 媒体库项目列表 """ @@ -138,7 +138,7 @@ class EmbyModule(_ModuleBase): return None return self.emby.get_items(library_id) - def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[Generator[schemas.MediaServerItem]]: + def mediaserver_iteminfo(self, server: str, item_id: str) -> Optional[schemas.MediaServerItem]: """ 媒体库项目详情 """ diff --git a/app/modules/emby/emby.py b/app/modules/emby/emby.py index a120d74b..68ce28a7 100644 --- a/app/modules/emby/emby.py +++ b/app/modules/emby/emby.py @@ -514,7 +514,7 @@ class Emby(metaclass=Singleton): logger.error(f"连接Items/Id出错:" + str(e)) return None - def get_items(self, parent: str) -> Generator[Optional[schemas.MediaServerItem]]: + def get_items(self, parent: str) -> Generator: """ 获取媒体服务器所有媒体库列表 """ diff --git a/app/modules/jellyfin/__init__.py b/app/modules/jellyfin/__init__.py index 41c10241..db5c53c3 100644 --- a/app/modules/jellyfin/__init__.py +++ b/app/modules/jellyfin/__init__.py @@ -128,7 +128,7 @@ class JellyfinModule(_ModuleBase): path=library.get("path") ) for library in librarys] - def mediaserver_items(self, server: str, library_id: str) -> Optional[Generator[schemas.MediaServerItem]]: + def mediaserver_items(self, server: str, library_id: str) -> Optional[List[schemas.MediaServerItem]]: """ 媒体库项目列表 """ diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index 73cbe420..2bd326ee 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -523,7 +523,7 @@ class Jellyfin(metaclass=Singleton): logger.error(f"连接Users/Items出错:" + str(e)) return None - def get_items(self, parent: str) -> Generator[schemas.MediaServerItem]: + def get_items(self, parent: str) -> Generator: """ 获取媒体服务器所有媒体库列表 """ diff --git a/app/modules/plex/__init__.py b/app/modules/plex/__init__.py index 1dabd525..af0ad7f9 100644 --- a/app/modules/plex/__init__.py +++ b/app/modules/plex/__init__.py @@ -122,7 +122,7 @@ class PlexModule(_ModuleBase): return None return self.plex.get_librarys() - def mediaserver_items(self, server: str, library_id: str) -> Optional[Generator[schemas.MediaServerItem]]: + def mediaserver_items(self, server: str, library_id: str) -> Optional[List[schemas.MediaServerItem]]: """ 媒体库项目列表 """ diff --git a/app/modules/plex/plex.py b/app/modules/plex/plex.py index 9775dd3e..6aedb3ac 100644 --- a/app/modules/plex/plex.py +++ b/app/modules/plex/plex.py @@ -326,7 +326,7 @@ class Plex(metaclass=Singleton): break return ids - def get_items(self, parent: str) -> Generator[Optional[schemas.MediaServerItem]]: + def get_items(self, parent: str) -> Generator: """ 获取媒体服务器所有媒体库列表 """