CI: Fix latest

Tie latest to version releases so dev no longer needs to exists and instead main is the new dev.

.github/workflows/ci.yml

@@ -129,18 +129,23 @@ jobs:
             ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched,enable=${{ secrets.DOCKER_USERNAME != '' }}
             # Do not push to ghcr.io on PRs due to permission issues, only push if the owner is luigi311 so it doesnt fail on forks
             ghcr.io/${{ github.repository }},enable=${{ github.event_name != 'pull_request' && github.repository_owner == 'luigi311'}}
+          flavor: latest=false
           tags: |
-            type=raw,value=latest,enable=${{ matrix.variant == env.DEFAULT_VARIANT && github.ref_name == github.event.repository.default_branch }}
-            type=raw,value=dev,enable=${{ matrix.variant == env.DEFAULT_VARIANT && github.ref_name == 'dev' }}
-            type=raw,value=latest,suffix=-${{ matrix.variant }},enable={{ is_default_branch }}
+            type=raw,value=latest,enable=${{ matrix.variant == env.DEFAULT_VARIANT && startsWith(github.ref, 'refs/tags/') }}
+            type=raw,value=latest,suffix=-${{ matrix.variant }},enable=${{ startsWith(github.ref, 'refs/tags/')  }}
+
             type=ref,event=branch,suffix=-${{ matrix.variant }}
             type=ref,event=branch,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+
             type=ref,event=pr,suffix=-${{ matrix.variant }}
             type=ref,event=pr,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+
             type=semver,pattern={{ version }},suffix=-${{ matrix.variant }}
             type=semver,pattern={{ version }},enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+
             type=semver,pattern={{ major }}.{{ minor }},suffix=-${{ matrix.variant }}
             type=semver,pattern={{ major }}.{{ minor }},enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+
             type=sha,suffix=-${{ matrix.variant }}
             type=sha,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
 

README.md

@@ -107,7 +107,7 @@ Full list of configuration options can be found in the [.env.sample](.env.sample
 
 ## Contributing
 
-I am open to receiving pull requests. If you are submitting a pull request, please make sure run it locally for a day or two to make sure it is working as expected and stable. Make all pull requests against the dev branch and nothing will be merged into the main without going through the lower branches.
+I am open to receiving pull requests. If you are submitting a pull request, please make sure run it locally for a day or two to make sure it is working as expected and stable.
 
 ## License
 

src/jellyfin_emby.py

@@ -4,6 +4,7 @@ import traceback, os
 from math import floor
 from dotenv import load_dotenv
 import requests
+from packaging import version
 
 from src.functions import (
     logger,
@@ -25,7 +26,6 @@ load_dotenv(override=True)
 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 @@ class JellyfinEmby:
             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 @@ class JellyfinEmby:
             )
             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 @@ class JellyfinEmby:
                                 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}"
 
-                            log_marked(
-                                user_name,
-                                library,
-                                jellyfin_video.get("Name"),
-                                duration=floor(movie_status["time"] / 60_000),
-                            )
+                                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),
+                                )
                     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 @@ class JellyfinEmby:
                                         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}",

test/ci_emby.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers

test/ci_guids.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers

test/ci_jellyfin.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers

test/ci_locations.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers

test/ci_plex.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers

test/ci_write.env

@@ -62,7 +62,7 @@ WHITELIST_USERS = "jellyplex_watched"
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers
-PLEX_BASEURL = "https://localhost:32400"
+PLEX_BASEURL = "http://localhost:32400"
 
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 ## Comma seperated list for multiple servers