Jellyfin/Emby: Better reliability
parent
61e3dddd6b
commit
5a17c5f7a1
|
|
@ -18,5 +18,7 @@ lint = [
|
||||||
"ruff>=0.9.6",
|
"ruff>=0.9.6",
|
||||||
]
|
]
|
||||||
dev = [
|
dev = [
|
||||||
|
"mypy>=1.15.0",
|
||||||
"pytest>=8.3.4",
|
"pytest>=8.3.4",
|
||||||
|
"types-requests>=2.32.0.20250306",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
from src.jellyfin_emby import JellyfinEmby
|
from src.jellyfin_emby import JellyfinEmby
|
||||||
from packaging.version import parse, Version
|
from packaging.version import parse, Version
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
|
|
||||||
class Emby(JellyfinEmby):
|
class Emby(JellyfinEmby):
|
||||||
|
|
@ -22,4 +23,10 @@ class Emby(JellyfinEmby):
|
||||||
)
|
)
|
||||||
|
|
||||||
def is_partial_update_supported(self, server_version: Version) -> bool:
|
def is_partial_update_supported(self, server_version: Version) -> bool:
|
||||||
return server_version > parse("4.4")
|
if not server_version >= parse("4.4"):
|
||||||
|
logger.info(
|
||||||
|
f"{self.server_type}: Server version {server_version} does not support updating playback position.",
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
from src.jellyfin_emby import JellyfinEmby
|
from src.jellyfin_emby import JellyfinEmby
|
||||||
from packaging.version import parse, Version
|
from packaging.version import parse, Version
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
|
|
||||||
class Jellyfin(JellyfinEmby):
|
class Jellyfin(JellyfinEmby):
|
||||||
|
|
@ -22,4 +23,10 @@ class Jellyfin(JellyfinEmby):
|
||||||
)
|
)
|
||||||
|
|
||||||
def is_partial_update_supported(self, server_version: Version) -> bool:
|
def is_partial_update_supported(self, server_version: Version) -> bool:
|
||||||
return server_version >= parse("10.9.0")
|
if not server_version >= parse("10.9.0"):
|
||||||
|
logger.info(
|
||||||
|
f"{self.server_type}: Server version {server_version} does not support updating playback position.",
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
|
||||||
|
|
@ -30,28 +30,32 @@ generate_guids = str_to_bool(os.getenv("GENERATE_GUIDS", "True"))
|
||||||
generate_locations = str_to_bool(os.getenv("GENERATE_LOCATIONS", "True"))
|
generate_locations = str_to_bool(os.getenv("GENERATE_LOCATIONS", "True"))
|
||||||
|
|
||||||
|
|
||||||
def extract_identifiers_from_item(server_type, item: dict) -> MediaIdentifiers:
|
def extract_identifiers_from_item(server_type: str, item: dict) -> MediaIdentifiers:
|
||||||
title = item.get("Name", None)
|
title = item.get("Name")
|
||||||
id = None
|
id = None
|
||||||
if not title:
|
if not title:
|
||||||
id = item.get("Id")
|
id = item.get("Id")
|
||||||
logger.info(f"{server_type}: Name not found in {id}")
|
logger.info(f"{server_type}: Name not found for {id}")
|
||||||
|
|
||||||
guids = {}
|
guids = {}
|
||||||
if generate_guids:
|
if generate_guids:
|
||||||
guids = {k.lower(): v for k, v in item["ProviderIds"].items()}
|
guids = {k.lower(): v for k, v in item.get("ProviderIds", {}).items()}
|
||||||
if not guids:
|
if not guids:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{server_type}: {title if title else id} has no guids",
|
f"{server_type}: {title if title else id} has no guids",
|
||||||
)
|
)
|
||||||
|
|
||||||
locations = tuple()
|
locations: tuple = tuple()
|
||||||
if generate_locations:
|
if generate_locations:
|
||||||
if "Path" in item:
|
if item.get("Path"):
|
||||||
locations = tuple([item.get("Path").split("/")[-1]])
|
locations = tuple([item["Path"].split("/")[-1]])
|
||||||
elif "MediaSources" in item:
|
elif item.get("MediaSources"):
|
||||||
locations = tuple(
|
locations = tuple(
|
||||||
[x["Path"].split("/")[-1] for x in item["MediaSources"] if "Path" in x]
|
[
|
||||||
|
x["Path"].split("/")[-1]
|
||||||
|
for x in item["MediaSources"]
|
||||||
|
if x.get("Path")
|
||||||
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
if not locations:
|
if not locations:
|
||||||
|
|
@ -60,18 +64,20 @@ def extract_identifiers_from_item(server_type, item: dict) -> MediaIdentifiers:
|
||||||
return MediaIdentifiers(
|
return MediaIdentifiers(
|
||||||
title=title,
|
title=title,
|
||||||
locations=locations,
|
locations=locations,
|
||||||
imdb_id=guids.get("imdb", None),
|
imdb_id=guids.get("imdb"),
|
||||||
tvdb_id=guids.get("tvdb", None),
|
tvdb_id=guids.get("tvdb"),
|
||||||
tmdb_id=guids.get("tmdb", None),
|
tmdb_id=guids.get("tmdb"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_mediaitem(server_type, item: dict) -> MediaItem:
|
def get_mediaitem(server_type: str, item: dict) -> MediaItem:
|
||||||
return MediaItem(
|
return MediaItem(
|
||||||
identifiers=extract_identifiers_from_item(server_type, item),
|
identifiers=extract_identifiers_from_item(server_type, item),
|
||||||
status=WatchedStatus(
|
status=WatchedStatus(
|
||||||
completed=item["UserData"]["Played"],
|
completed=item.get("UserData", {}).get("Played"),
|
||||||
time=floor(item["UserData"]["PlaybackPositionTicks"] / 10000),
|
time=floor(
|
||||||
|
item.get("UserData", {}).get("PlaybackPositionTicks", 0) / 10000
|
||||||
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -86,11 +92,11 @@ class JellyfinEmby:
|
||||||
):
|
):
|
||||||
if server_type not in ["Jellyfin", "Emby"]:
|
if server_type not in ["Jellyfin", "Emby"]:
|
||||||
raise Exception(f"Server type {server_type} not supported")
|
raise Exception(f"Server type {server_type} not supported")
|
||||||
self.server_type = server_type
|
self.server_type: str = server_type
|
||||||
self.baseurl = baseurl
|
self.baseurl: str = baseurl
|
||||||
self.token = token
|
self.token: str = token
|
||||||
self.headers = headers
|
self.headers: dict[str, str] = headers
|
||||||
self.timeout = int(os.getenv("REQUEST_TIMEOUT", 300))
|
self.timeout: int = int(os.getenv("REQUEST_TIMEOUT", 300))
|
||||||
|
|
||||||
if not self.baseurl:
|
if not self.baseurl:
|
||||||
raise Exception(f"{self.server_type} baseurl not set")
|
raise Exception(f"{self.server_type} baseurl not set")
|
||||||
|
|
@ -99,8 +105,12 @@ class JellyfinEmby:
|
||||||
raise Exception(f"{self.server_type} token not set")
|
raise Exception(f"{self.server_type} token not set")
|
||||||
|
|
||||||
self.session = requests.Session()
|
self.session = requests.Session()
|
||||||
self.users = self.get_users()
|
self.users: dict[str, str] = self.get_users()
|
||||||
self.server_name = self.info(name_only=True)
|
self.server_name: str = self.info(name_only=True)
|
||||||
|
self.server_version: Version = self.info(version_only=True)
|
||||||
|
self.update_partial: bool = self.is_partial_update_supported(
|
||||||
|
self.server_version
|
||||||
|
)
|
||||||
|
|
||||||
def query(
|
def query(
|
||||||
self,
|
self,
|
||||||
|
|
@ -108,11 +118,9 @@ class JellyfinEmby:
|
||||||
query_type: Literal["get", "post"],
|
query_type: Literal["get", "post"],
|
||||||
identifiers: dict[str, str] | None = None,
|
identifiers: dict[str, str] | None = None,
|
||||||
json: dict[str, float] | None = None,
|
json: dict[str, float] | None = None,
|
||||||
) -> dict[str, Any] | list[dict[str, Any]] | None:
|
):
|
||||||
try:
|
try:
|
||||||
results: (
|
results = None
|
||||||
dict[str, list[Any] | dict[str, str]] | list[dict[str, Any]] | None
|
|
||||||
) = None
|
|
||||||
|
|
||||||
if query_type == "get":
|
if query_type == "get":
|
||||||
response = self.session.get(
|
response = self.session.get(
|
||||||
|
|
@ -143,12 +151,12 @@ class JellyfinEmby:
|
||||||
else:
|
else:
|
||||||
results = response.json()
|
results = response.json()
|
||||||
|
|
||||||
if results is not None:
|
if results:
|
||||||
if not isinstance(results, list) and not isinstance(results, dict):
|
if not isinstance(results, list) and not isinstance(results, dict):
|
||||||
raise Exception("Query result is not of type list or dict")
|
raise Exception("Query result is not of type list or dict")
|
||||||
|
|
||||||
# append identifiers to results
|
# append identifiers to results
|
||||||
if identifiers and results:
|
if identifiers and isinstance(results, dict):
|
||||||
results["Identifiers"] = identifiers
|
results["Identifiers"] = identifiers
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|
@ -165,13 +173,13 @@ class JellyfinEmby:
|
||||||
try:
|
try:
|
||||||
query_string = "/System/Info/Public"
|
query_string = "/System/Info/Public"
|
||||||
|
|
||||||
response: dict[str, Any] = self.query(query_string, "get")
|
response: dict[str, Any] | None = self.query(query_string, "get")
|
||||||
|
|
||||||
if response:
|
if response:
|
||||||
if name_only:
|
if name_only:
|
||||||
return response["ServerName"]
|
return response.get("ServerName")
|
||||||
elif version_only:
|
elif version_only:
|
||||||
return parse(response["Version"])
|
return parse(response.get("Version", ""))
|
||||||
|
|
||||||
return f"{self.server_type} {response.get('ServerName')}: {response.get('Version')}"
|
return f"{self.server_type} {response.get('ServerName')}: {response.get('Version')}"
|
||||||
else:
|
else:
|
||||||
|
|
@ -186,9 +194,10 @@ class JellyfinEmby:
|
||||||
users: dict[str, str] = {}
|
users: dict[str, str] = {}
|
||||||
|
|
||||||
query_string = "/Users"
|
query_string = "/Users"
|
||||||
response: list[dict[str, str | bool]] = self.query(query_string, "get")
|
response: list[dict[str, str | bool]] | None = self.query(
|
||||||
|
query_string, "get"
|
||||||
|
)
|
||||||
|
|
||||||
# If response is not empty
|
|
||||||
if response:
|
if response:
|
||||||
for user in response:
|
for user in response:
|
||||||
if isinstance(user["Name"], str) and isinstance(user["Id"], str):
|
if isinstance(user["Name"], str) and isinstance(user["Id"], str):
|
||||||
|
|
@ -201,17 +210,28 @@ class JellyfinEmby:
|
||||||
|
|
||||||
def get_libraries(self) -> dict[str, str]:
|
def get_libraries(self) -> dict[str, str]:
|
||||||
try:
|
try:
|
||||||
libraries = {}
|
libraries: dict[str, str] = {}
|
||||||
|
|
||||||
# Theres no way to get all libraries so individually get list of libraries from all users
|
# Theres no way to get all libraries so individually get list of libraries from all users
|
||||||
users = self.get_users()
|
users = self.get_users()
|
||||||
|
|
||||||
for user_name, user_id in users.items():
|
for user_name, user_id in users.items():
|
||||||
user_libraries: dict = self.query(f"/Users/{user_id}/Views", "get")
|
user_libraries: dict[str, Any] | None = self.query(
|
||||||
logger.debug(f"{self.server_type}: All Libraries for {user_name} {[library.get("Name") for library in user_libraries["Items"]]}")
|
f"/Users/{user_id}/Views", "get"
|
||||||
|
)
|
||||||
|
|
||||||
for library in user_libraries["Items"]:
|
if not user_libraries:
|
||||||
library_title = library["Name"]
|
logger.error(
|
||||||
|
f"{self.server_type}: Failed to get libraries for {user_name}"
|
||||||
|
)
|
||||||
|
return libraries
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
f"{self.server_type}: All Libraries for {user_name} {[library.get('Name') for library in user_libraries.get('Items', [])]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
for library in user_libraries.get("Items", []):
|
||||||
|
library_title = library.get("Name")
|
||||||
library_type = library.get("CollectionType")
|
library_type = library.get("CollectionType")
|
||||||
|
|
||||||
if library_type not in ["movies", "tvshows"]:
|
if library_type not in ["movies", "tvshows"]:
|
||||||
|
|
@ -228,7 +248,12 @@ class JellyfinEmby:
|
||||||
raise Exception(e)
|
raise Exception(e)
|
||||||
|
|
||||||
def get_user_library_watched(
|
def get_user_library_watched(
|
||||||
self, user_name, user_id, library_type, library_id, library_title
|
self,
|
||||||
|
user_name: str,
|
||||||
|
user_id: str,
|
||||||
|
library_type: Literal["Movie", "Series", "Episode"],
|
||||||
|
library_id: str,
|
||||||
|
library_title: str,
|
||||||
) -> LibraryData:
|
) -> LibraryData:
|
||||||
user_name = user_name.lower()
|
user_name = user_name.lower()
|
||||||
try:
|
try:
|
||||||
|
|
@ -253,17 +278,17 @@ class JellyfinEmby:
|
||||||
|
|
||||||
for movie in watched_items + in_progress_items:
|
for movie in watched_items + in_progress_items:
|
||||||
# Skip if theres no user data which means the movie has not been watched
|
# Skip if theres no user data which means the movie has not been watched
|
||||||
if "UserData" not in movie:
|
if not movie.get("UserData"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Skip if theres no media tied to the movie
|
# Skip if theres no media tied to the movie
|
||||||
if "MediaSources" not in movie or movie["MediaSources"] == {}:
|
if not movie.get("MediaSources"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Skip if not watched or watched less than a minute
|
# Skip if not watched or watched less than a minute
|
||||||
if (
|
if (
|
||||||
movie["UserData"]["Played"] == True
|
movie["UserData"].get("Played")
|
||||||
or movie["UserData"]["PlaybackPositionTicks"] > 600000000
|
or movie["UserData"].get("PlaybackPositionTicks", 0) > 600000000
|
||||||
):
|
):
|
||||||
watched.movies.append(get_mediaitem(self.server_type, movie))
|
watched.movies.append(get_mediaitem(self.server_type, movie))
|
||||||
|
|
||||||
|
|
@ -279,24 +304,25 @@ class JellyfinEmby:
|
||||||
# Filter the list of shows to only include those that have been partially or fully watched
|
# Filter the list of shows to only include those that have been partially or fully watched
|
||||||
watched_shows_filtered = []
|
watched_shows_filtered = []
|
||||||
for show in watched_shows:
|
for show in watched_shows:
|
||||||
if "UserData" not in show:
|
if not show.get("UserData"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if "PlayedPercentage" in show["UserData"]:
|
if show["UserData"].get("PlayedPercentage", 0) > 0:
|
||||||
if show["UserData"]["PlayedPercentage"] > 0:
|
watched_shows_filtered.append(show)
|
||||||
watched_shows_filtered.append(show)
|
|
||||||
|
|
||||||
# Retrieve the watched/partially watched list of episodes of each watched show
|
# Retrieve the watched/partially watched list of episodes of each watched show
|
||||||
for show in watched_shows_filtered:
|
for show in watched_shows_filtered:
|
||||||
show_guids = {k.lower(): v for k, v in show["ProviderIds"].items()}
|
show_guids = {
|
||||||
|
k.lower(): v for k, v in show.get("ProviderIds", {}).items()
|
||||||
|
}
|
||||||
show_locations = (
|
show_locations = (
|
||||||
tuple([show["Path"].split("/")[-1]])
|
tuple([show["Path"].split("/")[-1]])
|
||||||
if "Path" in show
|
if show.get("Path")
|
||||||
else tuple()
|
else tuple()
|
||||||
)
|
)
|
||||||
|
|
||||||
show_episodes = self.query(
|
show_episodes = self.query(
|
||||||
f"/Shows/{show['Id']}/Episodes"
|
f"/Shows/{show.get('Id')}/Episodes"
|
||||||
+ f"?userId={user_id}&isPlaceHolder=false&Fields=ProviderIds,MediaSources",
|
+ f"?userId={user_id}&isPlaceHolder=false&Fields=ProviderIds,MediaSources",
|
||||||
"get",
|
"get",
|
||||||
).get("Items", [])
|
).get("Items", [])
|
||||||
|
|
@ -305,19 +331,17 @@ class JellyfinEmby:
|
||||||
# Create a list to store the episodes
|
# Create a list to store the episodes
|
||||||
episode_mediaitem = []
|
episode_mediaitem = []
|
||||||
for episode in show_episodes:
|
for episode in show_episodes:
|
||||||
if "UserData" not in episode:
|
if not episode.get("UserData"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if (
|
if not episode.get("MediaSources"):
|
||||||
"MediaSources" not in episode
|
|
||||||
or episode["MediaSources"] == {}
|
|
||||||
):
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# If watched or watched more than a minute
|
# If watched or watched more than a minute
|
||||||
if (
|
if (
|
||||||
episode["UserData"]["Played"] == True
|
episode["UserData"].get("Played")
|
||||||
or episode["UserData"]["PlaybackPositionTicks"] > 600000000
|
or episode["UserData"].get("PlaybackPositionTicks", 0)
|
||||||
|
> 600000000
|
||||||
):
|
):
|
||||||
episode_mediaitem.append(
|
episode_mediaitem.append(
|
||||||
get_mediaitem(self.server_type, episode)
|
get_mediaitem(self.server_type, episode)
|
||||||
|
|
@ -329,9 +353,9 @@ class JellyfinEmby:
|
||||||
identifiers=MediaIdentifiers(
|
identifiers=MediaIdentifiers(
|
||||||
title=show.get("Name"),
|
title=show.get("Name"),
|
||||||
locations=show_locations,
|
locations=show_locations,
|
||||||
imdb_id=show_guids.get("imdb", None),
|
imdb_id=show_guids.get("imdb"),
|
||||||
tvdb_id=show_guids.get("tvdb", None),
|
tvdb_id=show_guids.get("tvdb"),
|
||||||
tmdb_id=show_guids.get("tmdb", None),
|
tmdb_id=show_guids.get("tmdb"),
|
||||||
),
|
),
|
||||||
episodes=episode_mediaitem,
|
episodes=episode_mediaitem,
|
||||||
)
|
)
|
||||||
|
|
@ -348,7 +372,7 @@ class JellyfinEmby:
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
return {}
|
return LibraryData(title=library_title)
|
||||||
|
|
||||||
def get_watched(
|
def get_watched(
|
||||||
self, users: dict[str, str], sync_libraries: list[str]
|
self, users: dict[str, str], sync_libraries: list[str]
|
||||||
|
|
@ -357,44 +381,35 @@ class JellyfinEmby:
|
||||||
users_watched: dict[str, UserData] = {}
|
users_watched: dict[str, UserData] = {}
|
||||||
|
|
||||||
for user_name, user_id in users.items():
|
for user_name, user_id in users.items():
|
||||||
libraries = []
|
libraries = [
|
||||||
|
self.query(
|
||||||
all_libraries = self.query(f"/Users/{user_id}/Views", "get")
|
f"/Users/{user_id}/Items"
|
||||||
for library in all_libraries["Items"]:
|
f"?ParentId={lib.get('Id')}&Filters=IsPlayed&Recursive=True&excludeItemTypes=Folder&limit=100",
|
||||||
library_id = library["Id"]
|
"get",
|
||||||
library_title = library["Name"]
|
identifiers={
|
||||||
|
"library_id": lib["Id"],
|
||||||
if library_title not in sync_libraries:
|
"library_title": lib["Name"],
|
||||||
continue
|
},
|
||||||
|
|
||||||
identifiers: dict[str, str] = {
|
|
||||||
"library_id": library_id,
|
|
||||||
"library_title": library_title,
|
|
||||||
}
|
|
||||||
libraries.append(
|
|
||||||
self.query(
|
|
||||||
f"/Users/{user_id}/Items"
|
|
||||||
+ f"?ParentId={library_id}&Filters=IsPlayed&Recursive=True&excludeItemTypes=Folder&limit=100",
|
|
||||||
"get",
|
|
||||||
identifiers=identifiers,
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
for lib in self.query(f"/Users/{user_id}/Views", "get").get(
|
||||||
|
"Items", []
|
||||||
|
)
|
||||||
|
if lib.get("Name") in sync_libraries
|
||||||
|
]
|
||||||
|
|
||||||
for library in libraries:
|
for library in libraries:
|
||||||
if len(library["Items"]) == 0:
|
if not library.get("Items"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
library_id: str = library["Identifiers"]["library_id"]
|
library_id = library.get("Identifiers", {}).get("library_id")
|
||||||
library_title: str = library["Identifiers"]["library_title"]
|
library_title = library.get("Identifiers", {}).get("library_title")
|
||||||
|
|
||||||
# Get all library types excluding "Folder"
|
# Get all library types excluding "Folder"
|
||||||
types = set(
|
types = {
|
||||||
[
|
x["Type"]
|
||||||
x["Type"]
|
for x in library.get("Items", [])
|
||||||
for x in library["Items"]
|
if x.get("Type") in {"Movie", "Series", "Episode"}
|
||||||
if x["Type"] in ["Movie", "Series", "Episode"]
|
}
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
for library_type in types:
|
for library_type in types:
|
||||||
# Get watched for user
|
# Get watched for user
|
||||||
|
|
@ -425,7 +440,6 @@ class JellyfinEmby:
|
||||||
library_data: LibraryData,
|
library_data: LibraryData,
|
||||||
library_name: str,
|
library_name: str,
|
||||||
library_id: str,
|
library_id: str,
|
||||||
update_partial: bool,
|
|
||||||
dryrun: bool,
|
dryrun: bool,
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
|
|
@ -444,8 +458,9 @@ class JellyfinEmby:
|
||||||
+ f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}"
|
+ f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}"
|
||||||
+ "&isPlayed=false&Fields=ItemCounts,ProviderIds,MediaSources&IncludeItemTypes=Movie",
|
+ "&isPlayed=false&Fields=ItemCounts,ProviderIds,MediaSources&IncludeItemTypes=Movie",
|
||||||
"get",
|
"get",
|
||||||
)
|
).get("Items", [])
|
||||||
for jellyfin_video in jellyfin_search["Items"]:
|
|
||||||
|
for jellyfin_video in jellyfin_search:
|
||||||
jelly_identifiers = extract_identifiers_from_item(
|
jelly_identifiers = extract_identifiers_from_item(
|
||||||
self.server_type, jellyfin_video
|
self.server_type, jellyfin_video
|
||||||
)
|
)
|
||||||
|
|
@ -454,7 +469,7 @@ class JellyfinEmby:
|
||||||
if check_same_identifiers(
|
if check_same_identifiers(
|
||||||
jelly_identifiers, stored_movie.identifiers
|
jelly_identifiers, stored_movie.identifiers
|
||||||
):
|
):
|
||||||
jellyfin_video_id = jellyfin_video["Id"]
|
jellyfin_video_id = jellyfin_video.get("Id")
|
||||||
if stored_movie.status.completed:
|
if stored_movie.status.completed:
|
||||||
msg = f"{self.server_type}: {jellyfin_video.get('Name')} as watched for {user_name} in {library_name}"
|
msg = f"{self.server_type}: {jellyfin_video.get('Name')} as watched for {user_name} in {library_name}"
|
||||||
if not dryrun:
|
if not dryrun:
|
||||||
|
|
@ -471,11 +486,11 @@ class JellyfinEmby:
|
||||||
library_name,
|
library_name,
|
||||||
jellyfin_video.get("Name"),
|
jellyfin_video.get("Name"),
|
||||||
)
|
)
|
||||||
elif update_partial:
|
elif self.update_partial:
|
||||||
msg = f"{self.server_type}: {jellyfin_video.get('Name')} as partially watched for {floor(stored_movie.status.time / 60_000)} minutes for {user_name} in {library_name}"
|
msg = f"{self.server_type}: {jellyfin_video.get('Name')} as partially watched for {floor(stored_movie.status.time / 60_000)} minutes for {user_name} in {library_name}"
|
||||||
|
|
||||||
if not dryrun:
|
if not dryrun:
|
||||||
playback_position_payload = {
|
playback_position_payload: dict[str, float] = {
|
||||||
"PlaybackPositionTicks": stored_movie.status.time
|
"PlaybackPositionTicks": stored_movie.status.time
|
||||||
* 10_000,
|
* 10_000,
|
||||||
}
|
}
|
||||||
|
|
@ -507,7 +522,7 @@ class JellyfinEmby:
|
||||||
+ "&Fields=ItemCounts,ProviderIds,Path&IncludeItemTypes=Series",
|
+ "&Fields=ItemCounts,ProviderIds,Path&IncludeItemTypes=Series",
|
||||||
"get",
|
"get",
|
||||||
)
|
)
|
||||||
jellyfin_shows = [x for x in jellyfin_search["Items"]]
|
jellyfin_shows = [x for x in jellyfin_search.get("Items", [])]
|
||||||
|
|
||||||
for jellyfin_show in jellyfin_shows:
|
for jellyfin_show in jellyfin_shows:
|
||||||
jellyfin_show_identifiers = extract_identifiers_from_item(
|
jellyfin_show_identifiers = extract_identifiers_from_item(
|
||||||
|
|
@ -518,19 +533,19 @@ class JellyfinEmby:
|
||||||
if check_same_identifiers(
|
if check_same_identifiers(
|
||||||
jellyfin_show_identifiers, stored_series.identifiers
|
jellyfin_show_identifiers, stored_series.identifiers
|
||||||
):
|
):
|
||||||
logger.info(
|
logger.trace(
|
||||||
f"Found matching show for '{jellyfin_show.get('Name')}'",
|
f"Found matching show for '{jellyfin_show.get('Name')}'",
|
||||||
)
|
)
|
||||||
# Now update episodes.
|
# Now update episodes.
|
||||||
# Get the list of Plex episodes for this show.
|
# Get the list of Plex episodes for this show.
|
||||||
jellyfin_show_id = jellyfin_show["Id"]
|
jellyfin_show_id = jellyfin_show.get("Id")
|
||||||
jellyfin_episodes = self.query(
|
jellyfin_episodes = self.query(
|
||||||
f"/Shows/{jellyfin_show_id}/Episodes"
|
f"/Shows/{jellyfin_show_id}/Episodes"
|
||||||
+ f"?userId={user_id}&Fields=ItemCounts,ProviderIds,MediaSources",
|
+ f"?userId={user_id}&Fields=ItemCounts,ProviderIds,MediaSources",
|
||||||
"get",
|
"get",
|
||||||
)
|
).get("Items", [])
|
||||||
|
|
||||||
for jellyfin_episode in jellyfin_episodes["Items"]:
|
for jellyfin_episode in jellyfin_episodes:
|
||||||
jellyfin_episode_identifiers = (
|
jellyfin_episode_identifiers = (
|
||||||
extract_identifiers_from_item(
|
extract_identifiers_from_item(
|
||||||
self.server_type, jellyfin_episode
|
self.server_type, jellyfin_episode
|
||||||
|
|
@ -541,10 +556,10 @@ class JellyfinEmby:
|
||||||
jellyfin_episode_identifiers,
|
jellyfin_episode_identifiers,
|
||||||
stored_ep.identifiers,
|
stored_ep.identifiers,
|
||||||
):
|
):
|
||||||
jellyfin_episode_id = jellyfin_episode["Id"]
|
jellyfin_episode_id = jellyfin_episode.get("Id")
|
||||||
if stored_ep.status.completed:
|
if stored_ep.status.completed:
|
||||||
msg = (
|
msg = (
|
||||||
f"{self.server_type}: {jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
|
f"{self.server_type}: {jellyfin_episode.get('SeriesName')} {jellyfin_episode.get('SeasonName')} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
|
||||||
+ f" as watched for {user_name} in {library_name}"
|
+ f" as watched for {user_name} in {library_name}"
|
||||||
)
|
)
|
||||||
if not dryrun:
|
if not dryrun:
|
||||||
|
|
@ -564,9 +579,9 @@ class JellyfinEmby:
|
||||||
jellyfin_episode.get("SeriesName"),
|
jellyfin_episode.get("SeriesName"),
|
||||||
jellyfin_episode.get("Name"),
|
jellyfin_episode.get("Name"),
|
||||||
)
|
)
|
||||||
elif update_partial:
|
elif self.update_partial:
|
||||||
msg = (
|
msg = (
|
||||||
f"{self.server_type}: {jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
|
f"{self.server_type}: {jellyfin_episode.get('SeriesName')} {jellyfin_episode.get('SeasonName')} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
|
||||||
+ f" as partially watched for {floor(stored_ep.status.time / 60_000)} minutes for {user_name} in {library_name}"
|
+ f" as partially watched for {floor(stored_ep.status.time / 60_000)} minutes for {user_name} in {library_name}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -619,14 +634,6 @@ class JellyfinEmby:
|
||||||
dryrun=False,
|
dryrun=False,
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
server_version = self.info(version_only=True)
|
|
||||||
update_partial = self.is_partial_update_supported(server_version)
|
|
||||||
|
|
||||||
if not update_partial:
|
|
||||||
logger.info(
|
|
||||||
f"{self.server_type}: Server version {server_version} does not support updating playback position.",
|
|
||||||
)
|
|
||||||
|
|
||||||
for user, user_data in watched_list.items():
|
for user, user_data in watched_list.items():
|
||||||
user_other = None
|
user_other = None
|
||||||
user_name = None
|
user_name = None
|
||||||
|
|
@ -647,7 +654,7 @@ class JellyfinEmby:
|
||||||
user_name = key
|
user_name = key
|
||||||
break
|
break
|
||||||
|
|
||||||
if not user_id:
|
if not user_id or not user_name:
|
||||||
logger.info(f"{user} {user_other} not found in Jellyfin")
|
logger.info(f"{user} {user_other} not found in Jellyfin")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
@ -655,7 +662,7 @@ class JellyfinEmby:
|
||||||
f"/Users/{user_id}/Views",
|
f"/Users/{user_id}/Views",
|
||||||
"get",
|
"get",
|
||||||
)
|
)
|
||||||
jellyfin_libraries = [x for x in jellyfin_libraries["Items"]]
|
jellyfin_libraries = [x for x in jellyfin_libraries.get("Items", [])]
|
||||||
|
|
||||||
for library_name in user_data.libraries:
|
for library_name in user_data.libraries:
|
||||||
library_data = user_data.libraries[library_name]
|
library_data = user_data.libraries[library_name]
|
||||||
|
|
@ -703,7 +710,6 @@ class JellyfinEmby:
|
||||||
library_data,
|
library_data,
|
||||||
library_name,
|
library_name,
|
||||||
library_id,
|
library_id,
|
||||||
update_partial,
|
|
||||||
dryrun,
|
dryrun,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
55
uv.lock
55
uv.lock
|
|
@ -1,5 +1,4 @@
|
||||||
version = 1
|
version = 1
|
||||||
revision = 1
|
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -97,7 +96,9 @@ dependencies = [
|
||||||
|
|
||||||
[package.dev-dependencies]
|
[package.dev-dependencies]
|
||||||
dev = [
|
dev = [
|
||||||
|
{ name = "mypy" },
|
||||||
{ name = "pytest" },
|
{ name = "pytest" },
|
||||||
|
{ name = "types-requests" },
|
||||||
]
|
]
|
||||||
lint = [
|
lint = [
|
||||||
{ name = "ruff" },
|
{ name = "ruff" },
|
||||||
|
|
@ -114,7 +115,11 @@ requires-dist = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata.requires-dev]
|
[package.metadata.requires-dev]
|
||||||
dev = [{ name = "pytest", specifier = ">=8.3.4" }]
|
dev = [
|
||||||
|
{ name = "mypy", specifier = ">=1.15.0" },
|
||||||
|
{ name = "pytest", specifier = ">=8.3.4" },
|
||||||
|
{ name = "types-requests", specifier = ">=2.32.0.20250306" },
|
||||||
|
]
|
||||||
lint = [{ name = "ruff", specifier = ">=0.9.6" }]
|
lint = [{ name = "ruff", specifier = ">=0.9.6" }]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -130,6 +135,40 @@ wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/0c/29/0348de65b8cc732daa3e33e67806420b2ae89bdce2b04af740289c5c6c8c/loguru-0.7.3-py3-none-any.whl", hash = "sha256:31a33c10c8e1e10422bfd431aeb5d351c7cf7fa671e3c4df004162264b28220c", size = 61595 },
|
{ url = "https://files.pythonhosted.org/packages/0c/29/0348de65b8cc732daa3e33e67806420b2ae89bdce2b04af740289c5c6c8c/loguru-0.7.3-py3-none-any.whl", hash = "sha256:31a33c10c8e1e10422bfd431aeb5d351c7cf7fa671e3c4df004162264b28220c", size = 61595 },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mypy"
|
||||||
|
version = "1.15.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "mypy-extensions" },
|
||||||
|
{ name = "typing-extensions" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/ce/43/d5e49a86afa64bd3839ea0d5b9c7103487007d728e1293f52525d6d5486a/mypy-1.15.0.tar.gz", hash = "sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43", size = 3239717 }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/98/3a/03c74331c5eb8bd025734e04c9840532226775c47a2c39b56a0c8d4f128d/mypy-1.15.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:aea39e0583d05124836ea645f412e88a5c7d0fd77a6d694b60d9b6b2d9f184fd", size = 10793981 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/f0/1a/41759b18f2cfd568848a37c89030aeb03534411eef981df621d8fad08a1d/mypy-1.15.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2f2147ab812b75e5b5499b01ade1f4a81489a147c01585cda36019102538615f", size = 9749175 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/12/7e/873481abf1ef112c582db832740f4c11b2bfa510e829d6da29b0ab8c3f9c/mypy-1.15.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ce436f4c6d218a070048ed6a44c0bbb10cd2cc5e272b29e7845f6a2f57ee4464", size = 11455675 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/b3/d0/92ae4cde706923a2d3f2d6c39629134063ff64b9dedca9c1388363da072d/mypy-1.15.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8023ff13985661b50a5928fc7a5ca15f3d1affb41e5f0a9952cb68ef090b31ee", size = 12410020 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/46/8b/df49974b337cce35f828ba6fda228152d6db45fed4c86ba56ffe442434fd/mypy-1.15.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1124a18bc11a6a62887e3e137f37f53fbae476dc36c185d549d4f837a2a6a14e", size = 12498582 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/13/50/da5203fcf6c53044a0b699939f31075c45ae8a4cadf538a9069b165c1050/mypy-1.15.0-cp312-cp312-win_amd64.whl", hash = "sha256:171a9ca9a40cd1843abeca0e405bc1940cd9b305eaeea2dda769ba096932bb22", size = 9366614 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/6a/9b/fd2e05d6ffff24d912f150b87db9e364fa8282045c875654ce7e32fffa66/mypy-1.15.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445", size = 10788592 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/74/37/b246d711c28a03ead1fd906bbc7106659aed7c089d55fe40dd58db812628/mypy-1.15.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d", size = 9753611 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/a6/ac/395808a92e10cfdac8003c3de9a2ab6dc7cde6c0d2a4df3df1b815ffd067/mypy-1.15.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5", size = 11438443 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/d2/8b/801aa06445d2de3895f59e476f38f3f8d610ef5d6908245f07d002676cbf/mypy-1.15.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036", size = 12402541 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/c7/67/5a4268782eb77344cc613a4cf23540928e41f018a9a1ec4c6882baf20ab8/mypy-1.15.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357", size = 12494348 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/83/3e/57bb447f7bbbfaabf1712d96f9df142624a386d98fb026a761532526057e/mypy-1.15.0-cp313-cp313-win_amd64.whl", hash = "sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf", size = 9373648 },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/09/4e/a7d65c7322c510de2c409ff3828b03354a7c43f5a8ed458a7a131b41c7b9/mypy-1.15.0-py3-none-any.whl", hash = "sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e", size = 2221777 },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mypy-extensions"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f/mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782", size = 4433 }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", size = 4695 },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "packaging"
|
name = "packaging"
|
||||||
version = "24.2"
|
version = "24.2"
|
||||||
|
|
@ -277,6 +316,18 @@ wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/e8/a8/d71f44b93e3aa86ae232af1f2126ca7b95c0f515ec135462b3e1f351441c/ruff-0.9.6-py3-none-win_arm64.whl", hash = "sha256:0e2bb706a2be7ddfea4a4af918562fdc1bcb16df255e5fa595bbd800ce322a5a", size = 10177499 },
|
{ url = "https://files.pythonhosted.org/packages/e8/a8/d71f44b93e3aa86ae232af1f2126ca7b95c0f515ec135462b3e1f351441c/ruff-0.9.6-py3-none-win_arm64.whl", hash = "sha256:0e2bb706a2be7ddfea4a4af918562fdc1bcb16df255e5fa595bbd800ce322a5a", size = 10177499 },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "types-requests"
|
||||||
|
version = "2.32.0.20250306"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "urllib3" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/09/1a/beaeff79ef9efd186566ba5f0d95b44ae21f6d31e9413bcfbef3489b6ae3/types_requests-2.32.0.20250306.tar.gz", hash = "sha256:0962352694ec5b2f95fda877ee60a159abdf84a0fc6fdace599f20acb41a03d1", size = 23012 }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/99/26/645d89f56004aa0ba3b96fec27793e3c7e62b40982ee069e52568922b6db/types_requests-2.32.0.20250306-py3-none-any.whl", hash = "sha256:25f2cbb5c8710b2022f8bbee7b2b66f319ef14aeea2f35d80f18c9dbf3b60a0b", size = 20673 },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typing-extensions"
|
name = "typing-extensions"
|
||||||
version = "4.12.2"
|
version = "4.12.2"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue