Merge pull request #449 from GilbN/develop

1.13.1
themepark-dev · Oct 23, 2022 · cb9dff4 · cb9dff4
2 parents e2c3a32 + edfdce0
commit cb9dff4
Show file tree

Hide file tree

Showing 17 changed files with 511 additions and 442 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -14,7 +14,7 @@ on:
         - develop
         - testing
       tag:
-        description: 'Add a tag'
+        description: 'Append a the tag with "-custom" e.g :develop-custom'
   push:
     branches:
       - develop
@@ -29,68 +29,68 @@ jobs:
         architecture: [linux-arm-v7,linux-arm64,linux-amd64]
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
       - name: Prepare
         id: prep
         run: |
-          ARCHITECTURE=${{ matrix.architecture }}
-          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}
-          echo ::set-output name=revision::${GITHUB_SHA}
-          echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}
-          echo ::set-output name=vendor::${{ github.repository_owner }}
-          echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md
-          echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
-          echo ::set-output name=platform::${ARCHITECTURE//-/\/}
-          echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}
-          echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}
-          echo ::set-output name=release::${{ github.event.release.target_commitish }}
+          echo "ARCHITECTURE=${{ matrix.architecture }}" >> $GITHUB_ENV
+          echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+          echo "title=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "revision=${GITHUB_SHA}" >> $GITHUB_ENV
+          echo "source=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "vendor=${{ github.repository_owner }}" >> $GITHUB_ENV
+          echo "url=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md" >> $GITHUB_ENV
+          echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          echo "platform=${ARCHITECTURE//-/\/}" >> $GITHUB_ENV
+          echo "cache=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}${{ github.event.inputs.tag }}" >> $GITHUB_ENV
+          echo "tag=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}${{ github.event.inputs.tag }}" >> $GITHUB_ENV
+          echo "release=${{ github.event.release.target_commitish }}" >> $GITHUB_ENV
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_PAT }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DH_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: build&push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3.2.0
         with:
           push: ${{ github.event_name != 'pull_request' }}
-          platforms: ${{ steps.prep.outputs.platform }}
+          platforms: ${{ env.platform }}
           file: ./${{ matrix.architecture }}.Dockerfile
-          cache-from: docker.io/${{ steps.prep.outputs.cache }}
-          cache-to: docker.io/${{ steps.prep.outputs.cache }}
+          cache-from: docker.io/${{ env.cache }}
+          cache-to: docker.io/${{ env.cache }}
           tags: |
-            docker.io/${{ steps.prep.outputs.tag }}
-            ghcr.io/${{ steps.prep.outputs.tag }}
+            docker.io/${{ env.tag }}
+            ghcr.io/${{ env.tag }}
           labels: |
-            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
-            org.opencontainers.image.title=${{ steps.prep.outputs.title }}
-            org.opencontainers.image.revision=${{ steps.prep.outputs.revision }}
-            org.opencontainers.image.source=${{ steps.prep.outputs.source }}
-            org.opencontainers.image.vendor=${{ steps.prep.outputs.vendor }}
-            org.opencontainers.image.url=${{ steps.prep.outputs.url }}
-            org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
+            org.opencontainers.image.created=${{ env.created }}
+            org.opencontainers.image.title=${{ env.title }}
+            org.opencontainers.image.revision=${{ env.revision }}
+            org.opencontainers.image.source=${{ env.source }}
+            org.opencontainers.image.vendor=${{ env.vendor }}
+            org.opencontainers.image.url=${{ env.url }}
+            org.opencontainers.image.version=${{ env.VERSION }}
           build-args: |
-            TP_RELEASE=${{ steps.prep.outputs.VERSION }}
-            BUILD_DATE=${{ steps.date_time.outputs.created }}
-            BUILD_ARCHITECTURE=${{ matrix.architecture }}
+            TP_RELEASE=${{ env.VERSION }}
+            BUILD_DATE=${{ env.created }}
+            BUILD_ARCHITECTURE=${{ env.ARCHITECTURE }}
 
   publish:
     runs-on: ubuntu-latest
