Merge pull request #44 from luigi311/dev

Fix issues with certain libraries failing

.env.sample

@@ -1,38 +1,68 @@
-## Do not mark any shows/movies as played and instead just output to log if they would of been marked.
-DRYRUN = "True"
-## Additional logging information
-DEBUG = "True"
-## How often to run the script in seconds
-SLEEP_DURATION = "3600"
-## Log file where all output will be written to
-LOGFILE = "log.log"
-## Map usernames between plex and jellyfin in the event that they are different, order does not matter
-#USER_MAPPING = { "testuser2": "testuser3" }
-## Map libraries between plex and jellyfin in the even that they are different, order does not matter
-#LIBRARY_MAPPING = { "Shows": "TV Shows" }
-
-
-## 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
-PLEX_BASEURL = "http://localhost:32400"
-## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
-PLEX_TOKEN = "SuperSecretToken"
-## If not using plex token then use username and password of the server admin along with the servername
-#PLEX_USERNAME = ""
-#PLEX_PASSWORD = ""
-#PLEX_SERVERNAME = "Plex Server"
-
-
-## Jellyfin server URL, use hostname or IP address if the hostname is not resolving correctly
-JELLYFIN_BASEURL = "http://localhost:8096"
-## Jellyfin api token, created manually by logging in to the jellyfin server admin dashboard and creating an api key
-JELLYFIN_TOKEN = "SuperSecretToken"
-
-
-## Blacklisting/Whitelisting libraries, library types such as Movies/TV Shows, and users. Mappings apply so if the mapping for the user or library exist then both will be excluded.
-#BLACKLIST_LIBRARY = ""
-#WHITELIST_LIBRARY = ""
-#BLACKLIST_LIBRARY_TYPE = "" 
-#WHITELIST_LIBRARY_TYPE = ""
-#BLACKLIST_USERS = ""
-WHITELIST_USERS = "testuser1,testuser2"
+# Global Settings
+
+## Do not mark any shows/movies as played and instead just output to log if they would of been marked.
+DRYRUN = "True"
+
+## Additional logging information
+DEBUG = "False"
+
+## Debugging level, "info" is default, "debug" is more verbose
+DEBUG_LEVEL = "info"
+
+## How often to run the script in seconds
+SLEEP_DURATION = "3600"
+
+## Log file where all output will be written to
+LOGFILE = "log.log"
+
+## Map usernames between servers in the event that they are different, order does not matter
+## Comma separated for multiple options
+#USER_MAPPING = { "testuser2": "testuser3", "testuser1":"testuser4" }
+
+## Map libraries between servers in the even that they are different, order does not matter
+## Comma separated for multiple options
+#LIBRARY_MAPPING = { "Shows": "TV Shows", "Movie": "Movies" }
+
+## Blacklisting/Whitelisting libraries, library types such as Movies/TV Shows, and users. Mappings apply so if the mapping for the user or library exist then both will be excluded.
+## Comma separated for multiple options
+#BLACKLIST_LIBRARY = ""
+#WHITELIST_LIBRARY = ""
+#BLACKLIST_LIBRARY_TYPE = "" 
+#WHITELIST_LIBRARY_TYPE = ""
+#BLACKLIST_USERS = ""
+WHITELIST_USERS = "testuser1,testuser2"
+
+
+
+# Plex
+
+## 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 separated list for multiple servers
+PLEX_BASEURL = "http://localhost:32400, https://nas:32400"
+
+## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
+## Comma separated list for multiple servers
+PLEX_TOKEN = "SuperSecretToken, SuperSecretToken2"
+
+## If not using plex token then use username and password of the server admin along with the servername
+## Comma separated for multiple options
+#PLEX_USERNAME = "PlexUser, PlexUser2"
+#PLEX_PASSWORD = "SuperSecret, SuperSecret2"
+#PLEX_SERVERNAME = "Plex Server1, Plex Server2"
+
+## Skip hostname validation for ssl certificates.
+## Set to True if running into ssl certificate errors
+SSL_BYPASS = "False"
+
+
+
+# Jellyfin
+
+## Jellyfin server URL, use hostname or IP address if the hostname is not resolving correctly
+## Comma separated list for multiple servers
+JELLYFIN_BASEURL = "http://localhost:8096, http://nas:8096"
+
+## Jellyfin api token, created manually by logging in to the jellyfin server admin dashboard and creating an api key
+## Comma separated list for multiple servers
+JELLYFIN_TOKEN = "SuperSecretToken, SuperSecretToken2"

.github/workflows/ci.yml

@@ -1,74 +1,86 @@
-name: CI
-on:
-  push:
-    paths-ignore:
-      - .gitignore
-      - "*.md"
-  pull_request:
-    paths-ignore:
-      - .gitignore
-      - "*.md"
-  
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Docker meta
-        id: docker_meta
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        if: "${{ env.DOCKER_USERNAME != '' }}"
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched # list of Docker images to use as base name for tags
-          tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        if: "${{ steps.docker_meta.outcome == 'success' }}"
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build
-        id: build
-        if: "${{ steps.docker_meta.outcome == 'skipped' }}"
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: false
-          tags: jellyplex-watched:action
-      
-      - name: Build Push
-        id: build_push
-        if: "${{ steps.docker_meta.outcome == 'success' }}"
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-
-      # Echo digest so users can validate their image
-      - name: Image digest
-        if: "${{ steps.docker_meta.outcome == 'success' }}"
-        run: echo "${{ steps.build_push.outputs.digest }}"
+name: CI
+on:
+  push:
+    paths-ignore:
+      - .gitignore
+      - "*.md"
+  pull_request:
+    paths-ignore:
+      - .gitignore
+      - "*.md"
+  
+jobs:
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: "Install dependencies"
+        run: pip install -r requirements.txt && pip install -r test/requirements.txt
+
+      - name: "Run tests"
+        run: pytest -vvv
+  
+  docker:
+    runs-on: ubuntu-latest
+    needs: pytest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: docker_meta
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        if: "${{ env.DOCKER_USERNAME != '' }}"
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched # list of Docker images to use as base name for tags
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        if: "${{ steps.docker_meta.outcome == 'success' }}"
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build
+        id: build
+        if: "${{ steps.docker_meta.outcome == 'skipped' }}"
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: false
+          tags: jellyplex-watched:action
+      
+      - name: Build Push
+        id: build_push
+        if: "${{ steps.docker_meta.outcome == 'success' }}"
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+
+      # Echo digest so users can validate their image
+      - name: Image digest
+        if: "${{ steps.docker_meta.outcome == 'success' }}"
+        run: echo "${{ steps.build_push.outputs.digest }}"

.github/workflows/codeql.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: "23 20 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ python ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.gitignore

@@ -1,131 +1,132 @@
-.env
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
+.env
+*.prof
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: Main",
+      "type": "python",
+      "request": "launch",
+      "program": "main.py",
+      "console": "integratedTerminal",
+      "justMyCode": true
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}

Dockerfile

@@ -1,10 +1,41 @@
-FROM python:3-slim
-
-WORKDIR /app
-
-COPY ./requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-CMD ["python", "-u", "main.py"]
+FROM python:3-slim
+
+ENV DRYRUN 'True'
+ENV DEBUG 'True'
+ENV DEBUG_LEVEL 'INFO'
+ENV SLEEP_DURATION '3600'
+ENV LOGFILE 'log.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 BLACKLIST_LIBRARY ''
+ENV WHITELIST_LIBRARY ''
+ENV BLACKLIST_LIBRARY_TYPE  '' 
+ENV WHITELIST_LIBRARY_TYPE  ''
+ENV BLACKLIST_USERS  ''
+ENV WHITELIST_USERS  ''
+
+WORKDIR /app
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY ./requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD ["python", "-u", "main.py"]

README.md

