Merge pull request #195 from luigi311/fix_user

Fix user
Entrypoint: Alpine fix overlapping PGID issue
2024-09-13 17:01:45 -06:00 · 2024-09-13 16:24:58 -06:00 · 2024-09-13 10:12:18 -06:00 · 2024-09-13 09:56:34 -06:00 · 2024-09-08 01:28:11 -06:00 · 2024-09-05 16:21:06 -06:00
21 changed files with 380 additions and 334 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
          sleep 10

          for FOLDER in $(find "JellyPlex-Watched-CI" -type f -name "docker-compose.yml" -exec dirname {} \;); do
-            docker-compose -f "${FOLDER}/docker-compose.yml" logs
+            docker compose -f "${FOLDER}/docker-compose.yml" logs
          done

      - name: "Test Plex"
@@ -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 }}

--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,53 +1,49 @@
 FROM python:3.11-alpine

-ENV DRYRUN 'True'
-ENV DEBUG 'True'
-ENV DEBUG_LEVEL 'INFO'
-ENV RUN_ONLY_ONCE 'False'
-ENV SLEEP_DURATION '3600'
-ENV LOGFILE 'log.log'
-ENV MARKFILE 'mark.log'
+ENV PUID=1000
+ENV PGID=1000
+ENV GOSU_VERSION=1.17

-ENV USER_MAPPING ''
-ENV LIBRARY_MAPPING ''
+RUN apk add --no-cache tini dos2unix

-ENV PLEX_BASEURL ''
-ENV PLEX_TOKEN ''
-ENV PLEX_USERNAME ''
-ENV PLEX_PASSWORD ''
-ENV PLEX_SERVERNAME ''
-
-ENV JELLYFIN_BASEURL ''
-ENV JELLYFIN_TOKEN ''
-
-ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
-ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
-ENV SYNC_FROM_PLEX_TO_PLEX 'True'
-ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
-
-ENV BLACKLIST_LIBRARY ''
-ENV WHITELIST_LIBRARY ''
-ENV BLACKLIST_LIBRARY_TYPE  '' 
-ENV WHITELIST_LIBRARY_TYPE  ''
-ENV BLACKLIST_USERS  ''
-ENV WHITELIST_USERS  ''
-
-
-RUN apk add --no-cache tini && \
-    addgroup --system jellyplex_user && \
-    adduser --system --no-create-home jellyplex_user --ingroup jellyplex_user && \
-    mkdir -p /app && \
-    chown -R jellyplex_user:jellyplex_user /app
+# Install gosu
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .gosu-deps \
+		ca-certificates \
+		dpkg \
+		gnupg \
+	; \
+	\
+	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+	\
+# verify the signature
+	export GNUPGHOME="$(mktemp -d)"; \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	gpgconf --kill all; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	\
+# clean up fetch dependencies
+	apk del --no-network .gosu-deps; \
+	\
+	chmod +x /usr/local/bin/gosu; \
+# verify that the binary works
+	gosu --version; \
+	gosu nobody true

 WORKDIR /app

-COPY --chown=jellyplex_user:jellyplex_user ./requirements.txt ./
+COPY ./requirements.txt ./

 RUN pip install --no-cache-dir -r requirements.txt

-COPY --chown=jellyplex_user:jellyplex_user . .
+COPY . .

-USER jellyplex_user
+RUN chmod +x *.sh && \
+	dos2unix *.sh

-ENTRYPOINT ["/sbin/tini", "--"]
+ENTRYPOINT ["tini", "--", "/app/entrypoint.sh"]
 CMD ["python", "-u", "main.py"]
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -1,56 +1,23 @@
 FROM python:3.11-slim

-ENV DRYRUN 'True'
-ENV DEBUG 'True'
-ENV DEBUG_LEVEL 'INFO'
-ENV RUN_ONLY_ONCE 'False'
-ENV SLEEP_DURATION '3600'
-ENV LOGFILE 'log.log'
-ENV MARKFILE 'mark.log'
-
-ENV USER_MAPPING ''
-ENV LIBRARY_MAPPING ''
-
-ENV PLEX_BASEURL ''
-ENV PLEX_TOKEN ''
-ENV PLEX_USERNAME ''
-ENV PLEX_PASSWORD ''
-ENV PLEX_SERVERNAME ''
-
-ENV JELLYFIN_BASEURL ''
-ENV JELLYFIN_TOKEN ''
-
-ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
-ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
-ENV SYNC_FROM_PLEX_TO_PLEX 'True'
-ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
-
-ENV BLACKLIST_LIBRARY ''
-ENV WHITELIST_LIBRARY ''
-ENV BLACKLIST_LIBRARY_TYPE  '' 
-ENV WHITELIST_LIBRARY_TYPE  ''
-ENV BLACKLIST_USERS  ''
-ENV WHITELIST_USERS  ''
-
+ENV PUID=1000
+ENV PGID=1000

 RUN apt-get update && \
