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

Merge pull request #1353 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2024-01-12 19:04:14 +08:00 committed by GitHub
commit c86cc2cb51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -977,16 +977,16 @@ class Emby(metaclass=Singleton):
if res:
result = res.json().get("Items") or []
ret_resume = []
# 用户媒体库列表（排除黑名单）
user_librarys = self.get_librarys(username=user)
# 用户媒体库文件夹列表（排除黑名单）
library_folders = self.get_user_library_folders()
for item in result:
if len(ret_resume) == num:
break
if item.get("Type") not in ["Movie", "Episode"]:
continue
item_path = item.get("Path")
if item_path and user_librarys and not any(
library.name in item_path for library in user_librarys):
if item_path and library_folders and not any(
str(item_path).startswith(folder) for folder in library_folders):
continue
item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
link = self.get_play_url(item.get("Id"))
@ -1040,16 +1040,16 @@ class Emby(metaclass=Singleton):
if res:
result = res.json() or []
ret_latest = []
# 用户媒体库列表（排除黑名单）
user_librarys = self.get_librarys(username=user)
# 用户媒体库文件夹列表（排除黑名单）
library_folders = self.get_user_library_folders()
for item in result:
if len(ret_latest) == num:
break
if item.get("Type") not in ["Movie", "Series"]:
continue
item_path = item.get("Path")
if item_path and user_librarys and not any(
library.name in item_path for library in user_librarys):
if item_path and library_folders and not any(
str(item_path).startswith(folder) for folder in library_folders):
continue
item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
link = self.get_play_url(item.get("Id"))
@ -1068,3 +1068,17 @@ class Emby(metaclass=Singleton):
except Exception as e:
logger.error(f"连接Users/Items/Latest出错：" + str(e))
return []
def get_user_library_folders(self):
"""
获取Emby媒体库文件夹列表（排除黑名单）
"""
if not self._host or not self._apikey:
return []
library_folders = []
black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",")
for library in self.get_emby_folders() or []:
if library.get("Name") in black_list:
continue
library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
return library_folders

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

@ -45,6 +45,24 @@ class Jellyfin(metaclass=Singleton):
self.user = self.get_user()
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]:
"""
获取Jellyfin媒体库的信息
@ -660,16 +678,16 @@ class Jellyfin(metaclass=Singleton):
if res:
result = res.json().get("Items") or []
ret_resume = []
# 用户媒体库列表（排除黑名单）
user_librarys = self.get_librarys(username=user)
# 用户媒体库文件夹列表（排除黑名单）
library_folders = self.get_user_library_folders()
for item in result:
if len(ret_resume) == num:
break
if item.get("Type") not in ["Movie", "Episode"]:
continue
item_path = item.get("Path")
if item_path and user_librarys and not any(
library.name in item_path for library in user_librarys):
if item_path and library_folders and not any(
str(item_path).startswith(folder) for folder in library_folders):
continue
item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
link = self.get_play_url(item.get("Id"))
@ -717,16 +735,16 @@ class Jellyfin(metaclass=Singleton):
if res:
result = res.json() or []
ret_latest = []
# 用户媒体库列表（排除黑名单）
user_librarys = self.get_librarys(username=user)
# 用户媒体库文件夹列表（排除黑名单）
library_folders = self.get_user_library_folders()
for item in result:
if len(ret_latest) == num:
break
if item.get("Type") not in ["Movie", "Series"]:
continue
item_path = item.get("Path")
if item_path and user_librarys and not any(
library.name in item_path for library in user_librarys):
if item_path and library_folders and not any(
str(item_path).startswith(folder) for folder in library_folders):
continue
item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
link = self.get_play_url(item.get("Id"))
@ -745,3 +763,17 @@ class Jellyfin(metaclass=Singleton):
except Exception as e:
logger.error(f"连接Users/Items/Latest出错：" + str(e))
return []
def get_user_library_folders(self):
"""
获取Emby媒体库文件夹列表（排除黑名单）
"""
if not self._host or not self._apikey:
return []
library_folders = []
black_list = (settings.MEDIASERVER_SYNC_BLACKLIST or '').split(",")
for library in self.get_jellyfin_folders() or []:
if library.get("Name") in black_list:
continue
library_folders += [folder.get("Path") for folder in library.get("SubFolders")]
return library_folders