@@ -1,69 +1,143 @@
-# JellyPlex-Watched
-
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/26b47c5db63942f28f02f207f692dc85)](https://www.codacy.com/gh/luigi311/JellyPlex-Watched/dashboard?utm_source=github.com&utm_medium=referral&utm_content=luigi311/JellyPlex-Watched&utm_campaign=Badge_Grade)
-
-Sync watched between jellyfin and plex
-
-## Description
-
-Keep in sync all your users watched history between jellyfin and plex locally. This uses the imdb ids and any other matching id to find the correct episode/movie between the two. This is not perfect but it works for most cases.
-
-## Installation
-
-### Baremeta
-
--   Setup virtualenv of your choice
-
--   Install dependencies
-
-    ```bash
-      pip install -r requirements.txt
-    ```
-
--   Create a .env file similar to .env.sample, uncomment whitelist and blacklist if needed, fill in baseurls and tokens
-
--   Run
-
-    ```bash
-    python main.py
-    ```
-
-### Docker
-
--   Build docker image
-
-    ```bash
-    docker build -t jellyplex-watched .
-    ```
-
--   or use pre-built image
-
-    ```bash
-    docker pull luigi311/jellyplex-watched:latest
-    ```
-
-#### With variables
-
--   Run
-
-    ```bash
-    docker run --rm -it -e PLEX_TOKEN='SuperSecretToken' luigi311/jellyplex-watched:latest
-    ```
-
-#### With .env
-
--   Create a .env file similar to .env.sample and set the MNEMONIC variable to your seed phrase
-
--   Run
-
-    ```bash
-     docker run --rm -it -v "$(pwd)/.env:/app/.env" luigi311/jellyplex-watched:latest
-    ```
-
-## Contributing
-
-I am open to recieving 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.
-
-## License
-
-This is currently under the GNU General Public License v3.0.
+# JellyPlex-Watched
+
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/26b47c5db63942f28f02f207f692dc85)](https://www.codacy.com/gh/luigi311/JellyPlex-Watched/dashboard?utm_source=github.com&utm_medium=referral&utm_content=luigi311/JellyPlex-Watched&utm_campaign=Badge_Grade)
+
+Sync watched between jellyfin and plex locally
+
+## Description
+
+Keep in sync all your users watched history between jellyfin and plex servers locally. This uses file names and provider ids to find the correct episode/movie between the two. This is not perfect but it works for most cases. You can use this for as many servers as you want by entering multiple options in the .env plex/jellyfin section separated by commas.
+
+## Configuration
+
+```bash
+# Global Settings
+
+## Do not mark any shows/movies as played and instead just output to log if they would of been marked.
+DRYRUN = "True"
+
+## Additional logging information
+DEBUG = "False"
+
+## Debugging level, "info" is default, "debug" is more verbose
+DEBUG_LEVEL = "info"
+
+## How often to run the script in seconds
+SLEEP_DURATION = "3600"
+
+## Log file where all output will be written to
+LOGFILE = "log.log"
+
+## Map usernames between servers in the event that they are different, order does not matter
+## Comma separated for multiple options
+USER_MAPPING = { "testuser2": "testuser3", "testuser1":"testuser4" }
+
+## Map libraries between servers in the even that they are different, order does not matter
+## Comma separated for multiple options
+LIBRARY_MAPPING = { "Shows": "TV Shows", "Movie": "Movies" }
+
+## Blacklisting/Whitelisting libraries, library types such as Movies/TV Shows, and users. Mappings apply so if the mapping for the user or library exist then both will be excluded.
+## Comma separated for multiple options
+BLACKLIST_LIBRARY = ""
+WHITELIST_LIBRARY = ""
+BLACKLIST_LIBRARY_TYPE = "" 
+WHITELIST_LIBRARY_TYPE = ""
+BLACKLIST_USERS = ""
+WHITELIST_USERS = "testuser1,testuser2"
+
+
+
+# Plex
+
+## 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 separated list for multiple servers
+PLEX_BASEURL = "http://localhost:32400, https://nas:32400"
+
+## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
+## Comma separated list for multiple servers
+PLEX_TOKEN = "SuperSecretToken, SuperSecretToken2"
+
+## If not using plex token then use username and password of the server admin along with the servername
+## Comma separated for multiple options
+#PLEX_USERNAME = "PlexUser, PlexUser2"
+#PLEX_PASSWORD = "SuperSecret, SuperSecret2"
+#PLEX_SERVERNAME = "Plex Server1, Plex Server2"
+
+## Skip hostname validation for ssl certificates.
+## Set to True if running into ssl certificate errors
+SSL_BYPASS = "False"
+
+
+
+# Jellyfin
+
+## Jellyfin server URL, use hostname or IP address if the hostname is not resolving correctly
+## Comma separated list for multiple servers
+JELLYFIN_BASEURL = "http://localhost:8096, http://nas:8096"
+
+## Jellyfin api token, created manually by logging in to the jellyfin server admin dashboard and creating an api key
+## Comma separated list for multiple servers
+JELLYFIN_TOKEN = "SuperSecretToken, SuperSecretToken2"
+```
+
+
+## Installation
+
+### Baremetal
+
+-   Setup virtualenv of your choice
+
+-   Install dependencies
+
+    ```bash
+      pip install -r requirements.txt
+    ```
+
+-   Create a .env file similar to .env.sample, uncomment whitelist and blacklist if needed, fill in baseurls and tokens
+
+-   Run
+
+    ```bash
+    python main.py
+    ```
+
+### Docker
+
+-   Build docker image
+
+    ```bash
+    docker build -t jellyplex-watched .
+    ```
+
+-   or use pre-built image
+
+    ```bash
+    docker pull luigi311/jellyplex-watched:latest
+    ```
+
+#### With variables
+
+-   Run
+
+    ```bash
+    docker run --rm -it -e PLEX_TOKEN='SuperSecretToken' luigi311/jellyplex-watched:latest
+    ```
+
+#### With .env
+
+-   Create a .env file similar to .env.sample and set the variables to match your setup
+
+-   Run
+
+    ```bash
+     docker run --rm -it -v "$(pwd)/.env:/app/.env" luigi311/jellyplex-watched:latest
+    ```
+
+## 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.
+
+## License
+
+This is currently under the GNU General Public License v3.0.

main.py

@@ -1,294 +1,11 @@
-import copy, os, traceback, json
-from dotenv import load_dotenv
-from time import sleep
-
-from src.functions import logger, str_to_bool, search_mapping
-from src.plex import Plex
-from src.jellyfin import Jellyfin
-
-load_dotenv(override=True)
-
-def cleanup_watched(watched_list_1, watched_list_2, user_mapping=None, library_mapping=None):
-    modified_watched_list_1 = copy.deepcopy(watched_list_1)
-
-    # remove entries from plex_watched that are in jellyfin_watched
-    for user_1 in watched_list_1:
-        user_other = None
-        if user_mapping:
-            user_other = search_mapping(user_mapping, user_1)
-        if user_1 in modified_watched_list_1:
-            if user_1 in watched_list_2:
-                user_2 = user_1
-            elif user_other in watched_list_2:
-                user_2 = user_other
-            else:
-                logger(f"User {user_1} and {user_other} not found in watched list 2", 1)
-                continue
-
-            for library_1 in watched_list_1[user_1]:
-                library_other = None
-                if library_mapping:
-                    library_other = search_mapping(library_mapping, library_1)
-                if library_1 in modified_watched_list_1[user_1]:
-                    if library_1 in watched_list_2[user_2]:
-                        library_2 = library_1
-                    elif library_other in watched_list_2[user_2]:
-                        library_2 = library_other
-                    else:
-                        logger(f"User {library_1} and {library_other} not found in watched list 2", 1)
-                        continue
-                    for item in watched_list_1[user_1][library_1]:
-                        if item in modified_watched_list_1[user_1][library_1]:
-                            # Movies
-                            if isinstance(watched_list_1[user_1][library_1], list):
-                                for watch_list_1_key, watch_list_1_value in item.items():
-                                    for watch_list_2_item in watched_list_2[user_2][library_2]:
-                                        for watch_list_2_item_key, watch_list_2_item_value in watch_list_2_item.items():
-                                            if watch_list_1_key == watch_list_2_item_key and watch_list_1_value == watch_list_2_item_value:
-                                                if item in modified_watched_list_1[user_1][library_1]:
-                                                    modified_watched_list_1[user_1][library_1].remove(item)
-
-                            # TV Shows
-                            elif isinstance(watched_list_1[user_1][library_1], dict):
-                                if item in watched_list_2[user_2][library_2]:
-                                    for season in watched_list_1[user_1][library_1][item]:
-                                        if season in watched_list_2[user_2][library_2][item]:
-                                            for episode in watched_list_1[user_1][library_1][item][season]:
-                                                for watch_list_1_episode_key, watch_list_1_episode_value in episode.items():
-                                                    for watch_list_2_episode in watched_list_2[user_2][library_2][item][season]:
-                                                        for watch_list_2_episode_key, watch_list_2_episode_value in watch_list_2_episode.items():
-                                                            if watch_list_1_episode_key == watch_list_2_episode_key and watch_list_1_episode_value == watch_list_2_episode_value:
-                                                                if episode in modified_watched_list_1[user_1][library_1][item][season]:
-                                                                    modified_watched_list_1[user_1][library_1][item][season].remove(episode)
-
-                                        # If season is empty, remove season
-                                        if len(modified_watched_list_1[user_1][library_1][item][season]) == 0:
-                                            if season in modified_watched_list_1[user_1][library_1][item]:
-                                                del modified_watched_list_1[user_1][library_1][item][season]
-
-                                # If the show is empty, remove the show
-                                if len(modified_watched_list_1[user_1][library_1][item]) == 0:
-                                    if item in modified_watched_list_1[user_1][library_1]:
-                                        del modified_watched_list_1[user_1][library_1][item]
-
-                    # If library is empty then remove it
-                    if len(modified_watched_list_1[user_1][library_1]) == 0:
-                        if library_1 in modified_watched_list_1[user_1]:
-                            del modified_watched_list_1[user_1][library_1]
-
-        # If user is empty delete user
-        if len(modified_watched_list_1[user_1]) == 0:
-            del modified_watched_list_1[user_1]
-
-    return modified_watched_list_1
-
-def setup_black_white_lists(library_mapping=None):
-    blacklist_library = os.getenv("BLACKLIST_LIBRARY")
-    if blacklist_library:
-        if len(blacklist_library) > 0:
-            blacklist_library = blacklist_library.split(",")
-            blacklist_library = [x.strip() for x in blacklist_library]
-            if library_mapping:
-                temp_library = []
-                for library in blacklist_library:
-                    library_other = search_mapping(library_mapping, library)
-                    if library_other:
-                        temp_library.append(library_other)
-
-                blacklist_library = blacklist_library + temp_library
-    else:
-        blacklist_library = []
-
-    logger(f"Blacklist Library: {blacklist_library}", 1)
-
-    whitelist_library = os.getenv("WHITELIST_LIBRARY")
-    if whitelist_library:
-        if len(whitelist_library) > 0:
-            whitelist_library = whitelist_library.split(",")
-            whitelist_library = [x.strip() for x in whitelist_library]
-            if library_mapping:
-                temp_library = []
-                for library in whitelist_library:
-                    library_other = search_mapping(library_mapping, library)
-                    if library_other:
-                        temp_library.append(library_other)
-
-                whitelist_library = whitelist_library + temp_library
-    else:
-        whitelist_library = []
-    logger(f"Whitelist Library: {whitelist_library}", 1)
-
-    blacklist_library_type = os.getenv("BLACKLIST_LIBRARY_TYPE")
-    if blacklist_library_type:
-        if len(blacklist_library_type) > 0:
-            blacklist_library_type = blacklist_library_type.split(",")
-            blacklist_library_type = [x.lower().strip() for x in blacklist_library_type]
-    else:
-        blacklist_library_type = []
-    logger(f"Blacklist Library Type: {blacklist_library_type}", 1)
-
-    whitelist_library_type = os.getenv("WHITELIST_LIBRARY_TYPE")
-    if whitelist_library_type:
-        if len(whitelist_library_type) > 0:
-            whitelist_library_type = whitelist_library_type.split(",")
-            whitelist_library_type = [x.lower().strip() for x in whitelist_library_type]
-    else:
-        whitelist_library_type = []
-    logger(f"Whitelist Library Type: {whitelist_library_type}", 1)
-
-    blacklist_users = os.getenv("BLACKLIST_USERS")
-    if blacklist_users:
-        if len(blacklist_users) > 0:
-            blacklist_users = blacklist_users.split(",")
-            blacklist_users = [x.lower().strip() for x in blacklist_users]
-    else:
-        blacklist_users = []
-    logger(f"Blacklist Users: {blacklist_users}", 1)
-
-    whitelist_users = os.getenv("WHITELIST_USERS")
-    if whitelist_users:
-        if len(whitelist_users) > 0:
-            whitelist_users = whitelist_users.split(",")
-            whitelist_users = [x.lower().strip() for x in whitelist_users]
-        else:
-            whitelist_users = []
-    else:
-        whitelist_users = []
-    logger(f"Whitelist Users: {whitelist_users}", 1)
-
-    return blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, blacklist_users, whitelist_users
-
-def setup_users(plex, jellyfin, blacklist_users, whitelist_users, user_mapping=None):
-
-    # generate list of users from plex.users
-    plex_users = [ x.title.lower() for x in plex.users ]
-    jellyfin_users = [ key.lower() for key in jellyfin.users.keys() ]
-
-    # combined list of overlapping users from plex and jellyfin
-    users = {}
-
-    for plex_user in plex_users:
-        if user_mapping:
-            jellyfin_plex_mapped_user =  search_mapping(user_mapping, plex_user)
-            if jellyfin_plex_mapped_user:
-                users[plex_user] = jellyfin_plex_mapped_user
-                continue
-
-        if plex_user in jellyfin_users:
-            users[plex_user] = plex_user
-
-    for jellyfin_user in jellyfin_users:
-        if user_mapping:
-            plex_jellyfin_mapped_user =  search_mapping(user_mapping, jellyfin_user)
-            if plex_jellyfin_mapped_user:
-                users[plex_jellyfin_mapped_user] = jellyfin_user
-                continue
-
-        if jellyfin_user in plex_users:
-            users[jellyfin_user] = jellyfin_user
-
-    logger(f"User list that exist on both servers {users}", 1)
-
-    users_filtered = {}
-    for user in users:
-        # whitelist_user is not empty and user lowercase is not in whitelist lowercase
-        if len(whitelist_users) > 0:
-            if user not in whitelist_users and users[user] not in whitelist_users:
-                logger(f"{user} or {users[user]} is not in whitelist", 1)
-                continue
-
-        if user not in blacklist_users and users[user] not in blacklist_users:
-            users_filtered[user] = users[user]
-
-    logger(f"Filtered user list {users_filtered}", 1)
-
-    plex_users = []
-    for plex_user in plex.users:
-        if plex_user.title.lower() in users_filtered.keys() or plex_user.title.lower() in users_filtered.values():
-            plex_users.append(plex_user)
-
-    jellyfin_users = {}
-    for jellyfin_user, jellyfin_id in jellyfin.users.items():
-        if jellyfin_user.lower() in users_filtered.keys() or jellyfin_user.lower() in users_filtered.values():
-            jellyfin_users[jellyfin_user] = jellyfin_id
-
-    if len(plex_users) == 0:
-        raise Exception(f"No plex users found, users found {users} filtered users {users_filtered}")
-
-    if len(jellyfin_users) == 0:
-        raise Exception(f"No jellyfin users found, users found {users} filtered users {users_filtered}")
-
-    logger(f"plex_users: {plex_users}", 1)
-    logger(f"jellyfin_users: {jellyfin_users}", 1)
-
-    return plex_users, jellyfin_users
-
-def main():
-    logfile = os.getenv("LOGFILE","log.log")
-    # Delete logfile if it exists
-    if os.path.exists(logfile):
-        os.remove(logfile)
-
-    dryrun = str_to_bool(os.getenv("DRYRUN", "False"))
-    logger(f"Dryrun: {dryrun}", 1)
-
-    user_mapping = os.getenv("USER_MAPPING")
-    if user_mapping:
-        user_mapping = json.loads(user_mapping.lower())
-        logger(f"User Mapping: {user_mapping}", 1)
-
-    library_mapping = os.getenv("LIBRARY_MAPPING")
-    if library_mapping:
-        library_mapping = json.loads(library_mapping)
-        logger(f"Library Mapping: {library_mapping}", 1)
-
-    plex = Plex()
-    jellyfin = Jellyfin()
-
-    # Create (black/white)lists
-    blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, blacklist_users, whitelist_users = setup_black_white_lists(library_mapping)
-
-    # Create users list
-    plex_users, jellyfin_users = setup_users(plex, jellyfin, blacklist_users, whitelist_users, user_mapping)
-
-    plex_watched = plex.get_plex_watched(plex_users, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping)
-    jellyfin_watched = jellyfin.get_jellyfin_watched(jellyfin_users, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping)
-
-    # clone watched so it isnt modified in the cleanup function so all duplicates are actually removed
-    plex_watched_filtered = copy.deepcopy(plex_watched)
-    jellyfin_watched_filtered = copy.deepcopy(jellyfin_watched)
-
-    plex_watched = cleanup_watched(plex_watched_filtered, jellyfin_watched_filtered, user_mapping, library_mapping)
-    logger(f"plex_watched that needs to be synced to jellyfin:\n{plex_watched}", 1)
-
-    jellyfin_watched = cleanup_watched(jellyfin_watched_filtered, plex_watched_filtered, user_mapping, library_mapping)
-    logger(f"jellyfin_watched that needs to be synced to plex:\n{jellyfin_watched}", 1)
-
-    # Update watched status
-    plex.update_watched(jellyfin_watched, user_mapping, library_mapping, dryrun)
-    jellyfin.update_watched(plex_watched, user_mapping, library_mapping, dryrun)
-
-
-if __name__ == "__main__":
-    sleep_timer = float(os.getenv("SLEEP_TIMER", "3600"))
-
-    while(True):
-        try:
-            main()
-            logger(f"Looping in {sleep_timer}")
-        except Exception as error:
-            if isinstance(error, list):
-                for message in error:
-                    logger(message, log_type=2)
-            else:
-                logger(error, log_type=2)
-
-
-            logger(traceback.format_exc(), 2)
-            logger(f"Retrying in {sleep_timer}", log_type=0)
-
-        except KeyboardInterrupt:
-            logger("Exiting", log_type=0)
-            os._exit(0)
-
-        sleep(sleep_timer)
+import sys
+
+if __name__ == "__main__":
+    # Check python version 3.6 or higher
+    if not (3, 6) <= tuple(map(int, sys.version_info[:2])):
+        print("This script requires Python 3.6 or higher")
+        sys.exit(1)
+
+    from src.main import main
+
+    main()

requirements.txt

@@ -1,3 +1,4 @@
-plexapi
-requests
-python-dotenv
+plexapi
+requests
+python-dotenv
+aiohttp

src/functions.py

@@ -1,75 +1,477 @@
-import os
-from dotenv import load_dotenv
-load_dotenv(override=True)
-
-logfile = os.getenv("LOGFILE","log.log")
-
-def logger(message, log_type=0):
-    debug = str_to_bool(os.getenv("DEBUG", "True"))
-
-    output = str(message)
-    if log_type == 0:
-        pass
-    elif log_type == 1 and debug:
-        output = f"[INFO]: {output}"
-    elif log_type == 2:
-        output = f"[ERROR]: {output}"
-    else:
-        output = None
-
-    if output is not None:
-        print(output)
-        file = open(logfile, "a", encoding="utf-8")
-        file.write(output + "\n")
-
-# Reimplementation of distutils.util.strtobool due to it being deprecated
-# Source: https://github.com/PostHog/posthog/blob/01e184c29d2c10c43166f1d40a334abbc3f99d8a/posthog/utils.py#L668
-def str_to_bool(value: any) -> bool:
-    if not value:
-        return False
-    return str(value).lower() in ("y", "yes", "t", "true", "on", "1")
-
-# Get mapped value
-def search_mapping(dictionary: dict, key_value: str):
-    if key_value in dictionary.keys():
-        return dictionary[key_value]
-    elif key_value.lower() in dictionary.keys():
-        return dictionary[key_value]
-    elif key_value in dictionary.values():
-        return list(dictionary.keys())[list(dictionary.values()).index(key_value)]
-    elif key_value.lower() in dictionary.values():
-        return list(dictionary.keys())[list(dictionary.values()).index(key_value)]
-    else:
-        return None
-
-
-def check_skip_logic(library_title, library_type, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping):
-    skip_reason = None
-
-    if library_type.lower() in blacklist_library_type:
-        skip_reason = "is blacklist_library_type"
-
-    if library_title.lower() in [x.lower() for x in blacklist_library]:
-        skip_reason = "is blacklist_library"
-
-    library_other = None
-    if library_mapping:
-        library_other = search_mapping(library_mapping, library_title)
-    if library_other:
-        if library_other.lower() in [x.lower() for x in blacklist_library]:
-            skip_reason = "is blacklist_library"
-
-    if len(whitelist_library_type) > 0:
-        if library_type.lower() not in whitelist_library_type:
-            skip_reason = "is not whitelist_library_type"
-
-    # if whitelist is not empty and library is not in whitelist
-    if len(whitelist_library) > 0:
-        if library_title.lower() not in [x.lower() for x in whitelist_library]:
-            skip_reason = "is not whitelist_library"
-
-        if library_other:
-            if library_other.lower() not in [x.lower() for x in whitelist_library]:
-                skip_reason = "is not whitelist_library"
-
-    return skip_reason
+import os, copy
+from concurrent.futures import ThreadPoolExecutor
+from dotenv import load_dotenv
+
+load_dotenv(override=True)
+
+logfile = os.getenv("LOGFILE", "log.log")
+
+
+def logger(message: str, log_type=0):
+    debug = str_to_bool(os.getenv("DEBUG", "False"))
+    debug_level = os.getenv("DEBUG_LEVEL", "info").lower()
+
+    output = str(message)
+    if log_type == 0:
+        pass
+    elif log_type == 1 and (debug and debug_level in ("info", "debug")):
+        output = f"[INFO]: {output}"
+    elif log_type == 2:
+        output = f"[ERROR]: {output}"
+    elif log_type == 3 and (debug and debug_level == "debug"):
+        output = f"[DEBUG]: {output}"
+    elif log_type == 4:
+        output = f"[WARNING]: {output}"
+    else:
+        output = None
+
+    if output is not None:
+        print(output)
+        file = open(logfile, "a", encoding="utf-8")
+        file.write(output + "\n")
+
+
+# Reimplementation of distutils.util.strtobool due to it being deprecated
+# Source: https://github.com/PostHog/posthog/blob/01e184c29d2c10c43166f1d40a334abbc3f99d8a/posthog/utils.py#L668
+def str_to_bool(value: any) -> bool:
+    if not value:
+        return False
+    return str(value).lower() in ("y", "yes", "t", "true", "on", "1")
+
+
+# Get mapped value
+def search_mapping(dictionary: dict, key_value: str):
+    if key_value in dictionary.keys():
+        return dictionary[key_value]
+    elif key_value.lower() in dictionary.keys():
+        return dictionary[key_value.lower()]
+    elif key_value in dictionary.values():
+        return list(dictionary.keys())[list(dictionary.values()).index(key_value)]
+    elif key_value.lower() in dictionary.values():
+        return list(dictionary.keys())[
+            list(dictionary.values()).index(key_value.lower())
+        ]
+    else:
+        return None
+
+
+def setup_black_white_lists(
+    blacklist_library: str,
+    whitelist_library: str,
+    blacklist_library_type: str,
+    whitelist_library_type: str,
+    blacklist_users: str,
+    whitelist_users: str,
+    library_mapping=None,
+    user_mapping=None,
+):
+    if blacklist_library:
+        if len(blacklist_library) > 0:
+            blacklist_library = blacklist_library.split(",")
+            blacklist_library = [x.strip() for x in blacklist_library]
+            if library_mapping:
+                temp_library = []
+                for library in blacklist_library:
+                    library_other = search_mapping(library_mapping, library)
+                    if library_other:
+                        temp_library.append(library_other)
+
+                blacklist_library = blacklist_library + temp_library
+    else:
+        blacklist_library = []
+    logger(f"Blacklist Library: {blacklist_library}", 1)
+
+    if whitelist_library:
+        if len(whitelist_library) > 0:
+            whitelist_library = whitelist_library.split(",")
+            whitelist_library = [x.strip() for x in whitelist_library]
+            if library_mapping:
+                temp_library = []
+                for library in whitelist_library:
+                    library_other = search_mapping(library_mapping, library)
+                    if library_other:
+                        temp_library.append(library_other)
+
+                whitelist_library = whitelist_library + temp_library
+    else:
+        whitelist_library = []
+    logger(f"Whitelist Library: {whitelist_library}", 1)
+
+    if blacklist_library_type:
+        if len(blacklist_library_type) > 0:
+            blacklist_library_type = blacklist_library_type.split(",")
+            blacklist_library_type = [x.lower().strip() for x in blacklist_library_type]
+    else:
+        blacklist_library_type = []
+    logger(f"Blacklist Library Type: {blacklist_library_type}", 1)
+
+    if whitelist_library_type:
+        if len(whitelist_library_type) > 0:
+            whitelist_library_type = whitelist_library_type.split(",")
+            whitelist_library_type = [x.lower().strip() for x in whitelist_library_type]
+    else:
+        whitelist_library_type = []
+    logger(f"Whitelist Library Type: {whitelist_library_type}", 1)
+
+    if blacklist_users:
+        if len(blacklist_users) > 0:
+            blacklist_users = blacklist_users.split(",")
+            blacklist_users = [x.lower().strip() for x in blacklist_users]
+            if user_mapping:
+                temp_users = []
+                for user in blacklist_users:
+                    user_other = search_mapping(user_mapping, user)
+                    if user_other:
+                        temp_users.append(user_other)
+
+                blacklist_users = blacklist_users + temp_users
+    else:
+        blacklist_users = []
+    logger(f"Blacklist Users: {blacklist_users}", 1)
+
+    if whitelist_users:
+        if len(whitelist_users) > 0:
+            whitelist_users = whitelist_users.split(",")
+            whitelist_users = [x.lower().strip() for x in whitelist_users]
+            if user_mapping:
+                temp_users = []
+                for user in whitelist_users:
+                    user_other = search_mapping(user_mapping, user)
+                    if user_other:
+                        temp_users.append(user_other)
+
+                whitelist_users = whitelist_users + temp_users
+        else:
+            whitelist_users = []
+    else:
+        whitelist_users = []
+    logger(f"Whitelist Users: {whitelist_users}", 1)
+
+    return (
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        blacklist_users,
+        whitelist_users,
+    )
+
+
+def check_skip_logic(
+    library_title,
+    library_type,
+    blacklist_library,
+    whitelist_library,
+    blacklist_library_type,
+    whitelist_library_type,
+    library_mapping,
+):
+    skip_reason = None
+
+    if isinstance(library_type, (list, tuple, set)):
+        for library_type_item in library_type:
+            if library_type_item.lower() in blacklist_library_type:
+                skip_reason = "is blacklist_library_type"
+    else:
+        if library_type.lower() in blacklist_library_type:
+            skip_reason = "is blacklist_library_type"
+
+    if library_title.lower() in [x.lower() for x in blacklist_library]:
+        skip_reason = "is blacklist_library"
+
+    library_other = None
+    if library_mapping:
+        library_other = search_mapping(library_mapping, library_title)
+    if library_other:
+        if library_other.lower() in [x.lower() for x in blacklist_library]:
+            skip_reason = "is blacklist_library"
+
+    if len(whitelist_library_type) > 0:
+        if isinstance(library_type, (list, tuple, set)):
+            for library_type_item in library_type:
+                if library_type_item.lower() not in whitelist_library_type:
+                    skip_reason = "is not whitelist_library_type"
+        else:
+            if library_type.lower() not in whitelist_library_type:
+                skip_reason = "is not whitelist_library_type"
+
+    # if whitelist is not empty and library is not in whitelist
+    if len(whitelist_library) > 0:
+        if library_title.lower() not in [x.lower() for x in whitelist_library]:
+            skip_reason = "is not whitelist_library"
+
+        if library_other:
+            if library_other.lower() not in [x.lower() for x in whitelist_library]:
+                skip_reason = "is not whitelist_library"
+
+    return skip_reason
+
+
+def generate_library_guids_dict(user_list: dict):
+    show_output_dict = {}
+    episode_output_dict = {}
+    movies_output_dict = {}
+
+    # Handle the case where user_list is empty or does not contain the expected keys and values
+    if not user_list:
+        return show_output_dict, episode_output_dict, movies_output_dict
+
+    try:
+        show_output_keys = user_list.keys()
+        show_output_keys = [dict(x) for x in list(show_output_keys)]
+        for show_key in show_output_keys:
+            for provider_key, provider_value in show_key.items():
+                # Skip title
+                if provider_key.lower() == "title":
+                    continue
+                if provider_key.lower() not in show_output_dict:
+                    show_output_dict[provider_key.lower()] = []
+                if provider_key.lower() == "locations":
+                    for show_location in provider_value:
+                        show_output_dict[provider_key.lower()].append(show_location)
+                else:
+                    show_output_dict[provider_key.lower()].append(
+                        provider_value.lower()
+                    )
+    except Exception:
+        logger("Generating show_output_dict failed, skipping", 1)
+
+    try:
+        for show in user_list:
+            for season in user_list[show]:
+                for episode in user_list[show][season]:
+                    for episode_key, episode_value in episode.items():
+                        if episode_key.lower() not in episode_output_dict:
+                            episode_output_dict[episode_key.lower()] = []
+                        if episode_key == "locations":
+                            for episode_location in episode_value:
+                                episode_output_dict[episode_key.lower()].append(
+                                    episode_location
+                                )
+                        else:
+                            episode_output_dict[episode_key.lower()].append(
+                                episode_value.lower()
+                            )
+    except Exception:
+        logger("Generating episode_output_dict failed, skipping", 1)
+
+    try:
+        for movie in user_list:
+            for movie_key, movie_value in movie.items():
+                if movie_key.lower() not in movies_output_dict:
+                    movies_output_dict[movie_key.lower()] = []
+                if movie_key == "locations":
+                    for movie_location in movie_value:
+                        movies_output_dict[movie_key.lower()].append(movie_location)
+                else:
+                    movies_output_dict[movie_key.lower()].append(movie_value.lower())
+    except Exception:
+        logger("Generating movies_output_dict failed, skipping", 1)
+
+    return show_output_dict, episode_output_dict, movies_output_dict
+
+
+def combine_watched_dicts(dicts: list):
+    combined_dict = {}
+    for single_dict in dicts:
+        for key, value in single_dict.items():
+            if key not in combined_dict:
+                combined_dict[key] = {}
+            for subkey, subvalue in value.items():
+                if subkey in combined_dict[key]:
+                    # If the subkey already exists in the combined dictionary,
+                    # check if the values are different and raise an exception if they are
+                    if combined_dict[key][subkey] != subvalue:
+                        raise ValueError(
+                            f"Conflicting values for subkey '{subkey}' under key '{key}'"
+                        )
+                else:
+                    # If the subkey does not exist in the combined dictionary, add it
+                    combined_dict[key][subkey] = subvalue
+
+    return combined_dict
+
+
+def cleanup_watched(
+    watched_list_1, watched_list_2, user_mapping=None, library_mapping=None
+):
+    modified_watched_list_1 = copy.deepcopy(watched_list_1)
+
+    # remove entries from watched_list_1 that are in watched_list_2
+    for user_1 in watched_list_1:
+        user_other = None
+        if user_mapping:
+            user_other = search_mapping(user_mapping, user_1)
+        user_2 = get_other(watched_list_2, user_1, user_other)
+        if user_2 is None:
+            continue
+
+        for library_1 in watched_list_1[user_1]:
+            library_other = None
+            if library_mapping:
+                library_other = search_mapping(library_mapping, library_1)
+            library_2 = get_other(watched_list_2[user_2], library_1, library_other)
+            if library_2 is None:
+                continue
+
+            (
+                _,
+                episode_watched_list_2_keys_dict,
+                movies_watched_list_2_keys_dict,
+            ) = generate_library_guids_dict(watched_list_2[user_2][library_2])
+
+            # Movies
+            if isinstance(watched_list_1[user_1][library_1], list):
+                for movie in watched_list_1[user_1][library_1]:
+                    if is_movie_in_dict(movie, movies_watched_list_2_keys_dict):
+                        logger(f"Removing {movie} from {library_1}", 3)
+                        modified_watched_list_1[user_1][library_1].remove(movie)
+
+            # TV Shows
+            elif isinstance(watched_list_1[user_1][library_1], dict):
+                for show_key_1 in watched_list_1[user_1][library_1].keys():
+                    show_key_dict = dict(show_key_1)
+                    for season in watched_list_1[user_1][library_1][show_key_1]:
+                        for episode in watched_list_1[user_1][library_1][show_key_1][
+                            season
+                        ]:
+                            if is_episode_in_dict(
+                                episode, episode_watched_list_2_keys_dict
+                            ):
+                                if (
+                                    episode
+                                    in modified_watched_list_1[user_1][library_1][
+                                        show_key_1
+                                    ][season]
+                                ):
+                                    logger(
+                                        f"Removing {episode} from {show_key_dict['title']}",
+                                        3,
+                                    )
+                                    modified_watched_list_1[user_1][library_1][
+                                        show_key_1
+                                    ][season].remove(episode)
+
+                        # Remove empty seasons
+                        if (
+                            len(
+                                modified_watched_list_1[user_1][library_1][show_key_1][
+                                    season
+                                ]
+                            )
+                            == 0
+                        ):
+                            if (
+                                season
+                                in modified_watched_list_1[user_1][library_1][
+                                    show_key_1
+                                ]
+                            ):
+                                logger(
+                                    f"Removing {season} from {show_key_dict['title']} because it is empty",
+                                    3,
+                                )
+                                del modified_watched_list_1[user_1][library_1][
+                                    show_key_1
+                                ][season]
+
+                    # Remove empty shows
+                    if len(modified_watched_list_1[user_1][library_1][show_key_1]) == 0:
+                        if show_key_1 in modified_watched_list_1[user_1][library_1]:
+                            logger(
+                                f"Removing {show_key_dict['title']} because it is empty",
+                                3,
+                            )
+                            del modified_watched_list_1[user_1][library_1][show_key_1]
+
+    for user_1 in watched_list_1:
+        for library_1 in watched_list_1[user_1]:
+            if library_1 in modified_watched_list_1[user_1]:
+                # If library is empty then remove it
+                if len(modified_watched_list_1[user_1][library_1]) == 0:
+                    logger(f"Removing {library_1} from {user_1} because it is empty", 1)
+                    del modified_watched_list_1[user_1][library_1]
+
+        if user_1 in modified_watched_list_1:
+            # If user is empty delete user
+            if len(modified_watched_list_1[user_1]) == 0:
+                logger(f"Removing {user_1} from watched list 1 because it is empty", 1)
+                del modified_watched_list_1[user_1]
+
+    return modified_watched_list_1
+
+
+def get_other(watched_list_2, object_1, object_2):
+    if object_1 in watched_list_2:
+        return object_1
+    elif object_2 in watched_list_2:
+        return object_2
+    else:
+        logger(f"{object_1} and {object_2} not found in watched list 2", 1)
+        return None
+
+
+def is_movie_in_dict(movie, movies_watched_list_2_keys_dict):
+    # Iterate through the keys and values of the movie dictionary
+    for movie_key, movie_value in movie.items():
+        # If the key is "locations", check if the "locations" key is present in the movies_watched_list_2_keys_dict dictionary
+        if movie_key == "locations":
+            if "locations" in movies_watched_list_2_keys_dict.keys():
+                # Iterate through the locations in the movie dictionary
+                for location in movie_value:
+                    # If the location is in the movies_watched_list_2_keys_dict dictionary, return True
+                    if location in movies_watched_list_2_keys_dict["locations"]:
+                        return True
+        # If the key is not "locations", check if the movie_key is present in the movies_watched_list_2_keys_dict dictionary
+        else:
+            if movie_key in movies_watched_list_2_keys_dict.keys():
+                # If the movie_value is in the movies_watched_list_2_keys_dict dictionary, return True
+                if movie_value in movies_watched_list_2_keys_dict[movie_key]:
+                    return True
+
+    # If the loop completes without finding a match, return False
+    return False
+
+
+def is_episode_in_dict(episode, episode_watched_list_2_keys_dict):
+    # Iterate through the keys and values of the episode dictionary
+    for episode_key, episode_value in episode.items():
+        # If the key is "locations", check if the "locations" key is present in the episode_watched_list_2_keys_dict dictionary
+        if episode_key == "locations":
+            if "locations" in episode_watched_list_2_keys_dict.keys():
+                # Iterate through the locations in the episode dictionary
+                for location in episode_value:
+                    # If the location is in the episode_watched_list_2_keys_dict dictionary, return True
+                    if location in episode_watched_list_2_keys_dict["locations"]:
+                        return True
+        # If the key is not "locations", check if the episode_key is present in the episode_watched_list_2_keys_dict dictionary
+        else:
+            if episode_key in episode_watched_list_2_keys_dict.keys():
+                # If the episode_value is in the episode_watched_list_2_keys_dict dictionary, return True
+                if episode_value in episode_watched_list_2_keys_dict[episode_key]:
+                    return True
+
+    # If the loop completes without finding a match, return False
+    return False
+
+
+def future_thread_executor(args: list, workers: int = -1):
+    futures_list = []
+    results = []
+
+    if workers == -1:
+        workers = min(32, os.cpu_count() * 2)
+
+    with ThreadPoolExecutor(max_workers=workers) as executor:
+        for arg in args:
+            # * arg unpacks the list into actual arguments
+            futures_list.append(executor.submit(*arg))
+
+        for future in futures_list:
+            try:
+                result = future.result()
+                results.append(result)
+            except Exception as e:
+                raise Exception(e)
+
+    return results

src/jellyfin.py

@@ -1,223 +1,745 @@
-import requests, os
-from dotenv import load_dotenv
-from src.functions import logger, search_mapping, str_to_bool, check_skip_logic
-
-load_dotenv(override=True)
-
-jellyfin_baseurl = os.getenv("JELLYFIN_BASEURL")
-jellyfin_token = os.getenv("JELLYFIN_TOKEN")
-
-class Jellyfin():
-    def __init__(self):
-        self.baseurl = jellyfin_baseurl
-        self.token = jellyfin_token
-
-        if not self.baseurl:
-            raise Exception("Jellyfin baseurl not set")
-
-        if not self.token:
-            raise Exception("Jellyfin token not set")
-
-        self.users = self.get_users()
-
-
-    def query(self, query, query_type):
-        try:
-            response = None
-
-            if query_type == "get":
-                response = requests.get(self.baseurl + query, headers={"accept":"application/json", "X-Emby-Token": self.token})
-
-            elif query_type == "post":
-                authorization = (
-                    'MediaBrowser , '
-                    'Client="other", '
-                    'Device="script", '
-                    'DeviceId="script", '
-                    'Version="0.0.0"'
-                )
-                response = requests.post(self.baseurl + query, headers={"accept":"application/json", "X-Emby-Authorization": authorization, "X-Emby-Token": self.token})
-
-            return response.json()
-        except Exception as e:
-            logger(e, 2)
-            logger(response, 2)
-
-    def get_users(self):
-        users = {}
-
-        query = "/Users"
-        response = self.query(query, "get")
-
-        # If reponse is not empty
-        if response:
-            for user in response:
-                users[user["Name"]] = user["Id"]
-
-        return users
-
-    def get_jellyfin_watched(self, users, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping=None):
-        users_watched = {}
-
-        for user_name, user_id in users.items():
-            # Get all libraries
-            user_name = user_name.lower()
-
-            libraries = self.query(f"/Users/{user_id}/Views", "get")["Items"]
-
-            for library in libraries:
-                library_title = library["Name"]
-                library_id = library["Id"]
-                watched = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}&Filters=IsPlayed&limit=1", "get")
-
-                if len(watched["Items"]) == 0:
-                    logger(f"Jellyfin: No watched items found in library {library_title}", 1)
-                    continue
-                else:
-                    library_type = watched["Items"][0]["Type"]
-
-                skip_reason = check_skip_logic(library_title, library_type, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping)
-
-                if skip_reason:
-                    logger(f"Jellyfin: Skipping library {library_title} {skip_reason}", 1)
-                    continue
-
-                logger(f"Jellyfin: Generating watched for {user_name} in library {library_title}", 0)
-                # Movies
-                if library_type == "Movie":
-                    watched = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}&Filters=IsPlayed&Fields=ItemCounts,ProviderIds", "get")
-                    for movie in watched["Items"]:
-                        if movie["UserData"]["Played"] == True:
-                            if movie["ProviderIds"]:
-                                if user_name not in users_watched:
-                                    users_watched[user_name] = {}
-                                if library_title not in users_watched[user_name]:
-                                    users_watched[user_name][library_title] = []
-                                # Lowercase movie["ProviderIds"] keys
-                                movie["ProviderIds"] = {k.lower(): v for k, v in movie["ProviderIds"].items()}
-                                users_watched[user_name][library_title].append(movie["ProviderIds"])
-
-                # TV Shows
-                if library_type == "Episode":
-                    watched = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}", "get")
-                    watched_shows = [x for x in watched["Items"] if x["Type"] == "Series"]
-
-                    for show in watched_shows:
-                        seasons = self.query(f"/Shows/{show['Id']}/Seasons?userId={user_id}&Fields=ItemCounts", "get")
-                        if len(seasons["Items"]) > 0:
-                            for season in seasons["Items"]:
-                                episodes = self.query(f"/Shows/{show['Id']}/Episodes?seasonId={season['Id']}&userId={user_id}&Fields=ItemCounts,ProviderIds", "get")
-                                if len(episodes["Items"]) > 0:
-                                    for episode in episodes["Items"]:
-                                        if episode["UserData"]["Played"] == True:
-                                            if episode["ProviderIds"]:
-                                                if user_name not in users_watched:
-                                                    users_watched[user_name] = {}
-                                                if library_title not in users_watched[user_name]:
-                                                    users_watched[user_name][library_title] = {}
-                                                if show["Name"] not in users_watched[user_name][library_title]:
-                                                    users_watched[user_name][library_title][show["Name"]] = {}
-                                                if season["Name"] not in users_watched[user_name][library_title][show["Name"]]:
-                                                    users_watched[user_name][library_title][show["Name"]][season["Name"]] = []
-
-                                                # Lowercase episode["ProviderIds"] keys
-                                                episode["ProviderIds"] = {k.lower(): v for k, v in episode["ProviderIds"].items()}
-                                                users_watched[user_name][library_title][show["Name"]][season["Name"]].append(episode["ProviderIds"])
-
-        return users_watched
-
-    def update_watched(self, watched_list, user_mapping=None, library_mapping=None, dryrun=False):
-        for user, libraries in watched_list.items():
-            if user_mapping:
-                user_other = None
-
-                if user in user_mapping.keys():
-                    user_other = user_mapping[user]
-                elif user in user_mapping.values():
-                    user_other = search_mapping(user_mapping, user)
-
-                if user_other:
-                    logger(f"Swapping user {user} with {user_other}", 1)
-                    user = user_other
-
-            user_id = None
-            for key, value in self.users.items():
-                if user.lower() == key.lower():
-                    user_id = self.users[key]
-                    break
-
-            if not user_id:
-                logger(f"{user} not found in Jellyfin", 2)
-                break
-
-            jellyfin_libraries = self.query(f"/Users/{user_id}/Views", "get")["Items"]
-
-            for library, videos in libraries.items():
-                if library_mapping:
-                    library_other = None
-
-                    if library in library_mapping.keys():
-                        library_other = library_mapping[library]
-                    elif library in library_mapping.values():
-                        library_other = search_mapping(library_mapping, library)
-
-                    if library_other:
-                        logger(f"Swapping library {library} with {library_other}", 1)
-                        library = library_other
-
-                if library not in [x["Name"] for x in jellyfin_libraries]:
-                    logger(f"{library} not found in Jellyfin", 2)
-                    continue
-
-                library_id = None
-                for jellyfin_library in jellyfin_libraries:
-                    if jellyfin_library["Name"] == library:
-                        library_id = jellyfin_library["Id"]
-                        continue
-
-                if library_id:
-                    logger(f"Jellyfin: Updating watched for {user} in library {library}", 1)
-                    library_search = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}&limit=1", "get")
-                    library_type = library_search["Items"][0]["Type"]
-
-                    # Movies
-                    if library_type == "Movie":
-                        jellyfin_search = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}&isPlayed=false&Fields=ItemCounts,ProviderIds", "get")
-                        for jellyfin_video in jellyfin_search["Items"]:
-                            if str_to_bool(jellyfin_video["UserData"]["Played"]) == False:
-                                jellyfin_video_id = jellyfin_video["Id"]
-                                for video in videos:
-                                    for key, value in jellyfin_video["ProviderIds"].items():
-                                        if key.lower() in video.keys() and value.lower() == video[key.lower()].lower():
-                                            msg = f"{jellyfin_video['Name']} as watched for {user} in {library} for Jellyfin"
-                                            if not dryrun:
-                                                logger(f"Marking {msg}", 0)
-                                                self.query(f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}", "post")
-                                            else:
-                                                logger(f"Dryrun {msg}", 0)
-                                            break
-
-                    # TV Shows
-                    if library_type == "Episode":
-                        jellyfin_search = self.query(f"/Users/{user_id}/Items?SortBy=SortName&SortOrder=Ascending&Recursive=true&ParentId={library_id}&isPlayed=false", "get")
-                        jellyfin_shows = [x for x in jellyfin_search["Items"] if x["Type"] == "Series"]
-
-                        for jellyfin_show in jellyfin_shows:
-                            if jellyfin_show["Name"] in videos.keys():
-                                jellyfin_show_id = jellyfin_show["Id"]
-                                jellyfin_episodes = self.query(f"/Shows/{jellyfin_show_id}/Episodes?userId={user_id}&Fields=ItemCounts,ProviderIds", "get")
-                                for jellyfin_episode in jellyfin_episodes["Items"]:
-                                    if str_to_bool(jellyfin_episode["UserData"]["Played"]) == False:
-                                        jellyfin_episode_id = jellyfin_episode["Id"]
-                                        for show in videos:
-                                            for season in videos[show]:
-                                                for episode in videos[show][season]:
-                                                    for key, value in jellyfin_episode["ProviderIds"].items():
-                                                        if key.lower() in episode.keys() and value.lower() == episode[key.lower()].lower():
-                                                            msg = f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} {jellyfin_episode['Name']} as watched for {user} in {library} for Jellyfin"
-                                                            if not dryrun:
-                                                                logger(f"Marked {msg}", 0)
-                                                                self.query(f"/Users/{user_id}/PlayedItems/{jellyfin_episode_id}", "post")
-                                                            else:
-                                                                logger(f"Dryrun {msg}", 0)
-                                                            break
+import asyncio, aiohttp, traceback
+from src.functions import (
+    logger,
+    search_mapping,
+    check_skip_logic,
+    generate_library_guids_dict,
+    combine_watched_dicts,
+)
+
+
+class Jellyfin:
+    def __init__(self, baseurl, token):
+        self.baseurl = baseurl
+        self.token = token
+
+        if not self.baseurl:
+            raise Exception("Jellyfin baseurl not set")
+
+        if not self.token:
+            raise Exception("Jellyfin token not set")
+
+        self.users = asyncio.run(self.get_users())
+
+    async def query(self, query, query_type, session, identifiers=None):
+        try:
+            results = None
+            headers = {"Accept": "application/json", "X-Emby-Token": self.token}
+            authorization = (
+                "MediaBrowser , "
+                'Client="other", '
+                'Device="script", '
+                'DeviceId="script", '
+                'Version="0.0.0"'
+            )
+            headers["X-Emby-Authorization"] = authorization
+
+            if query_type == "get":
+                async with session.get(
+                    self.baseurl + query, headers=headers
+                ) as response:
+                    results = await response.json()
+
+            elif query_type == "post":
+                async with session.post(
+                    self.baseurl + query, headers=headers
+                ) as response:
+                    results = await response.json()
+
+            if type(results) is str:
+                logger(f"Jellyfin: Query {query_type} {query} {results}", 2)
+                raise Exception(results)
+
+            # append identifiers to results
+            if identifiers:
+                results["Identifiers"] = identifiers
+
+            return results
+
+        except Exception as e:
+            logger(f"Jellyfin: Query failed {e}", 2)
+            raise Exception(e)
+
+    async def get_users(self):
+        try:
+            users = {}
+
+            query_string = "/Users"
+            async with aiohttp.ClientSession() as session:
+                response = await self.query(query_string, "get", session)
+
+            # If response is not empty
+            if response:
+                for user in response:
+                    users[user["Name"]] = user["Id"]
+
+            return users
+        except Exception as e:
+            logger(f"Jellyfin: Get users failed {e}", 2)
+            raise Exception(e)
+
+    async def get_user_library_watched(
+        self, user_name, user_id, library_type, library_id, library_title
+    ):
+        try:
+            user_name = user_name.lower()
+            user_watched = {}
+            user_watched[user_name] = {}
+
+            logger(
+                f"Jellyfin: Generating watched for {user_name} in library {library_title}",
+                0,
+            )
+
+            async with aiohttp.ClientSession() as session:
+                # Movies
+                if library_type == "Movie":
+                    user_watched[user_name][library_title] = []
+                    watched = await self.query(
+                        f"/Users/{user_id}/Items"
+                        + f"?ParentId={library_id}&Filters=IsPlayed&IncludeItemTypes=Movie&Recursive=True&Fields=ItemCounts,ProviderIds,MediaSources",
+                        "get",
+                        session,
+                    )
+
+                    for movie in watched["Items"]:
+                        # Check if the movie has been played
+                        if (
+                            movie["UserData"]["Played"] is True
+                            and "MediaSources" in movie
+                            and movie["MediaSources"] is not {}
+                        ):
+                            logger(
+                                f"Jellyfin: Adding {movie['Name']} to {user_name} watched list",
+                                3,
+                            )
+                            if "ProviderIds" in movie:
+                                logger(
+                                    f"Jellyfin: {movie['Name']} {movie['ProviderIds']} {movie['MediaSources']}",
+                                    3,
+                                )
+                            else:
+                                logger(
+                                    f"Jellyfin: {movie['Name']} {movie['MediaSources']['Path']}",
+                                    3,
+                                )
+
+                            # Create a dictionary for the movie with its title
+                            movie_guids = {"title": movie["Name"]}
+
+                            # If the movie has provider IDs, add them to the dictionary
+                            if "ProviderIds" in movie:
+                                movie_guids.update(
+                                    {
+                                        k.lower(): v
+                                        for k, v in movie["ProviderIds"].items()
+                                    }
+                                )
+
+                            # If the movie has media sources, add them to the dictionary
+                            if "MediaSources" in movie:
+                                movie_guids["locations"] = tuple(
+                                    [
+                                        x["Path"].split("/")[-1]
+                                        for x in movie["MediaSources"]
+                                    ]
+                                )
+
+                            # Append the movie dictionary to the list for the given user and library
+                            user_watched[user_name][library_title].append(movie_guids)
+                            logger(
+                                f"Jellyfin: Added {movie_guids} to {user_name} watched list",
+                                3,
+                            )
+
+                # TV Shows
+                if library_type in ["Series", "Episode"]:
+                    # Initialize an empty dictionary for the given user and library
+                    user_watched[user_name][library_title] = {}
+
+                    # Retrieve a list of watched TV shows
+                    watched_shows = await self.query(
+                        f"/Users/{user_id}/Items"
+                        + f"?ParentId={library_id}&isPlaceHolder=false&IncludeItemTypes=Series&Recursive=True&Fields=ProviderIds,Path,RecursiveItemCount",
+                        "get",
+                        session,
+                    )
+
+                    # Filter the list of shows to only include those that have been partially or fully watched
+                    watched_shows_filtered = []
+                    for show in watched_shows["Items"]:
+                        if "PlayedPercentage" in show["UserData"]:
+                            if show["UserData"]["PlayedPercentage"] > 0:
+                                watched_shows_filtered.append(show)
+
+                    # Create a list of tasks to retrieve the seasons of each watched show
+                    seasons_tasks = []
+                    for show in watched_shows_filtered:
+                        logger(
+                            f"Jellyfin: Adding {show['Name']} to {user_name} watched list",
+                            3,
+                        )
+                        show_guids = {
+                            k.lower(): v for k, v in show["ProviderIds"].items()
+                        }
+                        show_guids["title"] = show["Name"]
+                        show_guids["locations"] = tuple([show["Path"].split("/")[-1]])
+                        show_guids = frozenset(show_guids.items())
+                        show_identifiers = {
+                            "show_guids": show_guids,
+                            "show_id": show["Id"],
+                        }
+
+                        season_task = asyncio.ensure_future(
+                            self.query(
+                                f"/Shows/{show['Id']}/Seasons"
+                                + f"?userId={user_id}&isPlaceHolder=false&Fields=ProviderIds,RecursiveItemCount",
+                                "get",
+                                session,
+                                frozenset(show_identifiers.items()),
+                            )
+                        )
+                        seasons_tasks.append(season_task)
+
+                    # Retrieve the seasons for each watched show
+                    seasons_watched = await asyncio.gather(*seasons_tasks)
+
+                    # Filter the list of seasons to only include those that have been partially or fully watched
+                    seasons_watched_filtered = []
+                    for seasons in seasons_watched:
+                        seasons_watched_filtered_dict = {}
+                        seasons_watched_filtered_dict["Identifiers"] = seasons[
+                            "Identifiers"
+                        ]
+                        seasons_watched_filtered_dict["Items"] = []
+                        for season in seasons["Items"]:
+                            if "PlayedPercentage" in season["UserData"]:
+                                if season["UserData"]["PlayedPercentage"] > 0:
+                                    seasons_watched_filtered_dict["Items"].append(
+                                        season
+                                    )
+
+                        if seasons_watched_filtered_dict["Items"]:
+                            seasons_watched_filtered.append(
+                                seasons_watched_filtered_dict
+                            )
+
+                    # Create a list of tasks to retrieve the episodes of each watched season
+                    episodes_tasks = []
+                    for seasons in seasons_watched_filtered:
+                        if len(seasons["Items"]) > 0:
+                            for season in seasons["Items"]:
+                                season_identifiers = dict(seasons["Identifiers"])
+                                season_identifiers["season_id"] = season["Id"]
+                                season_identifiers["season_name"] = season["Name"]
+                                episode_task = asyncio.ensure_future(
+                                    self.query(
+                                        f"/Shows/{season_identifiers['show_id']}/Episodes"
+                                        + f"?seasonId={season['Id']}&userId={user_id}&isPlaceHolder=false&isPlayed=true&Fields=ProviderIds,MediaSources",
+                                        "get",
+                                        session,
+                                        frozenset(season_identifiers.items()),
+                                    )
+                                )
+                                episodes_tasks.append(episode_task)
+
+                    # Retrieve the episodes for each watched season
+                    watched_episodes = await asyncio.gather(*episodes_tasks)
+
+                    # Iterate through the watched episodes
+                    for episodes in watched_episodes:
+                        # If the season has any watched episodes
+                        if len(episodes["Items"]) > 0:
+                            # Create a dictionary for the season with its identifier and episodes
+                            season_dict = {}
+                            season_dict["Identifiers"] = dict(episodes["Identifiers"])
+                            season_dict["Episodes"] = []
+                            for episode in episodes["Items"]:
+                                if (
+                                    episode["UserData"]["Played"] is True
+                                    and "MediaSources" in episode
+                                    and episode["MediaSources"] is not {}
+                                ):
+                                    # Create a dictionary for the episode with its provider IDs and media sources
+                                    episode_dict = {
+                                        k.lower(): v
+                                        for k, v in episode["ProviderIds"].items()
+                                    }
+                                    episode_dict["title"] = episode["Name"]
+                                    episode_dict["locations"] = tuple(
+                                        [
+                                            x["Path"].split("/")[-1]
+                                            for x in episode["MediaSources"]
+                                        ]
+                                    )
+                                    # Add the episode dictionary to the season's list of episodes
+                                    season_dict["Episodes"].append(episode_dict)
+                            # Add the season dictionary to the show's list of seasons
+                            if (
+                                season_dict["Identifiers"]["show_guids"]
+                                not in user_watched[user_name][library_title]
+                            ):
+                                user_watched[user_name][library_title][
+                                    season_dict["Identifiers"]["show_guids"]
+                                ] = {}
+
+                            if (
+                                season_dict["Identifiers"]["season_name"]
+                                not in user_watched[user_name][library_title][
+                                    season_dict["Identifiers"]["show_guids"]
+                                ]
+                            ):
+                                user_watched[user_name][library_title][
+                                    season_dict["Identifiers"]["show_guids"]
+                                ][season_dict["Identifiers"]["season_name"]] = []
+
+                            user_watched[user_name][library_title][
+                                season_dict["Identifiers"]["show_guids"]
+                            ][season_dict["Identifiers"]["season_name"]] = season_dict[
+                                "Episodes"
+                            ]
+                            logger(
+                                f"Jellyfin: Added {season_dict['Episodes']} to {user_name} {season_dict['Identifiers']['show_guids']} watched list",
+                                1,
+                            )
+
+            logger(
+                f"Jellyfin: Got watched for {user_name} in library {library_title}", 1
+            )
+            if library_title in user_watched[user_name]:
+                logger(f"Jellyfin: {user_watched[user_name][library_title]}", 3)
+
+            return user_watched
+        except Exception as e:
+            logger(
+                f"Jellyfin: Failed to get watched for {user_name} in library {library_title}, Error: {e}",
+                2,
+            )
+
+            logger(traceback.format_exc(), 2)
+            return {}
+
+    async def get_users_watched(
+        self,
+        user_name,
+        user_id,
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        library_mapping,
+    ):
+        try:
+            # Get all libraries
+            user_name = user_name.lower()
+            tasks_watched = []
+
+            tasks_libraries = []
+            async with aiohttp.ClientSession() as session:
+                libraries = await self.query(f"/Users/{user_id}/Views", "get", session)
+                for library in libraries["Items"]:
+                    library_id = library["Id"]
+                    library_title = library["Name"]
+                    identifiers = {
+                        "library_id": library_id,
+                        "library_title": library_title,
+                    }
+                    task = asyncio.ensure_future(
+                        self.query(
+                            f"/Users/{user_id}/Items"
+                            + f"?ParentId={library_id}&Filters=IsPlayed&Recursive=True&excludeItemTypes=Folder&limit=100",
+                            "get",
+                            session,
+                            identifiers=identifiers,
+                        )
+                    )
+                    tasks_libraries.append(task)
+
+                libraries = await asyncio.gather(
+                    *tasks_libraries, return_exceptions=True
+                )
+
+                for watched in libraries:
+                    if len(watched["Items"]) == 0:
+                        continue
+
+                    library_id = watched["Identifiers"]["library_id"]
+                    library_title = watched["Identifiers"]["library_title"]
+                    # Get all library types excluding "Folder"
+                    types = set(
+                        [
+                            x["Type"]
+                            for x in watched["Items"]
+                            if x["Type"] in ["Movie", "Series", "Episode"]
+                        ]
+                    )
+
+                    skip_reason = check_skip_logic(
+                        library_title,
+                        types,
+                        blacklist_library,
+                        whitelist_library,
+                        blacklist_library_type,
+                        whitelist_library_type,
+                        library_mapping,
+                    )
+
+                    if skip_reason:
+                        logger(
+                            f"Jellyfin: Skipping library {library_title} {skip_reason}",
+                            1,
+                        )
+                        continue
+
+                    # If there are multiple types in library raise error
+                    if types is None or len(types) < 1:
+                        all_types = set(
+                            [
+                                x["Type"]
+                                for x in watched["Items"]
+                            ]
+                        )
+                        logger(
+                            f"Jellyfin: Skipping Library {library_title} found types: {types}, all types: {all_types}",
+                            1,
+                        )
+                        continue
+
+                    for library_type in types:
+                        # Get watched for user
+                        task = asyncio.ensure_future(
+                            self.get_user_library_watched(
+                                user_name,
+                                user_id,
+                                library_type,
+                                library_id,
+                                library_title,
+                            )
+                        )
+                        tasks_watched.append(task)
+
+            watched = await asyncio.gather(*tasks_watched, return_exceptions=True)
+
+            return watched
+        except Exception as e:
+            logger(f"Jellyfin: Failed to get users watched, Error: {e}", 2)
+            raise Exception(e)
+
+    async def get_watched(
+        self,
+        users,
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        library_mapping=None,
+    ):
+        try:
+            users_watched = {}
+            watched = []
+
+            for user_name, user_id in users.items():
+                watched.append(
+                    self.get_users_watched(
+                        user_name,
+                        user_id,
+                        blacklist_library,
+                        whitelist_library,
+                        blacklist_library_type,
+                        whitelist_library_type,
+                        library_mapping,
+                    )
+                )
+
+            watched = await asyncio.gather(*watched, return_exceptions=True)
+            for user_watched in watched:
+                user_watched_temp = combine_watched_dicts(user_watched)
+                for user, user_watched_temp in user_watched_temp.items():
+                    if user not in users_watched:
+                        users_watched[user] = {}
+                    users_watched[user].update(user_watched_temp)
+
+            return users_watched
+        except Exception as e:
+            logger(f"Jellyfin: Failed to get watched, Error: {e}", 2)
+            raise Exception(e)
+
+    async def update_user_watched(
+        self, user_name, user_id, library, library_id, videos, dryrun
+    ):
+        try:
+            logger(
+                f"Jellyfin: Updating watched for {user_name} in library {library}", 1
+            )
+            (
+                videos_shows_ids,
+                videos_episodes_ids,
+                videos_movies_ids,
+            ) = generate_library_guids_dict(videos)
+
+            logger(
+                f"Jellyfin: mark list\nShows: {videos_shows_ids}\nEpisodes: {videos_episodes_ids}\nMovies: {videos_movies_ids}",
+                1,
+            )
+            async with aiohttp.ClientSession() as session:
+                if videos_movies_ids:
+                    jellyfin_search = await self.query(
+                        f"/Users/{user_id}/Items"
+                        + f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}"
+                        + "&isPlayed=false&Fields=ItemCounts,ProviderIds,MediaSources&IncludeItemTypes=Movie",
+                        "get",
+                        session,
+                    )
+                    for jellyfin_video in jellyfin_search["Items"]:
+                        movie_found = False
+
+                        if "MediaSources" in jellyfin_video:
+                            for movie_location in jellyfin_video["MediaSources"]:
+                                if (
+                                    movie_location["Path"].split("/")[-1]
+                                    in videos_movies_ids["locations"]
+                                ):
+                                    movie_found = True
+                                    break
+
+                        if not movie_found:
+                            for (
+                                movie_provider_source,
+                                movie_provider_id,
+                            ) in jellyfin_video["ProviderIds"].items():
+                                if movie_provider_source.lower() in videos_movies_ids:
+                                    if (
+                                        movie_provider_id.lower()
+                                        in videos_movies_ids[
+                                            movie_provider_source.lower()
+                                        ]
+                                    ):
+                                        movie_found = True
+                                        break
+
+                        if movie_found:
+                            jellyfin_video_id = jellyfin_video["Id"]
+                            msg = f"{jellyfin_video['Name']} as watched for {user_name} in {library} for Jellyfin"
+                            if not dryrun:
+                                logger(f"Marking {msg}", 0)
+                                await self.query(
+                                    f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}",
+                                    "post",
+                                    session,
+                                )
+                            else:
+                                logger(f"Dryrun {msg}", 0)
+                        else:
+                            logger(
+                                f"Jellyfin: Skipping movie {jellyfin_video['Name']} as it is not in mark list for {user_name}",
+                                1,
+                            )
+
+                # TV Shows
+                if videos_shows_ids and videos_episodes_ids:
+                    jellyfin_search = await self.query(
+                        f"/Users/{user_id}/Items"
+                        + f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}"
+                        + "&isPlayed=false&Fields=ItemCounts,ProviderIds,Path&IncludeItemTypes=Series",
+                        "get",
+                        session,
+                    )
+                    jellyfin_shows = [x for x in jellyfin_search["Items"]]
+
+                    for jellyfin_show in jellyfin_shows:
+                        show_found = False
+
+                        if "Path" in jellyfin_show:
+                            if (
+                                jellyfin_show["Path"].split("/")[-1]
+                                in videos_shows_ids["locations"]
+                            ):
+                                show_found = True
+
+                        if not show_found:
+                            for show_provider_source, show_provider_id in jellyfin_show[
+                                "ProviderIds"
+                            ].items():
+                                if show_provider_source.lower() in videos_shows_ids:
+                                    if (
+                                        show_provider_id.lower()
+                                        in videos_shows_ids[
+                                            show_provider_source.lower()
+                                        ]
+                                    ):
+                                        show_found = True
+                                        break
+
+                        if show_found:
+                            logger(
+                                f"Jellyfin: Updating watched for {user_name} in library {library} for show {jellyfin_show['Name']}",
+                                1,
+                            )
+                            jellyfin_show_id = jellyfin_show["Id"]
+                            jellyfin_episodes = await self.query(
+                                f"/Shows/{jellyfin_show_id}/Episodes"
+                                + f"?userId={user_id}&Fields=ItemCounts,ProviderIds,MediaSources",
+                                "get",
+                                session,
+                            )
+
+                            for jellyfin_episode in jellyfin_episodes["Items"]:
+                                episode_found = False
+
+                                if "MediaSources" in jellyfin_episode:
+                                    for episode_location in jellyfin_episode[
+                                        "MediaSources"
+                                    ]:
+                                        if (
+                                            episode_location["Path"].split("/")[-1]
+                                            in videos_episodes_ids["locations"]
+                                        ):
+                                            episode_found = True
+                                            break
+
+                                if not episode_found:
+                                    for (
+                                        episode_provider_source,
+                                        episode_provider_id,
+                                    ) in jellyfin_episode["ProviderIds"].items():
+                                        if (
+                                            episode_provider_source.lower()
+                                            in videos_episodes_ids
+                                        ):
+                                            if (
+                                                episode_provider_id.lower()
+                                                in videos_episodes_ids[
+                                                    episode_provider_source.lower()
+                                                ]
+                                            ):
+                                                episode_found = True
+                                                break
+
+                                if episode_found:
+                                    jellyfin_episode_id = jellyfin_episode["Id"]
+                                    msg = (
+                                        f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode['Name']}"
+                                        + f" as watched for {user_name} in {library} for Jellyfin"
+                                    )
+                                    if not dryrun:
+                                        logger(f"Marked {msg}", 0)
+                                        await self.query(
+                                            f"/Users/{user_id}/PlayedItems/{jellyfin_episode_id}",
+                                            "post",
+                                            session,
+                                        )
+                                    else:
+                                        logger(f"Dryrun {msg}", 0)
+                                else:
+                                    logger(
+                                        f"Jellyfin: Skipping episode {jellyfin_episode['Name']} as it is not in mark list for {user_name}",
+                                        3,
+                                    )
+                        else:
+                            logger(
+                                f"Jellyfin: Skipping show {jellyfin_show['Name']} as it is not in mark list for {user_name}",
+                                3,
+                            )
+
+            if (
+                not videos_movies_ids
+                and not videos_shows_ids
+                and not videos_episodes_ids
+            ):
+                logger(
+                    f"Jellyfin: No videos to mark as watched for {user_name} in library {library}",
+                    1,
+                )
+
+        except Exception as e:
+            logger(
+                f"Jellyfin: Error updating watched for {user_name} in library {library}, {e}",
+                2,
+            )
+            raise Exception(e)
+
+    async def update_watched(
+        self, watched_list, user_mapping=None, library_mapping=None, dryrun=False
+    ):
+        try:
+            tasks = []
+            async with aiohttp.ClientSession() as session:
+                for user, libraries in watched_list.items():
+                    logger(f"Jellyfin: Updating for entry {user}, {libraries}", 1)
+                    user_other = None
+                    user_name = None
+                    if user_mapping:
+                        if user in user_mapping.keys():
+                            user_other = user_mapping[user]
+                        elif user in user_mapping.values():
+                            user_other = search_mapping(user_mapping, user)
+
+                    user_id = None
+                    for key in self.users.keys():
+                        if user.lower() == key.lower():
+                            user_id = self.users[key]
+                            user_name = key
+                            break
+                        elif user_other and user_other.lower() == key.lower():
+                            user_id = self.users[key]
+                            user_name = key
+                            break
+
+                    if not user_id:
+                        logger(f"{user} {user_other} not found in Jellyfin", 2)
+                        continue
+
+                    jellyfin_libraries = await self.query(
+                        f"/Users/{user_id}/Views", "get", session
+                    )
+                    jellyfin_libraries = [x for x in jellyfin_libraries["Items"]]
+
+                    for library, videos in libraries.items():
+                        library_other = None
+                        if library_mapping:
+                            if library in library_mapping.keys():
+                                library_other = library_mapping[library]
+                            elif library in library_mapping.values():
+                                library_other = search_mapping(library_mapping, library)
+
+                        if library.lower() not in [
+                            x["Name"].lower() for x in jellyfin_libraries
+                        ]:
+                            if library_other:
+                                if library_other.lower() in [
+                                    x["Name"].lower() for x in jellyfin_libraries
+                                ]:
+                                    logger(
+                                        f"Jellyfin: Library {library} not found, but {library_other} found, using {library_other}",
+                                        1,
+                                    )
+                                    library = library_other
+                                else:
+                                    logger(
+                                        f"Jellyfin: Library {library} or {library_other} not found in library list",
+                                        1,
+                                    )
+                                    continue
+                            else:
+                                logger(
+                                    f"Jellyfin: Library {library} not found in library list",
+                                    1,
+                                )
+                                continue
+
+                        library_id = None
+                        for jellyfin_library in jellyfin_libraries:
+                            if jellyfin_library["Name"] == library:
+                                library_id = jellyfin_library["Id"]
+                                continue
+
+                        if library_id:
+                            task = self.update_user_watched(
+                                user_name, user_id, library, library_id, videos, dryrun
+                            )
+                            tasks.append(task)
+
+            await asyncio.gather(*tasks, return_exceptions=True)
+        except Exception as e:
+            logger(f"Jellyfin: Error updating watched, {e}", 2)
+            raise Exception(e)