-    apt-get install tini --yes --no-install-recommends && \
+    apt-get install tini gosu dos2unix --yes --no-install-recommends && \
    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    addgroup --system jellyplex_user && \
-    adduser --system --no-create-home jellyplex_user --ingroup jellyplex_user && \
-    mkdir -p /app && \
-    chown -R jellyplex_user:jellyplex_user /app
+    rm -rf /var/lib/apt/lists/*

 WORKDIR /app

-COPY --chown=jellyplex_user:jellyplex_user ./requirements.txt ./
+COPY ./requirements.txt ./

 RUN pip install --no-cache-dir -r requirements.txt

-COPY --chown=jellyplex_user:jellyplex_user . .
+COPY . .

-USER jellyplex_user
+RUN chmod +x *.sh && \
+    dos2unix *.sh

-ENTRYPOINT ["/bin/tini", "--"]
+ENTRYPOINT ["/bin/tini", "--", "/app/entrypoint.sh"]
 CMD ["python", "-u", "main.py"]
--- a/README.md
+++ b/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

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,32 +1,11 @@
-version: '3'
+# Sync watched status between media servers locally

 services:
  jellyplex-watched:
    image: luigi311/jellyplex-watched:latest
    container_name: jellyplex-watched
-    restart: always
+    restart: unless-stopped
    environment:
-      - DRYRUN=True
-      - DEBUG=True
-      - DEBUG_LEVEL=info
-      - RUN_ONLY_ONCE=False
-      - SLEEP_DURATION=3600
-      - LOGFILE=/tmp/log.log
-      - MARKFILE=/tmp/mark.log
-      - USER_MAPPING={"user1":"user2"}
-      - LIBRARY_MAPPING={"TV Shows":"Shows"}
-      - BLACKLIST_LIBRARY=
-      - WHITELIST_LIBRARY=
-      - BLACKLIST_LIBRARY_TYPE=
-      - WHITELIST_LIBRARY_TYPE=
-      - BLACKLIST_USERS=
-      - WHITELIST_USERS=
-      - PLEX_BASEURL=https://localhost:32400
-      - PLEX_TOKEN=plex_token
-      - JELLYFIN_BASEURL=http://localhost:8096
-      - JELLYFIN_TOKEN=jelly_token
-      - SSL_BYPASS=True
-      - SYNC_FROM_PLEX_TO_JELLYFIN=True
-      - SYNC_FROM_JELLYFIN_TO_PLEX=True
-      - SYNC_FROM_PLEX_TO_PLEX=True
-      - SYNC_FROM_JELLYFIN_TO_JELLYFIN=True
+      - PUID=1000
+      - PGID=1000
+    env_file: "./.env"
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env sh
+
+set -e
+
+# Check if user is root
+if [ "$(id -u)" = '0' ]; then
+    echo "User is root, checking if we need to create a user and group based on environment variables"
+    # Create group and user based on environment variables
+    if [ ! "$(getent group "$PGID")" ]; then
+        # If groupadd exists, use it
+        if command -v groupadd > /dev/null; then
+            groupadd -g "$PGID" jellyplex_watched
+        elif command -v addgroup > /dev/null; then
+            addgroup -g "$PGID" jellyplex_watched
+        fi
+    fi
+
+    # If user id does not exist, create the user
+    if [ ! "$(getent passwd "$PUID")" ]; then
+        if command -v useradd > /dev/null; then
+            useradd --no-create-home -u "$PUID" -g "$PGID" jellyplex_watched
+        elif command -v adduser > /dev/null; then
+            # Get the group name based on the PGID since adduser does not have a flag to specify the group id
+            # and if the group id already exists the group name will be sommething unexpected
+            GROUPNAME=$(getent group "$PGID" | cut -d: -f1)
+            
+            # Use alpine busybox adduser syntax
+            adduser -D -H -u "$PUID" -G "$GROUPNAME" jellyplex_watched
+        fi
+    fi
+else 
+    # If user is not root, set the PUID and PGID to the current user
+    PUID=$(id -u)
+    PGID=$(id -g)
+fi
+
+# Get directory of log and mark file to create base folder if it doesnt exist
+LOG_DIR=$(dirname "$LOG_FILE")
+# If LOG_DIR is set, create the directory
+if [ -n "$LOG_DIR" ]; then
+    mkdir -p "$LOG_DIR"
+fi
+
+MARK_DIR=$(dirname "$MARK_FILE")
+if [ -n "$MARK_DIR" ]; then
+    mkdir -p "$MARK_DIR"  
+fi
+
+echo "Starting JellyPlex-Watched with UID: $PUID and GID: $PGID"
+
+# If root run as the created user
+if [ "$(id -u)" = '0' ]; then
+    chown -R "$PUID:$PGID" "$LOG_DIR"
+    chown -R "$PUID:$PGID" "$MARK_DIR"
+
+    # Run the application as the created user
+    exec gosu "$PUID:$PGID" "$@"
+fi
+
+# Run the application as the current user
+exec "$@"
--- a/requirements.txt
+++ b/requirements.txt
--- a/src/connection.py
+++ b/src/connection.py
@@ -0,0 +1,139 @@
+import os
+from dotenv import load_dotenv
+
+from src.functions import logger, str_to_bool
+from src.plex import Plex
+from src.jellyfin import Jellyfin
+from src.emby import Emby
+
+load_dotenv(override=True)
+
+
+def jellyfin_emby_server_connection(server_baseurl, server_token, server_type):
+    servers = []
+
+    server_baseurl = server_baseurl.split(",")
+    server_token = server_token.split(",")
+
+    if len(server_baseurl) != len(server_token):
+        raise Exception(
+            f"{server_type.upper()}_BASEURL and {server_type.upper()}_TOKEN must have the same number of entries"
+        )
+
+    for i, baseurl in enumerate(server_baseurl):
+        baseurl = baseurl.strip()
+        if baseurl[-1] == "/":
+            baseurl = baseurl[:-1]
+
+        if server_type == "jellyfin":
+            server = Jellyfin(baseurl=baseurl, token=server_token[i].strip())
+            servers.append(
+                (
+                    "jellyfin",
+                    server,
+                )
+            )
+
+        elif server_type == "emby":
+            server = Emby(baseurl=baseurl, token=server_token[i].strip())
+            servers.append(
+                (
+                    "emby",
+                    server,
+                )
+            )
+        else:
+            raise Exception("Unknown server type")
+
+        logger(f"{server_type} Server {i} info: {server.info()}", 3)
+
+    return servers
+
+
+def generate_server_connections():
+    servers = []
+
+    plex_baseurl = os.getenv("PLEX_BASEURL", None)
+    plex_token = os.getenv("PLEX_TOKEN", None)
+    plex_username = os.getenv("PLEX_USERNAME", None)
+    plex_password = os.getenv("PLEX_PASSWORD", None)
+    plex_servername = os.getenv("PLEX_SERVERNAME", None)
+    ssl_bypass = str_to_bool(os.getenv("SSL_BYPASS", "False"))
+
+    if plex_baseurl and plex_token:
+        plex_baseurl = plex_baseurl.split(",")
+        plex_token = plex_token.split(",")
+
+        if len(plex_baseurl) != len(plex_token):
+            raise Exception(
+                "PLEX_BASEURL and PLEX_TOKEN must have the same number of entries"
+            )
+
+        for i, url in enumerate(plex_baseurl):
+            server = Plex(
+                baseurl=url.strip(),
+                token=plex_token[i].strip(),
+                username=None,
+                password=None,
+                servername=None,
+                ssl_bypass=ssl_bypass,
+            )
+
+            logger(f"Plex Server {i} info: {server.info()}", 3)
+
+            servers.append(
+                (
+                    "plex",
+                    server,
+                )
+            )
+
+    if plex_username and plex_password and plex_servername:
+        plex_username = plex_username.split(",")
+        plex_password = plex_password.split(",")
+        plex_servername = plex_servername.split(",")
+
+        if len(plex_username) != len(plex_password) or len(plex_username) != len(
+            plex_servername
+        ):
+            raise Exception(
+                "PLEX_USERNAME, PLEX_PASSWORD and PLEX_SERVERNAME must have the same number of entries"
+            )
+
+        for i, username in enumerate(plex_username):
+            server = Plex(
+                baseurl=None,
+                token=None,
+                username=username.strip(),
+                password=plex_password[i].strip(),
+                servername=plex_servername[i].strip(),
+                ssl_bypass=ssl_bypass,
+            )
+
+            logger(f"Plex Server {i} info: {server.info()}", 3)
+            servers.append(
+                (
+                    "plex",
+                    server,
+                )
+            )
+
+    jellyfin_baseurl = os.getenv("JELLYFIN_BASEURL", None)
+    jellyfin_token = os.getenv("JELLYFIN_TOKEN", None)
+
+    if jellyfin_baseurl and jellyfin_token:
+        servers.extend(
+            jellyfin_emby_server_connection(
+                jellyfin_baseurl, jellyfin_token, "jellyfin"
+            )
+        )
+
+    emby_baseurl = os.getenv("EMBY_BASEURL", None)
+    emby_token = os.getenv("EMBY_TOKEN", None)
+
+    if emby_baseurl and emby_token:
+        servers.extend(
+            jellyfin_emby_server_connection(emby_baseurl, emby_token, "emby")
+        )
+
+    return servers
--- a/src/emby.py
+++ b/src/emby.py
@@ -1,4 +1,5 @@
 from src.jellyfin_emby import JellyfinEmby
+from packaging import version


 class Emby(JellyfinEmby):
@@ -8,7 +9,7 @@ class Emby(JellyfinEmby):
            'Client="JellyPlex-Watched", '
            'Device="script", '
            'DeviceId="script", '
-            'Version="0.0.0"'
+            'Version="6.0.2"'
        )
        headers = {
            "Accept": "application/json",
@@ -19,3 +20,6 @@ class Emby(JellyfinEmby):
        super().__init__(
            server_type="Emby", baseurl=baseurl, token=token, headers=headers
        )
+
+    def is_partial_update_supported(self, server_version):
+        return server_version > version.parse("4.4")
--- a/src/functions.py
+++ b/src/functions.py
@@ -4,8 +4,8 @@ from dotenv import load_dotenv

 load_dotenv(override=True)

-logfile = os.getenv("LOGFILE", "log.log")
-markfile = os.getenv("MARKFILE", "mark.log")
+log_file = os.getenv("LOG_FILE", os.getenv("LOGFILE", "log.log"))
+mark_file = os.getenv("MARK_FILE", os.getenv("MARKFILE", "mark.log"))


 def logger(message: str, log_type=0):
@@ -32,14 +32,14 @@ def logger(message: str, log_type=0):

    if output is not None:
        print(output)
-        file = open(logfile, "a", encoding="utf-8")
-        file.write(output + "\n")
+        with open(f"{log_file}", "a", encoding="utf-8") as file:
+            file.write(output + "\n")


 def log_marked(
    username: str, library: str, movie_show: str, episode: str = None, duration=None
 ):
-    if markfile is None:
+    if mark_file is None:
        return

    output = f"{username}/{library}/{movie_show}"
@@ -50,8 +50,8 @@ def log_marked(
    if duration:
        output += f"/{duration}"

-    file = open(f"{markfile}", "a", encoding="utf-8")
-    file.write(output + "\n")
+    with open(f"{mark_file}", "a", encoding="utf-8") as file:
+        file.write(output + "\n")


 # Reimplementation of distutils.util.strtobool due to it being deprecated
--- a/src/jellyfin.py
+++ b/src/jellyfin.py
@@ -1,4 +1,5 @@
 from src.jellyfin_emby import JellyfinEmby
+from packaging import version


 class Jellyfin(JellyfinEmby):
@@ -8,7 +9,7 @@ class Jellyfin(JellyfinEmby):
            'Client="JellyPlex-Watched", '
            'Device="script", '
            'DeviceId="script", '
-            'Version="5.2.0", '
+            'Version="6.0.2", '
            f'Token="{token}"'
        )
        headers = {
@@ -19,3 +20,6 @@ class Jellyfin(JellyfinEmby):
        super().__init__(
            server_type="Jellyfin", baseurl=baseurl, token=token, headers=headers
        )
+
+    def is_partial_update_supported(self, server_version):
+        return server_version >= version.parse("10.9.0")
--- a/src/jellyfin_emby.py
+++ b/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,
@@ -192,6 +193,19 @@ class JellyfinEmby:
            logger(f"{self.server_type}: Get server name failed {e}", 2)
            raise Exception(e)

+    def get_server_version(self):
+        try:
+            response = self.query("/System/Info/Public", "get")
+
+            if response:
+                return version.parse(response["Version"])
+            else:
+                return None
+
+        except Exception as e:
+            logger(f"{self.server_type}: Get server version failed: {e}", 2)
+            raise Exception(e)
+
    def get_users(self):
        try:
            users = {}
@@ -500,7 +514,7 @@ class JellyfinEmby:
            raise Exception(e)

    def update_user_watched(
-        self, user_name, user_id, library, library_id, videos, dryrun
+        self, user_name, user_id, library, library_id, videos, update_partial, dryrun
    ):
        try:
            logger(
@@ -560,7 +574,7 @@ class JellyfinEmby:
                                library,
                                jellyfin_video.get("Name"),
                            )
-                        else:
+                        elif update_partial:
                            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:
@@ -689,7 +703,7 @@ class JellyfinEmby:
                                        jellyfin_episode.get("SeriesName"),
                                        jellyfin_episode.get("Name"),
                                    )
-                                else:
+                                elif update_partial:
                                    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}"
@@ -741,6 +755,15 @@ class JellyfinEmby:
        self, watched_list, user_mapping=None, library_mapping=None, dryrun=False
    ):
        try:
+            server_version = self.get_server_version()
+            update_partial = self.is_partial_update_supported(server_version)
+
+            if not update_partial:
+                logger(
+                    f"{self.server_type}: Server version {server_version} does not support updating playback position.",
+                    2,
+                )
+
            for user, libraries in watched_list.items():
                logger(f"{self.server_type}: Updating for entry {user}, {libraries}", 1)
                user_other = None
@@ -813,7 +836,13 @@ class JellyfinEmby:

                    if library_id:
                        self.update_user_watched(
-                            user_name, user_id, library, library_id, videos, dryrun
+                            user_name,
+                            user_id,
+                            library,
+                            library_id,
+                            videos,
+                            update_partial,
+                            dryrun,
                        )

        except Exception as e:
--- a/src/main.py
+++ b/src/main.py
@@ -6,196 +6,16 @@ from src.functions import (
    logger,
    str_to_bool,
 )
-from src.users import (
-    generate_user_list,
-    combine_user_lists,
-    filter_user_lists,
-    generate_server_users,
-)
+from src.users import setup_users
 from src.watched import (
    cleanup_watched,
 )
 from src.black_white import setup_black_white_lists
-
-from src.plex import Plex
-from src.jellyfin import Jellyfin
-from src.emby import Emby
+from src.connection import generate_server_connections

 load_dotenv(override=True)


-def setup_users(
-    server_1, server_2, blacklist_users, whitelist_users, user_mapping=None
-):
-    server_1_users = generate_user_list(server_1)
-    server_2_users = generate_user_list(server_2)
-    logger(f"Server 1 users: {server_1_users}", 1)
-    logger(f"Server 2 users: {server_2_users}", 1)
-
-    users = combine_user_lists(server_1_users, server_2_users, user_mapping)
-    logger(f"User list that exist on both servers {users}", 1)
-
-    users_filtered = filter_user_lists(users, blacklist_users, whitelist_users)
-    logger(f"Filtered user list {users_filtered}", 1)
-
-    output_server_1_users = generate_server_users(server_1, users_filtered)
-    output_server_2_users = generate_server_users(server_2, users_filtered)
-
-    # Check if users is none or empty
-    if output_server_1_users is None or len(output_server_1_users) == 0:
-        logger(
-            f"No users found for server 1 {server_1[0]}, users: {server_1_users}, overlapping users {users}, filtered users {users_filtered}, server 1 users {server_1[1].users}"
-        )
-
-    if output_server_2_users is None or len(output_server_2_users) == 0:
-        logger(
-            f"No users found for server 2 {server_2[0]}, users: {server_2_users}, overlapping users {users} filtered users {users_filtered}, server 2 users {server_2[1].users}"
-        )
-
-    if (
-        output_server_1_users is None
-        or len(output_server_1_users) == 0
-        or output_server_2_users is None
-        or len(output_server_2_users) == 0
-    ):
-        raise Exception("No users found for one or both servers")
-
-    logger(f"Server 1 users: {output_server_1_users}", 1)
-    logger(f"Server 2 users: {output_server_2_users}", 1)
-
-    return output_server_1_users, output_server_2_users
-
-
-def jellyfin_emby_server_connection(server_baseurl, server_token, server_type):
-    servers = []
-
-    server_baseurl = server_baseurl.split(",")
-    server_token = server_token.split(",")
-
-    if len(server_baseurl) != len(server_token):
-        raise Exception(
-            f"{server_type.upper()}_BASEURL and {server_type.upper()}_TOKEN must have the same number of entries"
-        )
-
-    for i, baseurl in enumerate(server_baseurl):
-        baseurl = baseurl.strip()
-        if baseurl[-1] == "/":
-            baseurl = baseurl[:-1]
-
-        if server_type == "jellyfin":
-            server = Jellyfin(baseurl=baseurl, token=server_token[i].strip())
-            servers.append(
-                (
-                    "jellyfin",
-                    server,
-                )
-            )
-
-        elif server_type == "emby":
-            server = Emby(baseurl=baseurl, token=server_token[i].strip())
-            servers.append(
-                (
-                    "emby",
-                    server,
-                )
-            )
-        else:
-            raise Exception("Unknown server type")
-
-        logger(f"{server_type} Server {i} info: {server.info()}", 3)
-
-    return servers
-
-
-def generate_server_connections():
-    servers = []
-
-    plex_baseurl = os.getenv("PLEX_BASEURL", None)
-    plex_token = os.getenv("PLEX_TOKEN", None)
-    plex_username = os.getenv("PLEX_USERNAME", None)
-    plex_password = os.getenv("PLEX_PASSWORD", None)
-    plex_servername = os.getenv("PLEX_SERVERNAME", None)
-    ssl_bypass = str_to_bool(os.getenv("SSL_BYPASS", "False"))
-
-    if plex_baseurl and plex_token:
-        plex_baseurl = plex_baseurl.split(",")
-        plex_token = plex_token.split(",")
-
-        if len(plex_baseurl) != len(plex_token):
-            raise Exception(
-                "PLEX_BASEURL and PLEX_TOKEN must have the same number of entries"
-            )
-
-        for i, url in enumerate(plex_baseurl):
-            server = Plex(
-                baseurl=url.strip(),
-                token=plex_token[i].strip(),
-                username=None,
-                password=None,
-                servername=None,
-                ssl_bypass=ssl_bypass,
-            )
-
-            logger(f"Plex Server {i} info: {server.info()}", 3)
-
-            servers.append(
-                (
-                    "plex",
-                    server,
-                )
-            )
-
-    if plex_username and plex_password and plex_servername:
-        plex_username = plex_username.split(",")
-        plex_password = plex_password.split(",")
-        plex_servername = plex_servername.split(",")
-
-        if len(plex_username) != len(plex_password) or len(plex_username) != len(
-            plex_servername
-        ):
-            raise Exception(
-                "PLEX_USERNAME, PLEX_PASSWORD and PLEX_SERVERNAME must have the same number of entries"
-            )
-
-        for i, username in enumerate(plex_username):
-            server = Plex(
-                baseurl=None,
-                token=None,
-                username=username.strip(),
-                password=plex_password[i].strip(),
-                servername=plex_servername[i].strip(),
-                ssl_bypass=ssl_bypass,
-            )
-
-            logger(f"Plex Server {i} info: {server.info()}", 3)
-            servers.append(
-                (
-                    "plex",
-                    server,
-                )
-            )
-
-    jellyfin_baseurl = os.getenv("JELLYFIN_BASEURL", None)
-    jellyfin_token = os.getenv("JELLYFIN_TOKEN", None)
-
-    if jellyfin_baseurl and jellyfin_token:
-        servers.extend(
-            jellyfin_emby_server_connection(
-                jellyfin_baseurl, jellyfin_token, "jellyfin"
-            )
-        )
-
-    emby_baseurl = os.getenv("EMBY_BASEURL", None)
-    emby_token = os.getenv("EMBY_TOKEN", None)
-
-    if emby_baseurl and emby_token:
-        servers.extend(
-            jellyfin_emby_server_connection(emby_baseurl, emby_token, "emby")
-        )
-
-    return servers
-
-
 def should_sync_server(server_1_type, server_2_type):
    sync_from_plex_to_jellyfin = str_to_bool(
        os.getenv("SYNC_FROM_PLEX_TO_JELLYFIN", "True")
@@ -262,10 +82,10 @@ def should_sync_server(server_1_type, server_2_type):


 def main_loop():
-    logfile = os.getenv("LOGFILE", "log.log")
-    # Delete logfile if it exists
-    if os.path.exists(logfile):
-        os.remove(logfile)
+    log_file = os.getenv("LOG_FILE", os.getenv("LOGFILE", "log.log"))
+    # Delete log_file if it exists
+    if os.path.exists(log_file):
+        os.remove(log_file)

    dryrun = str_to_bool(os.getenv("DRYRUN", "False"))
    logger(f"Dryrun: {dryrun}", 1)
--- a/src/users.py
+++ b/src/users.py
@@ -89,3 +89,45 @@ def generate_server_users(server, users):
                server_users[jellyfin_user] = jellyfin_id

    return server_users
+
+
+def setup_users(
+    server_1, server_2, blacklist_users, whitelist_users, user_mapping=None
+):
+    server_1_users = generate_user_list(server_1)
+    server_2_users = generate_user_list(server_2)
+    logger(f"Server 1 users: {server_1_users}", 1)
+    logger(f"Server 2 users: {server_2_users}", 1)
+
+    users = combine_user_lists(server_1_users, server_2_users, user_mapping)
+    logger(f"User list that exist on both servers {users}", 1)
+
+    users_filtered = filter_user_lists(users, blacklist_users, whitelist_users)
+    logger(f"Filtered user list {users_filtered}", 1)
+
+    output_server_1_users = generate_server_users(server_1, users_filtered)
+    output_server_2_users = generate_server_users(server_2, users_filtered)
+
+    # Check if users is none or empty
+    if output_server_1_users is None or len(output_server_1_users) == 0:
+        logger(
+            f"No users found for server 1 {server_1[0]}, users: {server_1_users}, overlapping users {users}, filtered users {users_filtered}, server 1 users {server_1[1].users}"
+        )
+
+    if output_server_2_users is None or len(output_server_2_users) == 0:
+        logger(
+            f"No users found for server 2 {server_2[0]}, users: {server_2_users}, overlapping users {users} filtered users {users_filtered}, server 2 users {server_2[1].users}"
+        )
+
+    if (
+        output_server_1_users is None
+        or len(output_server_1_users) == 0
+        or output_server_2_users is None
+        or len(output_server_2_users) == 0
+    ):
+        raise Exception("No users found for one or both servers")
+
+    logger(f"Server 1 users: {output_server_1_users}", 1)
+    logger(f"Server 2 users: {output_server_2_users}", 1)
+
+    return output_server_1_users, output_server_2_users
--- a/test/ci_emby.env
+++ b/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
--- a/test/ci_guids.env
+++ b/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
--- a/test/ci_jellyfin.env
+++ b/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
--- a/test/ci_locations.env
+++ b/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
--- a/test/ci_plex.env
+++ b/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
--- a/test/ci_write.env
+++ b/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
--- a/test/validate_ci_marklog.py
+++ b/test/validate_ci_marklog.py
@@ -90,25 +90,25 @@ def main():
    ]
    expected_emby = [
        "jellyplex_watched/Movies/Tears of Steel",
-            "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Aftermath",
-            "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Parallels and Interiors/240429",
-            "JellyUser/Movies/Tears of Steel",
-            "JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
+        "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Aftermath",
+        "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Parallels and Interiors/240429",
+        "JellyUser/Movies/Tears of Steel",
+        "JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
    ]
    expected_plex = [
        "JellyUser/Movies/Big Buck Bunny",
-            "JellyUser/Movies/Killers of the Flower Moon/4",
-            "JellyUser/Shows/Doctor Who/The Unquiet Dead",
-            "JellyUser/Shows/Doctor Who/Aliens of London (1)/4",
-            "JellyUser/Shows/Monarch: Legacy of Monsters/Secrets and Lies",
-            "JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
-            "jellyplex_watched/Movies/Big Buck Bunny",
-            "jellyplex_watched/Movies/The Family Plan",
-            "jellyplex_watched/Movies/Killers of the Flower Moon/4",
-            "jellyplex_watched/TV Shows/Doctor Who (2005)/The Unquiet Dead",
-            "jellyplex_watched/TV Shows/Doctor Who (2005)/Aliens of London (1)/4",
-            "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Secrets and Lies",
-            "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/The Way Out",
+        "JellyUser/Movies/Killers of the Flower Moon/4",
+        "JellyUser/Shows/Doctor Who/The Unquiet Dead",
+        "JellyUser/Shows/Doctor Who/Aliens of London (1)/4",
+        "JellyUser/Shows/Monarch: Legacy of Monsters/Secrets and Lies",
+        "JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
+        "jellyplex_watched/Movies/Big Buck Bunny",
+        "jellyplex_watched/Movies/The Family Plan",
+        "jellyplex_watched/Movies/Killers of the Flower Moon/4",
+        "jellyplex_watched/TV Shows/Doctor Who (2005)/The Unquiet Dead",
+        "jellyplex_watched/TV Shows/Doctor Who (2005)/Aliens of London (1)/4",
+        "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Secrets and Lies",
+        "jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/The Way Out",
    ]

    expected_dry = expected_emby + expected_plex + expected_jellyfin
Author	SHA1	Message	Date
Luigi311	7e13c14636	Merge pull request #195 from luigi311/fix_user Fix user	2024-09-13 17:01:45 -06:00
Luis Garcia	0c218fa9dd	Entrypoint: Alpine fix overlapping PGID issue	2024-09-13 16:24:58 -06:00
Luis Garcia	b3b0ccac73	Docker: Fix alpine	2024-09-13 10:12:18 -06:00
Luis Garcia	fa0134551f	Entrypoint: Check root user, check addgroup/adduser command exists	2024-09-13 09:56:34 -06:00
Luis Garcia	34d62c9021	Docker: Add dos2unix	2024-09-08 01:28:11 -06:00
Luis Garcia	920bbbb3be	Move more functions out of main	2024-09-05 16:21:06 -06:00
Luis Garcia	762e5f10da	Fix typos in variables	2024-08-28 17:14:45 -06:00
Luis Garcia	27797cb361	Formatting	2024-08-28 17:14:37 -06:00
Luis Garcia	066f9d1f66	Docker Compose: Use env_file for most variables	2024-08-28 16:46:19 -06:00
Luis Garcia	acf7c2cdf2	Entrypoint: Fix typos	2024-08-28 16:45:58 -06:00
Luis Garcia	469857a31a	Dockerfiles: Remove most env	2024-08-28 16:45:37 -06:00
Luigi311	405e5decf2	CI: Move away from docker-compose	2024-08-11 06:14:50 -06:00
Luigi311	da9abf8a24	Merge pull request #187 from luigi311/puid_pgid Add puid pgid support to fix permission issues	2024-08-03 08:30:18 -06:00
Luis Garcia	128c6a1c76	Fix missing logs/mark folder if set	2024-07-24 02:09:04 -06:00
Luis Garcia	99f32c10ef	Add support for PGID and PUID	2024-07-24 01:57:45 -06:00
Luigi311	44e42f99db	Merge pull request #185 from luigi311/partial_support_check Jellyfin/Emby: Check partial sync support	2024-07-15 21:08:07 -06:00
awakenedhaggis	b1639eab0f	Jellyfin/Emby: Check partial sync support - add `is_partial_update_supported` method to each class to validate given version against earliest known supported version - add `get_server_version` to get server version number - add `update_partial` parameter to user update function, deciding whether or not to allow partial updates	2024-07-15 11:45:43 -06:00
Luis Garcia	679d3535b1	CI: Fix latest	2024-07-15 05:10:36 -06:00
Luis Garcia	a795d4bba5	README: Remove dev information	2024-07-15 04:36:27 -06:00
Luis Garcia	0a025cf5fa	Tie latest to version releases Tie latest to version releases so dev no longer needs to exists and instead main is the new dev.	2024-07-15 04:36:27 -06:00
Luigi311	6a1ceb4db3	Merge pull request #182 from luigi311/dev Jellyfin: Skip partial on version lower than 10.9	2024-07-15 03:36:40 -06:00
Luis Garcia	99c339c405	CI: Plex remove https	2024-07-15 03:28:59 -06:00
Luis Garcia	bd75d865ba	Update PlexAPI and requests	2024-07-15 03:03:44 -06:00
Luis Garcia	d30e03b702	Jellyfin: Skip partial on version lower than 10.9	2024-07-15 03:01:53 -06:00