From 89a556cd004cc4e9dccccbbad5afa08a2a153b87 Mon Sep 17 00:00:00 2001
From: GilbN <24592972+GilbN@users.noreply.github.com>
Date: Sat, 20 Jan 2024 12:15:57 +0100
Subject: [PATCH] 1.15.1 (#534)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* qbittorrent: 💄Fixes for #526

* Unraid: Fix login script github.io URL
Unraid: Fix the navbar scroll overflow.

* Move from subversion to git for pulling the qbittorrent webui (#530)

* Move from subversion to git for pulling the qbittorrent webui

* slight verbage changes

---------

Co-authored-by: Blake <7227893+nintendo424@users.noreply.github.com>
---
 css/addons/unraid/login-page/custom_login.sh  |  2 +-
 css/base/qbittorrent/qbittorrent-base.css     |  6 +++++
 css/base/unraid/unraid-base.css               |  1 +
 docker-mods/qbittorrent/Dockerfile            |  2 +-
 .../root/etc/cont-init.d/98-themepark         | 22 +++++++++----------
 .../init-mod-themepark-add-package/run        |  4 ++--
 .../s6-overlay/s6-rc.d/init-mod-themepark/run | 14 ++++++------
 7 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/css/addons/unraid/login-page/custom_login.sh b/css/addons/unraid/login-page/custom_login.sh
index 558521b19d..c8eda6c301 100644
--- a/css/addons/unraid/login-page/custom_login.sh
+++ b/css/addons/unraid/login-page/custom_login.sh
@@ -55,7 +55,7 @@ fi
 case ${DOMAIN} in
   *"github.io"*)
   echo "Switching to github.io URL style"
-    DOMAIN="${DOMAIN}\/theme.park"
+    DOMAIN="${DOMAIN}/theme.park"
     ;;
 esac
 
diff --git a/css/base/qbittorrent/qbittorrent-base.css b/css/base/qbittorrent/qbittorrent-base.css
index 820b898289..77a45b3aba 100644
--- a/css/base/qbittorrent/qbittorrent-base.css
+++ b/css/base/qbittorrent/qbittorrent-base.css
@@ -489,6 +489,7 @@ hr {
 
 .toolbarTabs {
   background: var(--transparency-dark-25) !important;
+  margin: 0px 5px 0 0 !important;
 }
 
 .progressbar_dark {
@@ -662,4 +663,9 @@ select:focus {
 .select-watched-folder-editable {
   background-color: var(--transparency-dark-05);
   border: solid var(--transparency-light-10) 1px;
+}
+
+#torrentsFilterToolbar {
+  float: right;
+  margin-right: .5rem;
 }
\ No newline at end of file
diff --git a/css/base/unraid/unraid-base.css b/css/base/unraid/unraid-base.css
index 066607f4fd..86244a760c 100644
--- a/css/base/unraid/unraid-base.css
+++ b/css/base/unraid/unraid-base.css
@@ -102,6 +102,7 @@ pre {
 
 .nav-tile {
     background-color: var(--transparency-dark-50);
+    overflow-x: auto;
 }
 
 div.title {
diff --git a/docker-mods/qbittorrent/Dockerfile b/docker-mods/qbittorrent/Dockerfile
index 4c3ca04c53..d12803c243 100644
--- a/docker-mods/qbittorrent/Dockerfile
+++ b/docker-mods/qbittorrent/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 
-
 LABEL maintainer="GilbN" 
 LABEL app="Qbittorrent"
+
 #copy local files.
 COPY root/ /
\ No newline at end of file
diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
index b02e895ef8..783c94fb53 100755
--- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
@@ -23,17 +23,17 @@ if [ "${TP_DISABLE_THEME}" = true ]; then
   exit 0
 fi
 
-if ! [[ -x "$(command -v svn)" ]]; then
+if ! [[ -x "$(command -v git)" ]]; then
 echo '--------------------------'
-echo '| Installing svn package |'
+echo '| Installing git package |'
 echo '--------------------------'
     if [ -x "$(command -v apk)" ]; then 
       apk update && \
-      apk add --no-cache subversion
+      apk add --no-cache git
       apk add --no-cache perl
     elif [ -x "$(command -v apt-get)" ]; then
       apt-get update && \
-      apt-get install -y subversion
+      apt-get install -y git
       apt-get install -y perl
     fi
 fi
@@ -80,15 +80,15 @@ if [[ ! -d /themepark ]]; then
     echo '---------------------------------------'
     echo '| Downloading WebUI files from github |'
     echo '---------------------------------------'
-    printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
-    svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
+    printf '\nDownloading qBittorrent to /temp\n'
+    git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
     printf '\nDownload finished\n\n'
-    printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
-    svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
-    cp -a /temp/. /themepark/public/icons
-    cp -a /temp/. /themepark/private/icons
+    cp -a /temp/src/webui/www /themepark
+    cp -a /temp/src/icons/. /themepark/public/icons
+    cp -a /temp/src/icons/. /themepark/private/icons
+    printf '\nCopy finished\n\n'
     rm -rf /temp
-    printf '\nDownload finished\n\n'
+    printf '\nCleanup finished\n\n'
 fi
 
 sed_file(){
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
index 441dcab99c..605a4f2358 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash 
 
-if ! [[ -x "$(command -v svn)" ]]; then
-    echo "subversion" >> /mod-repo-packages-to-install.list
+if ! [[ -x "$(command -v git)" ]]; then
+    echo "git" >> /mod-repo-packages-to-install.list
     echo "perl" >> /mod-repo-packages-to-install.list
 fi
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
index 6935bc690a..634b19abe8 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
@@ -65,15 +65,15 @@ if [[ ! -d /themepark ]]; then
     echo '---------------------------------------'
     echo '| Downloading WebUI files from github |'
     echo '---------------------------------------'
-    printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
-    svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
+    printf '\nDownloading qBittorrent to /temp\n'
+    git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
     printf '\nDownload finished\n\n'
-    printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
-    svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
-    cp -a /temp/. /themepark/public/icons
-    cp -a /temp/. /themepark/private/icons
+    cp -a /temp/src/webui/www /themepark
+    cp -a /temp/src/icons/. /themepark/public/icons
+    cp -a /temp/src/icons/. /themepark/private/icons
+    printf '\nCopy finished\n\n'
     rm -rf /temp
-    printf '\nDownload finished\n\n'
+    printf '\nCleanup finished\n\n'
 fi
 
 sed_file(){