@@ -100,19 +100,19 @@ jobs:
     needs: [build-and-push-it-to-the-limit]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.1.0
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2.1.0
         with:
           registry: docker.io
           username: ${{ secrets.DH_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: matrix.registry == 'ghcr.io'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -123,16 +123,16 @@ jobs:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${{ github.ref_name }}
-          SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
-          VERSION=${{ steps.prep.outputs.VERSION }}
-          [[ -f linux-amd64.Dockerfile ]]  && AMD64=${SOURCE}-linux-amd64
-          [[ -f linux-arm64.Dockerfile ]]  && ARM64=${SOURCE}-linux-arm64
-          [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7
+          TAG=${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
+          SOURCE=${IMAGE}:${TAG}
+          [[ -f linux-amd64.Dockerfile ]]  && AMD64=${SOURCE}-linux-amd64${{ github.event.inputs.tag }}
+          [[ -f linux-arm64.Dockerfile ]]  && ARM64=${SOURCE}-linux-arm64${{ github.event.inputs.tag }}
+          [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7${{ github.event.inputs.tag }}
+          docker manifest create ${IMAGE}:${TAG}${{ github.event.inputs.tag }} ${AMD64} ${ARM64} ${ARMV7}
+          docker manifest push ${IMAGE}:${TAG}${{ github.event.inputs.tag }}
+          TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
           docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7}
           docker manifest push ${IMAGE}:${TAG}
-          docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}
       - name: Latest manifest
         if: ${{ github.event.release.target_commitish == 'master' }}
         env:

diff --git a/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css b/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css
@@ -1,8 +1,8 @@
-    .mantine-Avatar-root[class*="bazarr-"] img {
+    .bazarr-Avatar-root[class*="bazarr-"] img {
         display: none !important;
     }
 
-    .mantine-Avatar-root[class*="bazarr-"]:before {
+    .bazarr-Avatar-root[class*="bazarr-"]:before {
         background-image: url("/css/addons/bazarr/bazarr-4k-logo/bazarr4k.png");
         display: inline-block;
         width: 32px;
@@ -14,6 +14,6 @@
         -o-background-size: cover;
     }
 
-    #root>div>nav>div>div.mantine-Group-root.mantine-Group-child[class*="bazarr-"]>div>span:after {
+    #root>div>header>div>div.bazarr-Group-root[class*="bazarr-"]>div>span:after {
         content: " 4K";
     }
diff --git a/css/addons/bazarr/bazarr-darker/bazarr-darker.css b/css/addons/bazarr/bazarr-darker/bazarr-darker.css
@@ -37,19 +37,19 @@
 }
 
 /* HEADER */
-.mantine-Header-root[class*="bazarr-"] {
+.bazarr-Header-root[class*="bazarr-"] {
     background-color: var(--header-color) !important;
     border-bottom: 1px solid var(--transparency-light-15);
 }
 
 /* SIDE MENU */
-.mantine-Navbar-root[class*="bazarr-"] {
+.bazarr-Navbar-root[class*="bazarr-"] {
     background-color: var(--side-menu-color) !important;
     color: white !important;
 }
 
-#root>div>div>main>div>div.mantine-Group-root[class*="bazarr-"],
-#root>div>div>main>div>div>div.mantine-Group-root[class*="bazarr-"],
-#root>div>div>main>form>div.mantine-Group-root[class*="bazarr-"] {
+#root>div>div>main>div>div.bazarr-Group-root[class*="bazarr-"],
+#root>div>div>main>div>div>div.bazarr-Group-root[class*="bazarr-"],
+#root>div>div>main>form>div.bazarr-Group-root[class*="bazarr-"] {
     background: #262626 !important;
 }
diff --git a/css/addons/lidarr/lidarr-alt-calendar/lidarr-alt-calendar.css b/css/addons/lidarr/lidarr-alt-calendar/lidarr-alt-calendar.css
@@ -0,0 +1,19 @@
+[class*="CalendarEvent-downloaded-"] {
+    background: rgb(var(--calendar-downloaded) / .4) !important;
+}
+
+[class*="CalendarEvent-downloading-"] {
+    background: rgb(var(--calendar-downloading) / .4) !important; 
+}
+
+[class*="CalendarEvent-unmonitored-"] {
+    background: rgb(var(--calendar-unmonitored) / .4) !important;
+}
+
+[class*="CalendarEvent-missing-"] {
+    background: rgb(var(--calendar-missing) / .4) !important;
+}
+
+[class*="CalendarEvent-unreleased-"] {
+    background: rgb(var(--calendar-unreleased) / .4) !important;
+}
diff --git a/css/addons/radarr/radarr-alt-calendar/radarr-alt-calendar.css b/css/addons/radarr/radarr-alt-calendar/radarr-alt-calendar.css
@@ -0,0 +1,31 @@
+
+[class*="CalendarEvent-event-"] {
+    background: rgb(var(--calendar-unmonitored) / .4);
+}
+
+[class*="CalendarEvent-downloaded-"] {
+    background: rgb(var(--calendar-available) / .4) !important;
+}
+
+[class*="CalendarEvent-missing-"],
+[class*="CalendarEvent-missingMonitored"] {
+    background-color: rgb(var(--calendar-missing) / .4);
+}
+
+[class*="CalendarEvent-missingUnmonitored-"] {
+    background: rgb(var(--calendar-missing-unmonitored) / .4) !important;
+}
+
+[class*="CalendarEvent-unreleased-"],
+[class*="CalendarEvent-continuing-"] {
+    background: rgb(var(--calendar-unaired) / .4) !important;
+}
+
+[class*="CalendarEvent-unmonitored-"] {
+    background: rgb(var(--calendar-unmonitored) / .4) !important;
+}
+
+[class*="CalendarEvent-downloading-"],
+[class*="CalendarEvent-queue-"] {
+    background: rgb(var(--calendar-downloading) / .4) !important;
+}
diff --git a/css/addons/readarr/readarr-alt-calendar/readarr-alt-calendar.css b/css/addons/readarr/readarr-alt-calendar/readarr-alt-calendar.css
@@ -0,0 +1,20 @@
+[class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-downloaded) / .4) !important;
+}
+
+[class*="CalendarEvent-missing-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-missing) / .4) !important;
+}
+
+[class*="CalendarEvent-unreleased-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-unreleased) / .4) !important;
+}
+
+[class*="CalendarEvent-unmonitored-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-unmonitored) / .4) !important;
+}
+
+[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]),
+[class*="CalendarEvent-queue-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-downloading) / .4) !important;
+}
diff --git a/css/addons/unraid/login-page/custom_login.sh b/css/addons/unraid/login-page/custom_login.sh
@@ -16,6 +16,8 @@ DISABLE_THEME="false"
 
   # If your custom domain uses a subfolder you must escape the forward slash. (custom.com\/subfolder)
 
+  # If you are on an Unraid version older than 6.10 you need to update the LOGIN_PAGE variable to "/usr/local/emhttp/login.php"
+
 echo -e "Variables set:\\n\
 TYPE          = ${TYPE}\\n\
 THEME         = ${THEME}\\n\
@@ -25,16 +27,15 @@ ADD_JS        = ${ADD_JS}\\n\
 JS            = ${JS}\\n\
 DISABLE_THEME = ${DISABLE_THEME}\\n"
 
+echo "NOTE: Change the LOGIN_PAGE variable to /usr/local/emhttp/login.php if you are on a version older than 6.10"
+LOGIN_PAGE="/usr/local/emhttp/webGui/include/.login.php"
+
+
 IFS='"'
 set $(cat /etc/unraid-version)
 UNRAID_VERSION="$2"
 IFS=$' \t\n'
-LOGIN_PAGE="/usr/local/emhttp/login.php"
-# Changing file path to login.php if version >= 6.10
-if [[ "${UNRAID_VERSION}" =~ ^6.10.* ]]; then
-echo "Unraid version: ${UNRAID_VERSION}, changing path to login page"
-LOGIN_PAGE="/usr/local/emhttp/webGui/include/.login.php"
-fi
+echo "Unraid version: ${UNRAID_VERSION}"
 
 # Restore login.php
 if [ ${DISABLE_THEME} = "true" ]; then

diff --git a/css/addons/whisparr/whisparr-alt-calendar/whisparr-alt-calendar.css b/css/addons/whisparr/whisparr-alt-calendar/whisparr-alt-calendar.css
@@ -0,0 +1,58 @@
+:root {
+    --calendar-in-cinemas: 53 197 244;
+    --calendar-downloading: 122 67 182;
+    --calendar-unmonitored: 173 173 173;
+    --calendar-unaired: 93 156 236;
+    --calendar-missing: 240 80 80;
+    --calendar-missing-unmonitored: 255 165 0;
+    --calendar-available: 39 194 76;
+}
+
+/* CALENDAR */
+[class*="CalendarEvent-downloaded-"] {
+    background: rgb(var(--calendar-available) / .4) !important;
+
+}
+
+[class*="CalendarEvent-missing-"],
+[class*="CalendarEvent-missingMonitored"] {
+    background-color: rgb(var(--calendar-missing) / .4);
+
+}
+
+[class*="CalendarEvent-missingUnmonitored-"] {
+    background: rgb(var(--calendar-missing-unmonitored) / .4) !important;
+
+}
+
+[class*="CalendarEvent-unreleased-"],
+[class*="CalendarEvent-continuing-"] {
+    background: rgb(var(--calendar-unaired) / .4) !important;
+
+}
+
+[class*="CalendarEvent-event-"] {
+    background: rgb(var(--calendar-unmonitored) / .4);
+}
+
+[class*="CalendarEvent-unmonitored-"] {
+    background: rgb(var(--calendar-unmonitored) / .4) !important;
+
+}
+
+[class*="CalendarEvent-downloading-"],
+[class*="CalendarEvent-queue-"] {
+    background: rgb(var(--calendar-downloading) / .4) !important;
+
+}
+
+/* Color Impaired Mode */
+
+[class*="CalendarEvent-missing-"].colorImpaired,
+[class*="CalendarEvent-missingMonitored-"].colorImpaired {
+    background: repeating-linear-gradient(90deg, rgb(var(--calendar-missing) / .2), rgb(var(--calendar-missing) / .2) 5px, rgb(var(--calendar-missing) / .4) 5px, rgb(var(--calendar-missing) / .4) 10px) !important;
+}
+
+[class*="CalendarEvent-missingUnmonitored-"].colorImpaired {
+    background: repeating-linear-gradient(90deg, rgb(var(--calendar-missing-unmonitored) / .2), rgb(var(--calendar-missing-unmonitored) / .2) 5px, rgb(var(--calendar-missing-unmonitored) / .4) 5px, rgb(var(--calendar-missing-unmonitored) / .4) 10px) !important;
+}