src/main.py

@@ -0,0 +1,420 @@
+import os, traceback, json, asyncio
+from dotenv import load_dotenv
+from time import sleep, perf_counter
+
+from src.functions import (
+    logger,
+    str_to_bool,
+    search_mapping,
+    cleanup_watched,
+    setup_black_white_lists,
+)
+from src.plex import Plex
+from src.jellyfin import Jellyfin
+
+load_dotenv(override=True)
+
+
+def setup_users(
+    server_1, server_2, blacklist_users, whitelist_users, user_mapping=None
+):
+
+    # generate list of users from server 1 and server 2
+    server_1_type = server_1[0]
+    server_1_connection = server_1[1]
+    server_2_type = server_2[0]
+    server_2_connection = server_2[1]
+    logger(f"Server 1: {server_1_type} {server_1_connection}", 0)
+    logger(f"Server 2: {server_2_type} {server_2_connection}", 0)
+
+    server_1_users = []
+    if server_1_type == "plex":
+        server_1_users = [x.title.lower() for x in server_1_connection.users]
+    elif server_1_type == "jellyfin":
+        server_1_users = [key.lower() for key in server_1_connection.users.keys()]
+
+    server_2_users = []
+    if server_2_type == "plex":
+        server_2_users = [x.title.lower() for x in server_2_connection.users]
+    elif server_2_type == "jellyfin":
+        server_2_users = [key.lower() for key in server_2_connection.users.keys()]
+
+    # combined list of overlapping users from plex and jellyfin
+    users = {}
+
+    for server_1_user in server_1_users:
+        if user_mapping:
+            jellyfin_plex_mapped_user = search_mapping(user_mapping, server_1_user)
+            if jellyfin_plex_mapped_user:
+                users[server_1_user] = jellyfin_plex_mapped_user
+                continue
+
+        if server_1_user in server_2_users:
+            users[server_1_user] = server_1_user
+
+    for server_2_user in server_2_users:
+        if user_mapping:
+            plex_jellyfin_mapped_user = search_mapping(user_mapping, server_2_user)
+            if plex_jellyfin_mapped_user:
+                users[plex_jellyfin_mapped_user] = server_2_user
+                continue
+
+        if server_2_user in server_1_users:
+            users[server_2_user] = server_2_user
+
+    logger(f"User list that exist on both servers {users}", 1)
+
+    users_filtered = {}
+    for user in users:
+        # whitelist_user is not empty and user lowercase is not in whitelist lowercase
+        if len(whitelist_users) > 0:
+            if user not in whitelist_users and users[user] not in whitelist_users:
+                logger(f"{user} or {users[user]} is not in whitelist", 1)
+                continue
+
+        if user not in blacklist_users and users[user] not in blacklist_users:
+            users_filtered[user] = users[user]
+
+    logger(f"Filtered user list {users_filtered}", 1)
+
+    if server_1_type == "plex":
+        output_server_1_users = []
+        for plex_user in server_1_connection.users:
+            if (
+                plex_user.title.lower() in users_filtered.keys()
+                or plex_user.title.lower() in users_filtered.values()
+            ):
+                output_server_1_users.append(plex_user)
+    elif server_1_type == "jellyfin":
+        output_server_1_users = {}
+        for jellyfin_user, jellyfin_id in server_1_connection.users.items():
+            if (
+                jellyfin_user.lower() in users_filtered.keys()
+                or jellyfin_user.lower() in users_filtered.values()
+            ):
+                output_server_1_users[jellyfin_user] = jellyfin_id
+
+    if server_2_type == "plex":
+        output_server_2_users = []
+        for plex_user in server_2_connection.users:
+            if (
+                plex_user.title.lower() in users_filtered.keys()
+                or plex_user.title.lower() in users_filtered.values()
+            ):
+                output_server_2_users.append(plex_user)
+    elif server_2_type == "jellyfin":
+        output_server_2_users = {}
+        for jellyfin_user, jellyfin_id in server_2_connection.users.items():
+            if (
+                jellyfin_user.lower() in users_filtered.keys()
+                or jellyfin_user.lower() in users_filtered.values()
+            ):
+                output_server_2_users[jellyfin_user] = jellyfin_id
+
+    if len(output_server_1_users) == 0:
+        raise Exception(
+            f"No users found for server 1 {server_1_type}, users found {users}, filtered users {users_filtered}, server 1 users {server_1_connection.users}"
+        )
+
+    if len(output_server_2_users) == 0:
+        raise Exception(
+            f"No users found for server 2 {server_2_type}, users found {users} filtered users {users_filtered}, server 2 users {server_2_connection.users}"
+        )
+
+    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 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):
+            servers.append(
+                (
+                    "plex",
+                    Plex(
+                        baseurl=url.strip(),
+                        token=plex_token[i].strip(),
+                        username=None,
+                        password=None,
+                        servername=None,
+                        ssl_bypass=ssl_bypass,
+                    ),
+                )
+            )
+
+    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):
+            servers.append(
+                (
+                    "plex",
+                    Plex(
+                        baseurl=None,
+                        token=None,
+                        username=username.strip(),
+                        password=plex_password[i].strip(),
+                        servername=plex_servername[i].strip(),
+                        ssl_bypass=ssl_bypass,
+                    ),
+                )
+            )
+
+    jellyfin_baseurl = os.getenv("JELLYFIN_BASEURL", None)
+    jellyfin_token = os.getenv("JELLYFIN_TOKEN", None)
+
+    if jellyfin_baseurl and jellyfin_token:
+        jellyfin_baseurl = jellyfin_baseurl.split(",")
+        jellyfin_token = jellyfin_token.split(",")
+
+        if len(jellyfin_baseurl) != len(jellyfin_token):
+            raise Exception(
+                "JELLYFIN_BASEURL and JELLYFIN_TOKEN must have the same number of entries"
+            )
+
+        for i, baseurl in enumerate(jellyfin_baseurl):
+            baseurl = baseurl.strip()
+            if baseurl[-1] == "/":
+                baseurl = baseurl[:-1]
+            servers.append(
+                (
+                    "jellyfin",
+                    Jellyfin(baseurl=baseurl, token=jellyfin_token[i].strip()),
+                )
+            )
+
+    return servers
+
+
+def get_server_watched(
+    server_connection: list,
+    users: dict,
+    blacklist_library: list,
+    whitelist_library: list,
+    blacklist_library_type: list,
+    whitelist_library_type: list,
+    library_mapping: dict,
+):
+    if server_connection[0] == "plex":
+        return server_connection[1].get_watched(
+            users,
+            blacklist_library,
+            whitelist_library,
+            blacklist_library_type,
+            whitelist_library_type,
+            library_mapping,
+        )
+    elif server_connection[0] == "jellyfin":
+        return asyncio.run(
+            server_connection[1].get_watched(
+                users,
+                blacklist_library,
+                whitelist_library,
+                blacklist_library_type,
+                whitelist_library_type,
+                library_mapping,
+            )
+        )
+
+
+def update_server_watched(
+    server_connection: list,
+    server_watched_filtered: dict,
+    user_mapping: dict,
+    library_mapping: dict,
+    dryrun: bool,
+):
+    if server_connection[0] == "plex":
+        server_connection[1].update_watched(
+            server_watched_filtered, user_mapping, library_mapping, dryrun
+        )
+    elif server_connection[0] == "jellyfin":
+        asyncio.run(
+            server_connection[1].update_watched(
+                server_watched_filtered, user_mapping, library_mapping, dryrun
+            )
+        )
+
+
+def main_loop():
+    logfile = os.getenv("LOGFILE", "log.log")
+    # Delete logfile if it exists
+    if os.path.exists(logfile):
+        os.remove(logfile)
+
+    dryrun = str_to_bool(os.getenv("DRYRUN", "False"))
+    logger(f"Dryrun: {dryrun}", 1)
+
+    user_mapping = os.getenv("USER_MAPPING")
+    if user_mapping:
+        user_mapping = json.loads(user_mapping.lower())
+        logger(f"User Mapping: {user_mapping}", 1)
+
+    library_mapping = os.getenv("LIBRARY_MAPPING")
+    if library_mapping:
+        library_mapping = json.loads(library_mapping)
+        logger(f"Library Mapping: {library_mapping}", 1)
+
+    # Create (black/white)lists
+    logger("Creating (black/white)lists", 1)
+    blacklist_library = os.getenv("BLACKLIST_LIBRARY", None)
+    whitelist_library = os.getenv("WHITELIST_LIBRARY", None)
+    blacklist_library_type = os.getenv("BLACKLIST_LIBRARY_TYPE", None)
+    whitelist_library_type = os.getenv("WHITELIST_LIBRARY_TYPE", None)
+    blacklist_users = os.getenv("BLACKLIST_USERS", None)
+    whitelist_users = os.getenv("WHITELIST_USERS", None)
+
+    (
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        blacklist_users,
+        whitelist_users,
+    ) = setup_black_white_lists(
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        blacklist_users,
+        whitelist_users,
+        library_mapping,
+        user_mapping,
+    )
+
+    # Create server connections
+    logger("Creating server connections", 1)
+    servers = generate_server_connections()
+
+    for server_1 in servers:
+        # If server is the final server in the list, then we are done with the loop
+        if server_1 == servers[-1]:
+            break
+
+        # Start server_2 at the next server in the list
+        for server_2 in servers[servers.index(server_1) + 1 :]:
+            # Create users list
+            logger("Creating users list", 1)
+            server_1_users, server_2_users = setup_users(
+                server_1, server_2, blacklist_users, whitelist_users, user_mapping
+            )
+
+            logger("Creating watched lists", 1)
+            server_1_watched = get_server_watched(
+                server_1,
+                server_1_users,
+                blacklist_library,
+                whitelist_library,
+                blacklist_library_type,
+                whitelist_library_type,
+                library_mapping,
+            )
+            logger("Finished creating watched list server 1", 1)
+            server_2_watched = get_server_watched(
+                server_2,
+                server_2_users,
+                blacklist_library,
+                whitelist_library,
+                blacklist_library_type,
+                whitelist_library_type,
+                library_mapping,
+            )
+            logger("Finished creating watched list server 2", 1)
+            logger(f"Server 1 watched: {server_1_watched}", 3)
+            logger(f"Server 2 watched: {server_2_watched}", 3)
+
+            logger("Cleaning Server 1 Watched", 1)
+            server_1_watched_filtered = cleanup_watched(
+                server_1_watched, server_2_watched, user_mapping, library_mapping
+            )
+
+            logger("Cleaning Server 2 Watched", 1)
+            server_2_watched_filtered = cleanup_watched(
+                server_2_watched, server_1_watched, user_mapping, library_mapping
+            )
+
+            logger(
+                f"server 1 watched that needs to be synced to server 2:\n{server_1_watched_filtered}",
+                1,
+            )
+            logger(
+                f"server 2 watched that needs to be synced to server 1:\n{server_2_watched_filtered}",
+                1,
+            )
+
+            update_server_watched(
+                server_1,
+                server_2_watched_filtered,
+                user_mapping,
+                library_mapping,
+                dryrun,
+            )
+
+            update_server_watched(
+                server_2,
+                server_1_watched_filtered,
+                user_mapping,
+                library_mapping,
+                dryrun,
+            )
+
+
+def main():
+    sleep_duration = float(os.getenv("SLEEP_DURATION", "3600"))
+    times = []
+    while True:
+        try:
+            start = perf_counter()
+            main_loop()
+            end = perf_counter()
+            times.append(end - start)
+
+            if len(times) > 0:
+                logger(f"Average time: {sum(times) / len(times)}", 0)
+
+            logger(f"Looping in {sleep_duration}")
+            sleep(sleep_duration)
+
+        except Exception as error:
+            if isinstance(error, list):
+                for message in error:
+                    logger(message, log_type=2)
+            else:
+                logger(error, log_type=2)
+
+            logger(traceback.format_exc(), 2)
+
+            logger(f"Retrying in {sleep_duration}", log_type=0)
+            sleep(sleep_duration)
+
+        except KeyboardInterrupt:
+            logger("Exiting", log_type=0)
+            os._exit(0)

