Merge pull request #18 from luigi311/dev

Dev

.env.sample

@@ -2,8 +2,8 @@
 DRYRUN = "True"
 ## Additional logging information
 DEBUG = "True"
-## Debugging level, INFO is default, DEBUG is more verbose
-DEBUG_LEVEL = "INFO"
+## 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
@@ -16,6 +16,7 @@ LOGFILE = "log.log"
 
 ## Recommended to use token as it is faster to connect as it is direct to the server instead of going through the plex servers
 ## URL of the plex server, use hostname or IP address if the hostname is not resolving correctly
+## Comma seperated list for multiple servers
 PLEX_BASEURL = "http://localhost:32400"
 ## Plex token https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/
 PLEX_TOKEN = "SuperSecretToken"
@@ -26,6 +27,7 @@ PLEX_TOKEN = "SuperSecretToken"
 
 
 ## Jellyfin server URL, use hostname or IP address if the hostname is not resolving correctly
+## Comma seperated list for multiple servers
 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"

.github/workflows/ci.yml

@@ -10,8 +10,20 @@ on:
       - "*.md"
 
 jobs:
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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@v2

.gitignore

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

.vscode/launch.json

@@ -1,16 +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",
-            "type": "python",
-            "request": "launch",
-            "program": "main.py",
-            "console": "integratedTerminal",
-            "justMyCode": true
-        }
-    ]
-}
+  // 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
+    }
+  ]
+}

Dockerfile

@@ -1,10 +1,35 @@
 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 '{ "User Test": "User Test2" }'
+ENV LIBRARY_MAPPING '{ "Shows Test": "TV Shows Test" }'
+
+ENV PLEX_BASEURL 'http://localhost:32400'
+ENV PLEX_TOKEN ''
+ENV PLEX_USERNAME ''
+ENV PLEX_PASSWORD ''
+ENV PLEX_SERVERNAME ''
+
+ENV JELLYFIN_BASEURL 'http://localhost:8096'
+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
 
 COPY ./requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
-CMD ["python", "-u", "main.py"]
+CMD ["python", "-u", "main.py"]

README.md

@@ -6,7 +6,11 @@ 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.
+Keep in sync all your users watched history between jellyfin and plex servers 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. You can use this for as many servers as you want by enterying multiple options in the .env plex/jellyfin section seperated by commas.
+
+## Configuration
+
+
 
 ## Installation