Merge branch 'master' of https://github.com/MDHMatt/Biggetje

.github/actions/docker-multi-login-action/action.yml

@@ -9,15 +9,15 @@ runs:
         if docker login --username ${{ fromJSON(env.secrets).DOCKERHUB_USERNAME }} --password ${{ fromJSON(env.secrets).DOCKERHUB_PASSWORD }} > /dev/null 2>&1; then
           echo "🎉 Login Succeeded!"
         fi
-    - shell: bash
-      run: |
-        echo "🔑 Logging into quay.io..."
-        if docker login quay.io --username ${{ fromJSON(env.secrets).QUAY_USERNAME }} --password ${{ fromJSON(env.secrets).QUAY_PASSWORD }} > /dev/null 2>&1; then
-          echo "🎉 Login Succeeded!"
-        fi
-    - shell: bash
-      run: |
-        echo "🔑 Logging into ghcr.io..."
-        if docker login ghcr.io --username ${{ fromJSON(env.secrets).GHCR_USERNAME }} --password ${{ fromJSON(env.secrets).GHCR_PASSWORD }} > /dev/null 2>&1; then
-          echo "🎉 Login Succeeded!"
-        fi
+  #  - shell: bash
+  #    run: |
+  #      echo "🔑 Logging into ghcr.io..."
+  #      if docker login ghcr.io --username ${{ fromJSON(env.secrets).GHCR_USERNAME }} --password ${{ fromJSON(env.secrets).GHCR_PASSWORD }} > /dev/null 2>&1; then
+  #        echo "🎉 Login Succeeded!"
+  #      fi
+#    - shell: bash
+#      run: |
+#        echo "🔑 Logging into quay.io..."
+#        if docker login quay.io --username ${{ fromJSON(env.secrets).QUAY_USERNAME }} --password ${{ fromJSON(env.secrets).QUAY_PASSWORD }} > /dev/null 2>&1; then
+#          echo "🎉 Login Succeeded!"
+#        fi

.github/actions/docker-target-image-list-action/action.yml

@@ -4,7 +4,8 @@ inputs:
   registries:
     description: "Comma separated list of docker registries"
     required: false
-    default: "docker.io,quay.io,ghcr.io"
+#    default: "docker.io,quay.io,ghcr.io"
+    default: "docker.io"
   images:
     description: "Comma separated list of images"
     required: true

.github/workflows/docker.yaml

@@ -1,7 +1,7 @@
-name: varken
+name: Build Biggetje
 on:
-  schedule:
-    - cron: '0 10 * * *'
+#  schedule:
+#    - cron: '0 10 * * *'
   push:
     branches:
       - master
@@ -31,7 +31,7 @@ on:
         description: 'Ignore existing tag if "true"'
         required: false
 env:
-  IMAGES: boerderij/varken
+  IMAGES: mdhmatt/biggetje
   PLATFORMS: "linux/amd64,linux/arm64,linux/arm/v7"
 jobs:
   lint-and-test:

.gitignore

@@ -13,3 +13,4 @@ varken-venv/
 venv/
 logs/
 __pycache__
+.env

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.analysis.typeCheckingMode": "basic"
+}

Dockerfile

@@ -6,15 +6,15 @@ ENV DEBUG="True" \
     BRANCH="edge" \
     BUILD_DATE="1/1/1970"
 
-LABEL maintainer="dirtycajunrice,samwiseg0" \
+LABEL maintainer="MDHMatt" \
   org.opencontainers.image.created=$BUILD_DATE \
-  org.opencontainers.image.url="https://github.com/Boerderij/Varken" \
-  org.opencontainers.image.source="https://github.com/Boerderij/Varken" \
+  org.opencontainers.image.url="https://github.com/MDHMatt/Biggetje" \
+  org.opencontainers.image.source="https://github.com/MDHMatt/Biggetje" \
   org.opencontainers.image.version=$VERSION \
   org.opencontainers.image.revision=$VCS_REF \
-  org.opencontainers.image.vendor="boerderij" \
-  org.opencontainers.image.title="varken" \
-  org.opencontainers.image.description="Varken is a standalone application to aggregate data from the Plex ecosystem into InfluxDB using Grafana for a frontend" \
+  org.opencontainers.image.vendor="MDHMatt" \
+  org.opencontainers.image.title="Biggetje" \
+  org.opencontainers.image.description="Biggetje (Piglet) child of Varken (Pig), is a standalone application to aggregate data from the Plex and the *arrs into InfluxDB using Grafana for a frontend" \
   org.opencontainers.image.licenses="MIT"
 
 WORKDIR /app

requirements.txt

@@ -2,10 +2,10 @@
 # Potential requirements.
 # pip3 install -r requirements.txt
 #---------------------------------------------------------
-requests==2.28.1
+requests==2.32.2
 geoip2==2.9.0
 influxdb==5.2.0
 influxdb-client==1.30.0
 schedule==1.1.0
 distro==1.4.0
-urllib3==1.26.10
+urllib3==1.26.19

varken/structures.py

@@ -186,6 +186,7 @@ class OmbiMovieRequest(NamedTuple):
     markedAsDenied: str = None
     markedAsDenied4K: str = None
     overview: str = None
+    playedByUsersCount: int = None
     posterPath: str = None
     qualityOverride: int = None
     released: bool = None
@@ -204,6 +205,7 @@ class OmbiMovieRequest(NamedTuple):
     subscribed: bool = None
     theMovieDbId: int = None
     title: str = None
+    watchedByRequestedUser: str = None
 
 
 # Overseerr