src/plex.py

@@ -1,216 +1,487 @@
-import re, os
-from dotenv import load_dotenv
-
-from src.functions import logger, search_mapping, check_skip_logic
-from plexapi.server import PlexServer
-from plexapi.myplex import MyPlexAccount
-
-load_dotenv(override=True)
-
-plex_baseurl = os.getenv("PLEX_BASEURL")
-plex_token = os.getenv("PLEX_TOKEN")
-username = os.getenv("PLEX_USERNAME")
-password = os.getenv("PLEX_PASSWORD")
-servername = os.getenv("PLEX_SERVERNAME")
-
-# class plex accept base url and token and username and password but default with none
-class Plex:
-    def __init__(self):
-        self.baseurl = plex_baseurl
-        self.token = plex_token
-        self.username = username
-        self.password = password
-        self.servername = servername
-        self.plex = self.plex_login()
-        self.admin_user = self.plex.myPlexAccount()
-        self.users = self.get_plex_users()
-
-    def plex_login(self):
-        try:
-            if self.baseurl and self.token:
-                    # Login via token
-                    plex = PlexServer(self.baseurl, self.token)
-            elif self.username and self.password and self.servername:
-                # Login via plex account
-                account = MyPlexAccount(self.username, self.password)
-                plex = account.resource(self.servername).connect()
-            else:
-                raise Exception("No complete plex credentials provided")
-
-            return plex
-        except Exception as e:
-            if self.username or self.password:
-                msg = f"Failed to login via plex account {self.username}"
-                logger(f"Plex: Failed to login, {msg}, Error: {e}", 2)
-            else:
-                logger(f"Plex: Failed to login, Error: {e}", 2)
-            return None
-
-
-    def get_plex_users(self):
-        users = self.plex.myPlexAccount().users()
-
-        # append self to users
-        users.append(self.plex.myPlexAccount())
-
-        return users
-
-    def get_plex_user_watched(self, user, library):
-        if self.admin_user == user:
-            user_plex = self.plex
-        else:
-            user_plex = PlexServer(self.baseurl, user.get_token(self.plex.machineIdentifier))
-
-        watched = None
-
-        if library.type == "movie":
-            watched = []
-            library_videos = user_plex.library.section(library.title)
-            for video in library_videos.search(unmatched=False, unwatched=False):
-                guids = {}
-                for guid in video.guids:
-                    guid_source = re.search(r'(.*)://', guid.id).group(1).lower()
-                    guid_id = re.search(r'://(.*)', guid.id).group(1)
-                    guids[guid_source] = guid_id
-                watched.append(guids)
-
-        elif library.type == "show":
-            watched = {}
-            library_videos = user_plex.library.section(library.title)
-            for show in library_videos.search(unmatched=False, unwatched=False):
-                for season in show.seasons():
-                    guids = []
-                    for episode in season.episodes():
-                        if episode.viewCount > 0:
-                            guids_temp = {}
-                            for guid in episode.guids:
-                                # Extract after :// from guid.id
-                                guid_source = re.search(r'(.*)://', guid.id).group(1).lower()
-                                guid_id = re.search(r'://(.*)', guid.id).group(1)
-                                guids_temp[guid_source] = guid_id
-
-                            guids.append(guids_temp)
-
-                    if guids:
-                        # append show, season, episode
-                        if show.title not in watched:
-                            watched[show.title] = {}
-                        if season.title not in watched[show.title]:
-                            watched[show.title][season.title] = {}
-                        watched[show.title][season.title] = guids
-
-        return watched
-
-    def get_plex_watched(self, users, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping):
-        # Get all libraries
-        libraries = self.plex.library.sections()
-        users_watched = {}
-
-        # for not in blacklist
-        for library in libraries:
-            library_title = library.title
-            library_type = library.type
-
-            skip_reason = check_skip_logic(library_title, library_type, blacklist_library, whitelist_library, blacklist_library_type, whitelist_library_type, library_mapping)
-
-            if skip_reason:
-                logger(f"Plex: Skipping library {library_title} {skip_reason}", 1)
-                continue
-
-            for user in users:
-                logger(f"Plex: Generating watched for {user.title} in library {library_title}", 0)
-                user_name = user.title.lower()
-                watched = self.get_plex_user_watched(user, library)
-                if watched:
-                    if user_name not in users_watched:
-                        users_watched[user_name] = {}
-                    if library_title not in users_watched[user_name]:
-                        users_watched[user_name][library_title] = []
-                    users_watched[user_name][library_title] = watched
-
-        return users_watched
-
-    def update_watched(self, watched_list, user_mapping=None, library_mapping=None, dryrun=False):
-        for user, libraries in watched_list.items():
-            if user_mapping:
-                user_other = None
-
-                if user in user_mapping.keys():
-                    user_other = user_mapping[user]
-                elif user in user_mapping.values():
-                    user_other = search_mapping(user_mapping, user)
-
-                if user_other:
-                    logger(f"Swapping user {user} with {user_other}", 1)
-                    user = user_other
-
-            for index, value in enumerate(self.users):
-                if user.lower() == value.title.lower():
-                    user = self.users[index]
-                    break
-
-            if self.admin_user == user:
-                user_plex = self.plex
-            else:
-                user_plex = PlexServer(self.baseurl, user.get_token(self.plex.machineIdentifier))
-
-            for library, videos in libraries.items():
-                if library_mapping:
-                    library_other = None
-
-                    if library in library_mapping.keys():
-                        library_other = library_mapping[library]
-                    elif library in library_mapping.values():
-                        library_other = search_mapping(library_mapping, library)
-
-                    if library_other:
-                        logger(f"Swapping library {library} with {library_other}", 1)
-                        library = library_other
-
-                # if library in plex library list
-                library_list = user_plex.library.sections()
-                if library.lower() not in [x.title.lower() for x in library_list]:
-                    logger(f"Library {library} not found in Plex library list", 2)
-                    continue
-
-                logger(f"Plex: Updating watched for {user.title} in library {library}", 1)
-                library_videos = user_plex.library.section(library)
-
-                if library_videos.type == "movie":
-                    for movies_search in library_videos.search(unmatched=False, unwatched=True):
-                        for guid in movies_search.guids:
-                            guid_source = re.search(r'(.*)://', guid.id).group(1).lower()
-                            guid_id = re.search(r'://(.*)', guid.id).group(1)
-                            for video in videos:
-                                for video_keys, video_id in video.items():
-                                    if video_keys == guid_source and video_id == guid_id:
-                                        if movies_search.viewCount == 0:
-                                            msg = f"{movies_search.title} as watched for {user.title} in {library} for Plex"
-                                            if not dryrun:
-                                                logger(f"Marked {msg}", 0)
-                                                movies_search.markWatched()
-                                            else:
-                                                logger(f"Dryrun {msg}", 0)
-                                            break
-
-                elif library_videos.type == "show":
-                    for show_search in library_videos.search(unmatched=False, unwatched=True):
-                        if show_search.title in videos:
-                            for season_search in show_search.seasons():
-                                for episode_search in season_search.episodes():
-                                    for guid in episode_search.guids:
-                                        guid_source = re.search(r'(.*)://', guid.id).group(1).lower()
-                                        guid_id = re.search(r'://(.*)', guid.id).group(1)
-                                        for show in videos:
-                                            for season in videos[show]:
-                                                for episode in videos[show][season]:
-                                                    for episode_keys, episode_id in episode.items():
-                                                        if episode_keys == guid_source and episode_id == guid_id:
-                                                            if episode_search.viewCount == 0:
-                                                                msg = f"{show_search.title} {season_search.title} {episode_search.title} as watched for {user.title} in {library} for Plex"
-                                                                if not dryrun:
-                                                                    logger(f"Marked {msg}", 0)
-                                                                    episode_search.markWatched()
-                                                                else:
-                                                                    logger(f"Dryrun {msg}", 0)
-                                                                break
+import re, requests, os, traceback
+from urllib3.poolmanager import PoolManager
+
+from plexapi.server import PlexServer
+from plexapi.myplex import MyPlexAccount
+
+from src.functions import (
+    logger,
+    search_mapping,
+    check_skip_logic,
+    generate_library_guids_dict,
+    future_thread_executor,
+)
+
+# Bypass hostname validation for ssl. Taken from https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
+class HostNameIgnoringAdapter(requests.adapters.HTTPAdapter):
+    def init_poolmanager(self, connections, maxsize, block=..., **pool_kwargs):
+        self.poolmanager = PoolManager(
+            num_pools=connections,
+            maxsize=maxsize,
+            block=block,
+            assert_hostname=False,
+            **pool_kwargs,
+        )
+
+
+def get_user_library_watched_show(show):
+    try:
+        show_guids = {}
+        for show_guid in show.guids:
+            # Extract source and id from guid.id
+            m = re.match(r"(.*)://(.*)", show_guid.id)
+            show_guid_source, show_guid_id = m.group(1).lower(), m.group(2)
+            show_guids[show_guid_source] = show_guid_id
+
+        show_guids["title"] = show.title
+        show_guids["locations"] = tuple([x.split("/")[-1] for x in show.locations])
+        show_guids = frozenset(show_guids.items())
+
+        # Get all watched episodes for show
+        episode_guids = {}
+        watched_episodes = show.watched()
+        for episode in watched_episodes:
+            episode_guids_temp = {}
+            try:
+                if len(episode.guids) > 0:
+                    for guid in episode.guids:
+                        # Extract after :// from guid.id
+                        m = re.match(r"(.*)://(.*)", guid.id)
+                        guid_source, guid_id = m.group(1).lower(), m.group(2)
+                        episode_guids_temp[guid_source] = guid_id
+            except:
+                logger(
+                    f"Plex: Failed to get guids for {episode.title} in {show.title}, Using location only",
+                    1,
+                )
+
+            episode_guids_temp["locations"] = tuple(
+                [x.split("/")[-1] for x in episode.locations]
+            )
+
+            if episode.parentTitle not in episode_guids:
+                episode_guids[episode.parentTitle] = []
+
+            episode_guids[episode.parentTitle].append(episode_guids_temp)
+
+        return show_guids, episode_guids
+
+    except Exception as e:
+        return {}, {}
+
+
+def get_user_library_watched(user, user_plex, library):
+    try:
+        user_name = user.title.lower()
+        user_watched = {}
+        user_watched[user_name] = {}
+
+        logger(
+            f"Plex: Generating watched for {user_name} in library {library.title}",
+            0,
+        )
+
+        library_videos = user_plex.library.section(library.title)
+
+        if library.type == "movie":
+            user_watched[user_name][library.title] = []
+
+            for video in library_videos.search(unwatched=False):
+                logger(f"Plex: Adding {video.title} to {user_name} watched list", 3)
+                logger(f"Plex: {video.title} {video.guids} {video.locations}", 3)
+
+                movie_guids = {}
+                for guid in video.guids:
+                    # Extract source and id from guid.id
+                    m = re.match(r"(.*)://(.*)", guid.id)
+                    guid_source, guid_id = m.group(1).lower(), m.group(2)
+                    movie_guids[guid_source] = guid_id
+
+                movie_guids["title"] = video.title
+                movie_guids["locations"] = tuple(
+                    [x.split("/")[-1] for x in video.locations]
+                )
+
+                user_watched[user_name][library.title].append(movie_guids)
+                logger(f"Plex: Added {movie_guids} to {user_name} watched list", 3)
+
+        elif library.type == "show":
+            user_watched[user_name][library.title] = {}
+            shows = library_videos.search(unwatched=False)
+
+            # Parallelize show processing
+            args = []
+            for show in shows:
+                args.append([get_user_library_watched_show, show])
+
+            for show_guids, episode_guids in future_thread_executor(
+                args, workers=min(os.cpu_count(), 4)
+            ):
+                if show_guids and episode_guids:
+                    # append show, season, episode
+                    if show_guids not in user_watched[user_name][library.title]:
+                        user_watched[user_name][library.title][show_guids] = {}
+
+                    user_watched[user_name][library.title][show_guids] = episode_guids
+                    logger(
+                        f"Plex: Added {episode_guids} to {user_name} {show_guids} watched list",
+                        3,
+                    )
+
+        logger(f"Plex: Got watched for {user_name} in library {library.title}", 1)
+        if library.title in user_watched[user_name]:
+            logger(f"Plex: {user_watched[user_name][library.title]}", 3)
+
+        return user_watched
+    except Exception as e:
+        logger(
+            f"Plex: Failed to get watched for {user_name} in library {library.title}, Error: {e}",
+            2,
+        )
+        return {}
+
+
+def update_user_watched(user, user_plex, library, videos, dryrun):
+    try:
+        logger(f"Plex: Updating watched for {user.title} in library {library}", 1)
+        (
+            videos_shows_ids,
+            videos_episodes_ids,
+            videos_movies_ids,
+        ) = generate_library_guids_dict(videos)
+        logger(
+            f"Plex: mark list\nShows: {videos_shows_ids}\nEpisodes: {videos_episodes_ids}\nMovies: {videos_movies_ids}",
+            1,
+        )
+
+        library_videos = user_plex.library.section(library)
+        if videos_movies_ids:
+            for movies_search in library_videos.search(unwatched=True):
+                movie_found = False
+                for movie_location in movies_search.locations:
+                    if movie_location.split("/")[-1] in videos_movies_ids["locations"]:
+                        movie_found = True
+                        break
+
+                if not movie_found:
+                    for movie_guid in movies_search.guids:
+                        movie_guid_source = (
+                            re.search(r"(.*)://", movie_guid.id).group(1).lower()
+                        )
+                        movie_guid_id = re.search(r"://(.*)", movie_guid.id).group(1)
+
+                        # If movie provider source and movie provider id are in videos_movie_ids exactly, then the movie is in the list
+                        if movie_guid_source in videos_movies_ids.keys():
+                            if movie_guid_id in videos_movies_ids[movie_guid_source]:
+                                movie_found = True
+                                break
+
+                if movie_found:
+                    msg = f"{movies_search.title} as watched for {user.title} in {library} for Plex"
+                    if not dryrun:
+                        logger(f"Marked {msg}", 0)
+                        movies_search.markWatched()
+                    else:
+                        logger(f"Dryrun {msg}", 0)
+                else:
+                    logger(
+                        f"Plex: Skipping movie {movies_search.title} as it is not in mark list for {user.title}",
+                        1,
+                    )
+
+        if videos_shows_ids and videos_episodes_ids:
+            for show_search in library_videos.search(unwatched=True):
+                show_found = False
+                for show_location in show_search.locations:
+                    if show_location.split("/")[-1] in videos_shows_ids["locations"]:
+                        show_found = True
+                        break
+
+                if not show_found:
+                    for show_guid in show_search.guids:
+                        show_guid_source = (
+                            re.search(r"(.*)://", show_guid.id).group(1).lower()
+                        )
+                        show_guid_id = re.search(r"://(.*)", show_guid.id).group(1)
+
+                        # If show provider source and show provider id are in videos_shows_ids exactly, then the show is in the list
+                        if show_guid_source in videos_shows_ids.keys():
+                            if show_guid_id in videos_shows_ids[show_guid_source]:
+                                show_found = True
+                                break
+
+                if show_found:
+                    for episode_search in show_search.episodes():
+                        episode_found = False
+
+                        for episode_location in episode_search.locations:
+                            if (
+                                episode_location.split("/")[-1]
+                                in videos_episodes_ids["locations"]
+                            ):
+                                episode_found = True
+                                break
+
+                        if not episode_found:
+                            try:
+                                for episode_guid in episode_search.guids:
+                                    episode_guid_source = (
+                                        re.search(r"(.*)://", episode_guid.id)
+                                        .group(1)
+                                        .lower()
+                                    )
+                                    episode_guid_id = re.search(
+                                        r"://(.*)", episode_guid.id
+                                    ).group(1)
+
+                                    # If episode provider source and episode provider id are in videos_episodes_ids exactly, then the episode is in the list
+                                    if episode_guid_source in videos_episodes_ids.keys():
+                                        if (
+                                            episode_guid_id
+                                            in videos_episodes_ids[episode_guid_source]
+                                        ):
+                                            episode_found = True
+                                            break
+                            except Exception as e:
+                                logger(
+                                    f"Plex: Failed to get episode guid for {episode_search.title}, Error: {e}",
+                                    1,
+                                )
+
+                        if episode_found:
+                            msg = f"{show_search.title} {episode_search.title} as watched for {user.title} in {library} for Plex"
+                            if not dryrun:
+                                logger(f"Marked {msg}", 0)
+                                episode_search.markWatched()
+                            else:
+                                logger(f"Dryrun {msg}", 0)
+                        else:
+                            logger(
+                                f"Plex: Skipping episode {episode_search.title} as it is not in mark list for {user.title}",
+                                3,
+                            )
+                else:
+                    logger(
+                        f"Plex: Skipping show {show_search.title} as it is not in mark list for {user.title}",
+                        3,
+                    )
+
+        if not videos_movies_ids and not videos_shows_ids and not videos_episodes_ids:
+            logger(
+                f"Jellyfin: No videos to mark as watched for {user.title} in library {library}",
+                1,
+            )
+
+    except Exception as e:
+        logger(
+            f"Plex: Failed to update watched for {user.title} in library {library}, Error: {e}",
+            2,
+        )
+        logger(traceback.format_exc(), 2)
+
+
+# class plex accept base url and token and username and password but default with none
+class Plex:
+    def __init__(
+        self,
+        baseurl=None,
+        token=None,
+        username=None,
+        password=None,
+        servername=None,
+        ssl_bypass=False,
+        session=None,
+    ):
+        self.baseurl = baseurl
+        self.token = token
+        self.username = username
+        self.password = password
+        self.servername = servername
+        self.ssl_bypass = ssl_bypass
+        if ssl_bypass:
+            # Session for ssl bypass
+            session = requests.Session()
+            # By pass ssl hostname check https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
+            session.mount("https://", HostNameIgnoringAdapter())
+        self.session = session
+        self.plex = self.login(self.baseurl, self.token)
+        self.admin_user = self.plex.myPlexAccount()
+        self.users = self.get_users()
+
+    def login(self, baseurl, token):
+        try:
+            if baseurl and token:
+                plex = PlexServer(baseurl, token, session=self.session)
+            elif self.username and self.password and self.servername:
+                # Login via plex account
+                account = MyPlexAccount(self.username, self.password)
+                plex = account.resource(self.servername).connect()
+            else:
+                raise Exception("No complete plex credentials provided")
+
+            return plex
+        except Exception as e:
+            if self.username or self.password:
+                msg = f"Failed to login via plex account {self.username}"
+                logger(f"Plex: Failed to login, {msg}, Error: {e}", 2)
+            else:
+                logger(f"Plex: Failed to login, Error: {e}", 2)
+            raise Exception(e)
+
+    def get_users(self):
+        try:
+            users = self.plex.myPlexAccount().users()
+
+            # append self to users
+            users.append(self.plex.myPlexAccount())
+
+            return users
+        except Exception as e:
+            logger(f"Plex: Failed to get users, Error: {e}", 2)
+            raise Exception(e)
+
+    def get_watched(
+        self,
+        users,
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        library_mapping,
+    ):
+        try:
+            # Get all libraries
+            users_watched = {}
+            args = []
+
+            for user in users:
+                if self.admin_user == user:
+                    user_plex = self.plex
+                else:
+                    user_plex = self.login(
+                        self.plex._baseurl,
+                        user.get_token(self.plex.machineIdentifier),
+                    )
+
+                libraries = user_plex.library.sections()
+
+                for library in libraries:
+                    library_title = library.title
+                    library_type = library.type
+
+                    skip_reason = check_skip_logic(
+                        library_title,
+                        library_type,
+                        blacklist_library,
+                        whitelist_library,
+                        blacklist_library_type,
+                        whitelist_library_type,
+                        library_mapping,
+                    )
+
+                    if skip_reason:
+                        logger(
+                            f"Plex: Skipping library {library_title} {skip_reason}", 1
+                        )
+                        continue
+
+                    args.append([get_user_library_watched, user, user_plex, library])
+
+            for user_watched in future_thread_executor(args):
+                for user, user_watched_temp in user_watched.items():
+                    if user not in users_watched:
+                        users_watched[user] = {}
+                    users_watched[user].update(user_watched_temp)
+
+            return users_watched
+        except Exception as e:
+            logger(f"Plex: Failed to get watched, Error: {e}", 2)
+            raise Exception(e)
+
+    def update_watched(
+        self, watched_list, user_mapping=None, library_mapping=None, dryrun=False
+    ):
+        try:
+            args = []
+
+            for user, libraries in watched_list.items():
+                user_other = None
+                # If type of user is dict
+                if user_mapping:
+                    if user in user_mapping.keys():
+                        user_other = user_mapping[user]
+                    elif user in user_mapping.values():
+                        user_other = search_mapping(user_mapping, user)
+
+                for index, value in enumerate(self.users):
+                    if user.lower() == value.title.lower():
+                        user = self.users[index]
+                        break
+                    elif user_other and user_other.lower() == value.title.lower():
+                        user = self.users[index]
+                        break
+
+                if self.admin_user == user:
+                    user_plex = self.plex
+                else:
+                    if isinstance(user, str):
+                        logger(
+                            f"Plex: {user} is not a plex object, attempting to get object for user",
+                            4,
+                        )
+                        user = self.plex.myPlexAccount().user(user)
+
+                    user_plex = PlexServer(
+                        self.plex._baseurl,
+                        user.get_token(self.plex.machineIdentifier),
+                        session=self.session,
+                    )
+
+                for library, videos in libraries.items():
+                    library_other = None
+                    if library_mapping:
+                        if library in library_mapping.keys():
+                            library_other = library_mapping[library]
+                        elif library in library_mapping.values():
+                            library_other = search_mapping(library_mapping, library)
+
+                    # if library in plex library list
+                    library_list = user_plex.library.sections()
+                    if library.lower() not in [x.title.lower() for x in library_list]:
+                        if library_other:
+                            if library_other.lower() in [
+                                x.title.lower() for x in library_list
+                            ]:
+                                logger(
+                                    f"Plex: Library {library} not found, but {library_other} found, using {library_other}",
+                                    1,
+                                )
+                                library = library_other
+                            else:
+                                logger(
+                                    f"Plex: Library {library} or {library_other} not found in library list",
+                                    1,
+                                )
+                                continue
+                        else:
+                            logger(
+                                f"Plex: Library {library} not found in library list",
+                                1,
+                            )
+                            continue
+
+                    args.append(
+                        [
+                            update_user_watched,
+                            user,
+                            user_plex,
+                            library,
+                            videos,
+                            dryrun,
+                        ]
+                    )
+
+            future_thread_executor(args)
+        except Exception as e:
+            logger(f"Plex: Failed to update watched, Error: {e}", 2)
+            raise Exception(e)

