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

fix c044e594

Browse Source
This commit is contained in:
thsrite 2024-01-12 10:07:39 +08:00
parent c044e59481
commit 6d7a63ff61
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1076,19 +1076,9 @@ class Emby(metaclass=Singleton):
if not self._host or not self._apikey: if not self._host or not self._apikey:
return [] return []
library_folders = [] library_folders = []
req_url = f"{self._host}emby/Library/SelectableMediaFolders?api_key={self._apikey}" black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",")
try: for library in self.get_emby_folders() or []:
res = RequestUtils().get_res(req_url) if library.get("Name") in black_list:
if res: continue
black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",") library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
for library in res.json() or []: return library_folders
if library.get("Name") in black_list:
continue
library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
return library_folders
else:
logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
return []
except Exception as e:
logger.error(f"连接Library/SelectableMediaFolders 出错：" + str(e))
return []

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

@ -45,6 +45,24 @@ class Jellyfin(metaclass=Singleton):
self.user = self.get_user() self.user = self.get_user()
self.serverid = self.get_server_id() self.serverid = self.get_server_id()
def get_jellyfin_folders(self) -> List[dict]:
"""
获取Jellyfin媒体库路径列表
"""
if not self._host or not self._apikey:
return []
req_url = "%Library/SelectableMediaFolders?api_key=%s" % (self._host, self._apikey)
try:
res = RequestUtils().get_res(req_url)
if res:
return res.json()
else:
logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
return []
except Exception as e:
logger.error(f"连接Library/SelectableMediaFolders 出错：" + str(e))
return []
def __get_jellyfin_librarys(self, username: str = None) -> List[dict]: def __get_jellyfin_librarys(self, username: str = None) -> List[dict]:
""" """
获取Jellyfin媒体库的信息 获取Jellyfin媒体库的信息
@ -753,19 +771,9 @@ class Jellyfin(metaclass=Singleton):
if not self._host or not self._apikey: if not self._host or not self._apikey:
return [] return []
library_folders = [] library_folders = []
req_url = f"{self._host}Library/SelectableMediaFolders?api_key={self._apikey}" black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",")
try: for library in self.get_jellyfin_folders() or []:
res = RequestUtils().get_res(req_url) if library.get("Name") in black_list:
if res: continue
black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",") library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
for library in res.json() or []: return library_folders
if library.get("Name") in black_list:
continue
library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
return library_folders
else:
logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
return []
except Exception as e:
logger.error(f"连接Library/SelectableMediaFolders 出错：" + str(e))
return []