Merge pull request #140 from luigi311/fixes

Fixes

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
   pytest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install dependencies"
         run: pip install -r requirements.txt && pip install -r test/requirements.txt
@@ -25,7 +25,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install dependencies"
         run: |
@@ -33,7 +33,7 @@ jobs:
           sudo apt update && sudo apt install -y docker-compose
 
       - name: "Checkout JellyPlex-Watched-CI"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: luigi311/JellyPlex-Watched-CI
           path: JellyPlex-Watched-CI
@@ -95,11 +95,11 @@ jobs:
             variant: slim
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched,enable=${{ secrets.DOCKER_USERNAME != '' }}
@@ -121,23 +121,23 @@ jobs:
             type=sha,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         if: "${{ env.DOCKER_USERNAME != '' }}"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: "${{ steps.docker_meta.outcome == 'success' }}"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -146,7 +146,7 @@ jobs:
       - name: Build
         id: build
         if: "${{ steps.docker_meta.outputs.tags == '' }}"
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ${{ matrix.dockerfile }}
@@ -157,7 +157,7 @@ jobs:
       - name: Build Push
         id: build_push
         if: "${{ steps.docker_meta.outputs.tags != '' }}"
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ${{ matrix.dockerfile }}

.gitignore

@@ -1,4 +1,4 @@
-.env
+**.env
 *.prof
 
 # Byte-compiled / optimized / DLL files

src/main.py

@@ -1,4 +1,4 @@
-import os, traceback, json, asyncio
+import os, traceback, json
 from dotenv import load_dotenv
 from time import sleep, perf_counter
 
@@ -28,6 +28,8 @@ def setup_users(
 ):
     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)
@@ -180,15 +182,13 @@ def get_server_watched(
             library_mapping,
         )
     elif server_connection[0] == "jellyfin":
-        return asyncio.run(
+        return server_connection[1].get_watched(
-            server_connection[1].get_watched(
+            users,
-                users,
+            blacklist_library,
-                blacklist_library,
+            whitelist_library,
-                whitelist_library,
+            blacklist_library_type,
-                blacklist_library_type,
+            whitelist_library_type,
-                whitelist_library_type,
+            library_mapping,
-                library_mapping,
-            )
         )
 
 
@@ -204,10 +204,8 @@ def update_server_watched(
             server_watched_filtered, user_mapping, library_mapping, dryrun
         )
     elif server_connection[0] == "jellyfin":
-        asyncio.run(
+        server_connection[1].update_watched(
-            server_connection[1].update_watched(
+            server_watched_filtered, user_mapping, library_mapping, dryrun
-                server_watched_filtered, user_mapping, library_mapping, dryrun
-            )
         )