test/requirements.txt

@@ -0,0 +1 @@
+pytest

test/test_main.py

@@ -0,0 +1,78 @@
+import sys
+import os
+
+# getting the name of the directory
+# where the this file is present.
+current = os.path.dirname(os.path.realpath(__file__))
+
+# Getting the parent directory name
+# where the current directory is present.
+parent = os.path.dirname(current)
+
+# adding the parent directory to
+# the sys.path.
+sys.path.append(parent)
+
+from src.main import setup_black_white_lists
+
+
+def test_setup_black_white_lists():
+    # Simple
+    blacklist_library = "library1, library2"
+    whitelist_library = "library1, library2"
+    blacklist_library_type = "library_type1, library_type2"
+    whitelist_library_type = "library_type1, library_type2"
+    blacklist_users = "user1, user2"
+    whitelist_users = "user1, user2"
+
+    (
+        results_blacklist_library,
+        return_whitelist_library,
+        return_blacklist_library_type,
+        return_whitelist_library_type,
+        return_blacklist_users,
+        return_whitelist_users,
+    ) = setup_black_white_lists(
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        blacklist_users,
+        whitelist_users,
+    )
+
+    assert results_blacklist_library == ["library1", "library2"]
+    assert return_whitelist_library == ["library1", "library2"]
+    assert return_blacklist_library_type == ["library_type1", "library_type2"]
+    assert return_whitelist_library_type == ["library_type1", "library_type2"]
+    assert return_blacklist_users == ["user1", "user2"]
+    assert return_whitelist_users == ["user1", "user2"]
+
+    # Library Mapping and user mapping
+    library_mapping = {"library1": "library3"}
+    user_mapping = {"user1": "user3"}
+
+    (
+        results_blacklist_library,
+        return_whitelist_library,
+        return_blacklist_library_type,
+        return_whitelist_library_type,
+        return_blacklist_users,
+        return_whitelist_users,
+    ) = setup_black_white_lists(
+        blacklist_library,
+        whitelist_library,
+        blacklist_library_type,
+        whitelist_library_type,
+        blacklist_users,
+        whitelist_users,
+        library_mapping,
+        user_mapping,
+    )
+
+    assert results_blacklist_library == ["library1", "library2", "library3"]
+    assert return_whitelist_library == ["library1", "library2", "library3"]
+    assert return_blacklist_library_type == ["library_type1", "library_type2"]
+    assert return_whitelist_library_type == ["library_type1", "library_type2"]
+    assert return_blacklist_users == ["user1", "user2", "user3"]
+    assert return_whitelist_users == ["user1", "user2", "user3"]

