Jellyfin: Skip partial on version lower than 10.9

luigi311 · Jul 15, 2024 · d30e03b · d30e03b
1 parent 74f29d4
commit d30e03b
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 48 deletions.
diff --git a/requirements.txt b/requirements.txt
diff --git a/src/jellyfin_emby.py b/src/jellyfin_emby.py
@@ -4,6 +4,7 @@
 from math import floor
 from dotenv import load_dotenv
 import requests
+from packaging import version
 
 from src.functions import (
     logger,
@@ -25,7 +26,6 @@
 generate_guids = str_to_bool(os.getenv("GENERATE_GUIDS", "True"))
 generate_locations = str_to_bool(os.getenv("GENERATE_LOCATIONS", "True"))
 
-
 def get_guids(server_type, item):
     if item.get("Name"):
         guids = {"title": item.get("Name")}
@@ -125,6 +125,7 @@ def __init__(self, server_type, baseurl, token, headers):
             raise Exception(f"{self.server_type} token not set")
 
         self.session = requests.Session()
+        self.version = version.parse(self.info(version=True))
         self.users = self.get_users()
 
     def query(self, query, query_type, identifiers=None, json=None):
@@ -177,13 +178,17 @@ def query(self, query, query_type, identifiers=None, json=None):
             )
             raise Exception(e)
 
-    def info(self) -> str:
+    def info(self, version=False) -> str:
         try:
             query_string = "/System/Info/Public"
 
             response = self.query(query_string, "get")
 
             if response:
+                # Return version only if requested
+                if version:
+                    return response['Version']
+
                 return f"{self.server_type} {response['ServerName']}: {response['Version']}"
             else:
                 return None
@@ -561,28 +566,32 @@ def update_user_watched(
                                 jellyfin_video.get("Name"),
                             )
                         else:
-                            msg = f"{self.server_type}: {jellyfin_video.get('Name')} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library}"
-
-                            if not dryrun:
-                                logger(msg, 5)
-                                playback_position_payload = {
-                                    "PlaybackPositionTicks": movie_status["time"]
-                                    * 10_000,
-                                }
-                                self.query(
-                                    f"/Users/{user_id}/Items/{jellyfin_video_id}/UserData",
-                                    "post",
-                                    json=playback_position_payload,
-                                )
+                            # Handle partially watched movies not supported in jellyfin < 10.9.0
+                            if self.server_type == "Jellyfin" and self.version < version.parse("10.9.0"):
+                                logger(f"{self.server_type}: Skipping movie {jellyfin_video.get('Name')} as partially watched not supported in Jellyfin < 10.9.0", 4)
                             else:
-                                logger(msg, 6)
+                                msg = f"{self.server_type}: {jellyfin_video.get('Name')} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library}"
+
+                                if not dryrun:
+                                    logger(msg, 5)
+                                    playback_position_payload = {
+                                        "PlaybackPositionTicks": movie_status["time"]
+                                        * 10_000,
+                                    }
+                                    self.query(
+                                        f"/Users/{user_id}/Items/{jellyfin_video_id}/UserData",
+                                        "post",
+                                        json=playback_position_payload,
+                                    )
+                                else:
+                                    logger(msg, 6)
 
-                            log_marked(
-                                user_name,
-                                library,
-                                jellyfin_video.get("Name"),
-                                duration=floor(movie_status["time"] / 60_000),
-                            )
+                                log_marked(
+                                    user_name,
+                                    library,
+                                    jellyfin_video.get("Name"),
+                                    duration=floor(movie_status["time"] / 60_000),
+                                )
                     else:
                         logger(
                             f"{self.server_type}: Skipping movie {jellyfin_video.get('Name')} as it is not in mark list for {user_name}",
@@ -690,34 +699,38 @@ def update_user_watched(
                                         jellyfin_episode.get("Name"),
                                     )
                                 else:
-                                    msg = (
-                                        f"{self.server_type}: {jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
-                                        + f" as partially watched for {floor(episode_status['time'] / 60_000)} minutes for {user_name} in {library}"
-                                    )
-
-                                    if not dryrun:
-                                        logger(msg, 5)
-                                        playback_position_payload = {
-                                            "PlaybackPositionTicks": episode_status[
-                                                "time"
-                                            ]
-                                            * 10_000,
-                                        }
-                                        self.query(
-                                            f"/Users/{user_id}/Items/{jellyfin_episode_id}/UserData",
-                                            "post",
-                                            json=playback_position_payload,
-                                        )
+                                    # Handle partially watched episodes not supported in jellyfin < 10.9.0
+                                    if self.server_type == "Jellyfin" and self.version < version.parse("10.9.0"):
+                                        logger(f"{self.server_type}: Skipping episode {jellyfin_episode.get('Name')} as partially watched not supported in Jellyfin < 10.9.0", 4)
                                     else:
-                                        logger(msg, 6)
+                                        msg = (
+                                            f"{self.server_type}: {jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
+                                            + f" as partially watched for {floor(episode_status['time'] / 60_000)} minutes for {user_name} in {library}"
+                                        )
 
-                                    log_marked(
-                                        user_name,
-                                        library,
-                                        jellyfin_episode.get("SeriesName"),
-                                        jellyfin_episode.get("Name"),
-                                        duration=floor(episode_status["time"] / 60_000),
-                                    )
+                                        if not dryrun:
+                                            logger(msg, 5)
+                                            playback_position_payload = {
+                                                "PlaybackPositionTicks": episode_status[
+                                                    "time"
+                                                ]
+                                                * 10_000,
+                                            }
+                                            self.query(
+                                                f"/Users/{user_id}/Items/{jellyfin_episode_id}/UserData",
+                                                "post",
+                                                json=playback_position_payload,
+                                            )
+                                        else:
+                                            logger(msg, 6)
+
+                                        log_marked(
+                                            user_name,
+                                            library,
+                                            jellyfin_episode.get("SeriesName"),
+                                            jellyfin_episode.get("Name"),
+                                            duration=floor(episode_status["time"] / 60_000),
+                                        )
                             else:
                                 logger(
                                     f"{self.server_type}: Skipping episode {jellyfin_episode.get('Name')} as it is not in mark list for {user_name}",