refactor (module): improve the implementation of base classes

This commit is contained in:
InfinityPacer
2024-09-26 19:44:35 +08:00
parent ddfcdf9ce2
commit 5efcd6e6be
12 changed files with 186 additions and 194 deletions

View File

@@ -17,7 +17,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
初始化模块
"""
# 读取媒体服务器配置
self._servers: Dict[str, Emby] = {}
self._instances: Dict[str, Emby] = {}
self._configs: Dict[str, MediaServerConf] = {}
mediaservers = MediaServerHelper().get_mediaservers()
if not mediaservers:
@@ -25,7 +25,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
for server in mediaservers:
if server.type == "emby" and server.enabled:
self._configs[server.name] = server
self._servers[server.name] = Emby(**server.config, sync_libraries=server.sync_libraries)
self._instances[server.name] = Emby(**server.config, sync_libraries=server.sync_libraries)
@staticmethod
def get_name() -> str:
@@ -38,9 +38,9 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
测试模块连接性
"""
if not self._servers:
if not self._instances:
return None
for name, server in self._servers.items():
for name, server in self._instances.items():
if server.is_inactive():
server.reconnect()
if not server.get_user():
@@ -55,7 +55,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
定时任务每10分钟调用一次
"""
# 定时重连
for name, server in self._servers.items():
for name, server in self._instances.items():
if server.is_inactive():
logger.info(f"Emby服务器 {name} 连接断开,尝试重连 ...")
server.reconnect()
@@ -68,7 +68,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
:return: token or None
"""
# Emby认证
for server in self._servers.values():
for server in self._instances.values():
result = server.authenticate(name, password)
if result:
return result
@@ -87,7 +87,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
server_config: MediaServerConf = self.get_config(source, 'emby')
if not server_config:
return None
server: Emby = self.get_server(source)
server: Emby = self.get_instance(source)
if not server:
return None
return server.get_webhook_message(form, args)
@@ -95,7 +95,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
for conf in self._configs.values():
if conf.type != "emby":
continue
server = self.get_server(conf.name)
server = self.get_instance(conf.name)
if server:
result = server.get_webhook_message(form, args)
if result:
@@ -109,7 +109,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
:param itemid: 媒体服务器ItemID
:return: 如不存在返回None存在时返回信息包括每季已存在所有集{type: movie/tv, seasons: {season: [episodes]}}
"""
for name, server in self._servers.items():
for name, server in self._instances.items():
if mediainfo.type == MediaType.MOVIE:
if itemid:
movie = server.get_iteminfo(itemid)
@@ -156,12 +156,12 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
媒体数量统计
"""
if server:
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if not server:
return None
servers = [server]
else:
servers = self._servers.values()
servers = self._instances.values()
media_statistics = []
for server in servers:
media_statistic = server.get_medias_count()
@@ -177,7 +177,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
媒体库列表
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if server:
return server.get_librarys(username=username, hidden=hidden)
return None
@@ -186,7 +186,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
媒体库项目列表
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if server:
return server.get_items(library_id, start_index, limit)
return None
@@ -195,7 +195,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
媒体库项目详情
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if server:
return server.get_iteminfo(item_id)
return None
@@ -205,7 +205,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
获取剧集信息
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if not server:
return None
_, seasoninfo = server.get_tv_episodes(item_id=item_id)
@@ -221,7 +221,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
获取媒体服务器正在播放信息
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if not server:
return []
return server.get_resume(num=count, username=username)
@@ -230,7 +230,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
获取媒体库播放地址
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if not server:
return None
return server.get_play_url(item_id)
@@ -240,7 +240,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase):
"""
获取媒体服务器最新入库条目
"""
server: Emby = self.get_server(server)
server: Emby = self.get_instance(server)
if not server:
return []
return server.get_latest(num=count, username=username)