test/test_main_cleanup_watched.py

@@ -0,0 +1,301 @@
+import sys
+import os
+
+# getting the name of the directory
+# where the this file is present.
+current = os.path.dirname(os.path.realpath(__file__))
+
+# Getting the parent directory name
+# where the current directory is present.
+parent = os.path.dirname(current)
+
+# adding the parent directory to
+# the sys.path.
+sys.path.append(parent)
+
+from src.main import cleanup_watched
+
+tv_shows_watched_list_1 = {
+    frozenset(
+        {
+            ("tvdb", "75710"),
+            ("title", "Criminal Minds"),
+            ("imdb", "tt0452046"),
+            ("locations", ("Criminal Minds",)),
+            ("tmdb", "4057"),
+        }
+    ): {
+        "Season 1": [
+            {
+                "imdb": "tt0550489",
+                "tmdb": "282843",
+                "tvdb": "176357",
+                "locations": (
+                    "Criminal Minds S01E01 Extreme Aggressor WEBDL-720p.mkv",
+                ),
+            },
+            {
+                "imdb": "tt0550487",
+                "tmdb": "282861",
+                "tvdb": "300385",
+                "locations": ("Criminal Minds S01E02 Compulsion WEBDL-720p.mkv",),
+            },
+        ]
+    },
+    frozenset({("title", "Test"), ("locations", ("Test",))}): {
+        "Season 1": [
+            {"locations": ("Test S01E01.mkv",)},
+            {"locations": ("Test S01E02.mkv",)},
+        ]
+    },
+}
+
+movies_watched_list_1 = [
+    {
+        "imdb": "tt2380307",
+        "tmdb": "354912",
+        "title": "Coco",
+        "locations": ("Coco (2017) Remux-1080p.mkv",),
+    },
+    {
+        "tmdbcollection": "448150",
+        "imdb": "tt1431045",
+        "tmdb": "293660",
+        "title": "Deadpool",
+        "locations": ("Deadpool (2016) Remux-1080p.mkv",),
+    },
+]
+
+tv_shows_watched_list_2 = {
+    frozenset(
+        {
+            ("tvdb", "75710"),
+            ("title", "Criminal Minds"),
+            ("imdb", "tt0452046"),
+            ("locations", ("Criminal Minds",)),
+            ("tmdb", "4057"),
+        }
+    ): {
+        "Season 1": [
+            {
+                "imdb": "tt0550487",
+                "tmdb": "282861",
+                "tvdb": "300385",
+                "locations": ("Criminal Minds S01E02 Compulsion WEBDL-720p.mkv",),
+            },
+            {
+                "imdb": "tt0550498",
+                "tmdb": "282865",
+                "tvdb": "300474",
+                "locations": (
+                    "Criminal Minds S01E03 Won't Get Fooled Again WEBDL-720p.mkv",
+                ),
+            },
+        ]
+    },
+    frozenset({("title", "Test"), ("locations", ("Test",))}): {
+        "Season 1": [
+            {"locations": ("Test S01E02.mkv",)},
+            {"locations": ("Test S01E03.mkv",)},
+        ]
+    },
+}
+
+movies_watched_list_2 = [
+    {
+        "imdb": "tt2380307",
+        "tmdb": "354912",
+        "title": "Coco",
+        "locations": ("Coco (2017) Remux-1080p.mkv",),
+    },
+    {
+        "imdb": "tt0384793",
+        "tmdb": "9788",
+        "tvdb": "9103",
+        "title": "Accepted",
+        "locations": ("Accepted (2006) Remux-1080p.mkv",),
+    },
+]
+
+# Test to see if objects get deleted all the way up to the root.
+tv_shows_2_watched_list_1 = {
+    frozenset(
+        {
+            ("tvdb", "75710"),
+            ("title", "Criminal Minds"),
+            ("imdb", "tt0452046"),
+            ("locations", ("Criminal Minds",)),
+            ("tmdb", "4057"),
+        }
+    ): {
+        "Season 1": [
+            {
+                "imdb": "tt0550489",
+                "tmdb": "282843",
+                "tvdb": "176357",
+                "locations": (
+                    "Criminal Minds S01E01 Extreme Aggressor WEBDL-720p.mkv",
+                ),
+            },
+        ]
+    }
+}
+
+expected_tv_show_watched_list_1 = {
+    frozenset(
+        {
+            ("tvdb", "75710"),
+            ("title", "Criminal Minds"),
+            ("imdb", "tt0452046"),
+            ("locations", ("Criminal Minds",)),
+            ("tmdb", "4057"),
+        }
+    ): {
+        "Season 1": [
+            {
+                "imdb": "tt0550489",
+                "tmdb": "282843",
+                "tvdb": "176357",
+                "locations": (
+                    "Criminal Minds S01E01 Extreme Aggressor WEBDL-720p.mkv",
+                ),
+            }
+        ]
+    },
+    frozenset({("title", "Test"), ("locations", ("Test",))}): {
+        "Season 1": [{"locations": ("Test S01E01.mkv",)}]
+    },
+}
+
+expected_movie_watched_list_1 = [
+    {
+        "tmdbcollection": "448150",
+        "imdb": "tt1431045",
+        "tmdb": "293660",
+        "title": "Deadpool",
+        "locations": ("Deadpool (2016) Remux-1080p.mkv",),
+    }
+]
+
+expected_tv_show_watched_list_2 = {
+    frozenset(
+        {
+            ("tvdb", "75710"),
+            ("title", "Criminal Minds"),
+            ("imdb", "tt0452046"),
+            ("locations", ("Criminal Minds",)),
+            ("tmdb", "4057"),
+        }
+    ): {
+        "Season 1": [
+            {
+                "imdb": "tt0550498",
+                "tmdb": "282865",
+                "tvdb": "300474",
+                "locations": (
+                    "Criminal Minds S01E03 Won't Get Fooled Again WEBDL-720p.mkv",
+                ),
+            }
+        ]
+    },
+    frozenset({("title", "Test"), ("locations", ("Test",))}): {
+        "Season 1": [{"locations": ("Test S01E03.mkv",)}]
+    },
+}
+
+expected_movie_watched_list_2 = [
+    {
+        "imdb": "tt0384793",
+        "tmdb": "9788",
+        "tvdb": "9103",
+        "title": "Accepted",
+        "locations": ("Accepted (2006) Remux-1080p.mkv",),
+    }
+]
+
+
+def test_simple_cleanup_watched():
+    user_watched_list_1 = {
+        "user1": {
+            "TV Shows": tv_shows_watched_list_1,
+            "Movies": movies_watched_list_1,
+            "Other Shows": tv_shows_2_watched_list_1,
+        },
+    }
+    user_watched_list_2 = {
+        "user1": {
+            "TV Shows": tv_shows_watched_list_2,
+            "Movies": movies_watched_list_2,
+            "Other Shows": tv_shows_2_watched_list_1,
+        }
+    }
+
+    expected_watched_list_1 = {
+        "user1": {
+            "TV Shows": expected_tv_show_watched_list_1,
+            "Movies": expected_movie_watched_list_1,
+        }
+    }
+
+    expected_watched_list_2 = {
+        "user1": {
+            "TV Shows": expected_tv_show_watched_list_2,
+            "Movies": expected_movie_watched_list_2,
+        }
+    }
+
+    return_watched_list_1 = cleanup_watched(user_watched_list_1, user_watched_list_2)
+    return_watched_list_2 = cleanup_watched(user_watched_list_2, user_watched_list_1)
+
+    assert return_watched_list_1 == expected_watched_list_1
+    assert return_watched_list_2 == expected_watched_list_2
+
+
+def test_mapping_cleanup_watched():
+    user_watched_list_1 = {
+        "user1": {
+            "TV Shows": tv_shows_watched_list_1,
+            "Movies": movies_watched_list_1,
+            "Other Shows": tv_shows_2_watched_list_1,
+        },
+    }
+    user_watched_list_2 = {
+        "user2": {
+            "Shows": tv_shows_watched_list_2,
+            "Movies": movies_watched_list_2,
+            "Other Shows": tv_shows_2_watched_list_1,
+        }
+    }
+
+    expected_watched_list_1 = {
+        "user1": {
+            "TV Shows": expected_tv_show_watched_list_1,
+            "Movies": expected_movie_watched_list_1,
+        }
+    }
+
+    expected_watched_list_2 = {
+        "user2": {
+            "Shows": expected_tv_show_watched_list_2,
+            "Movies": expected_movie_watched_list_2,
+        }
+    }
+
+    user_mapping = {"user1": "user2"}
+    library_mapping = {"TV Shows": "Shows"}
+
+    return_watched_list_1 = cleanup_watched(
+        user_watched_list_1,
+        user_watched_list_2,
+        user_mapping=user_mapping,
+        library_mapping=library_mapping,
+    )
+    return_watched_list_2 = cleanup_watched(
+        user_watched_list_2,
+        user_watched_list_1,
+        user_mapping=user_mapping,
+        library_mapping=library_mapping,
+    )
+
+    assert return_watched_list_1 == expected_watched_list_1
+    assert return_watched_list_2 == expected_watched_list_2