Fix favicon for the radarr and readarr

Author: GilbN

docker-mods/radarr/root/etc/cont-init.d/98-themepark

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default
@@ -49,6 +50,18 @@ if [[ -z ${TP_THEME} ]]; then
     TP_THEME='organizr'
 fi
 
+# Function to download files for a given addon
+download_favicon_files() {
+    local addon=$1
+    local urls=$(curl -s "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]?")
+    for url in $urls; do
+        # Remove the query parameters from the URL
+        clean_url="${url%%\?*}"
+        wget -O "${APP_ICON_FILEPATH}/$(basename "${clean_url}")" "${clean_url}"
+        printf 'Downloaded favicon: %s\n' "${clean_url}"
+    done
+}
+
 # Adding stylesheets
 if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     echo '---------------------------'
@@ -63,16 +76,11 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     if [[ -n ${TP_ADDON} ]]; then
         for addon in $(echo "$TP_ADDON" | tr "|" " "); do
         sheets="${sheets} <link rel='stylesheet' href='${url_base}/css/addons/radarr/${addon}/${addon}.css'>"
-
-        #if TP_ADDON is one that changes the logo, add the corresponding favicon
-        #find favicon folder name based on addon name
-        favicon_dir="${url_base}/css/addons/radarr/favicon/$(echo "${addon}" | sed 's/-logo//g; s/-text//g')"
-        #if favicon folder exists, copy content to the app favicon folder
-        if [ -d "$favicon_dir" ]; then
-            cp "${favicon_dir}/." "${APP_ICON_FILEPATH}"
-            echo "Added favicon."
+        # If the addon variable has "favicon" in it, download all the favicon files from the themes.json file.
+        if [[ ${addon} == *"favicon"* ]]; then
+            echo 'Downloading favicon files...'
+            download_favicon_files "$addon"
         fi
-
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi

docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default
@@ -49,6 +50,18 @@ if [[ -z ${TP_THEME} ]]; then
     TP_THEME='organizr'
 fi
 
+# Function to download files for a given addon
+download_favicon_files() {
+    local addon=$1
+    local urls=$(curl -s "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]?")
+    for url in $urls; do
+        # Remove the query parameters from the URL
+        clean_url="${url%%\?*}"
+        wget -O "${APP_ICON_FILEPATH}/$(basename "${clean_url}")" "${clean_url}"
+        printf 'Downloaded favicon: %s\n' "${clean_url}"
+    done
+}
+
 # Adding stylesheets
 if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     echo '---------------------------'
@@ -63,16 +76,11 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     if [[ -n ${TP_ADDON} ]]; then
         for addon in $(echo "$TP_ADDON" | tr "|" " "); do
         sheets="${sheets} <link rel='stylesheet' href='${url_base}/css/addons/radarr/${addon}/${addon}.css'>"
-
-        #if TP_ADDON is one that changes the logo, add the corresponding favicon
-        #find favicon folder name based on addon name
-        favicon_dir="${url_base}/css/addons/radarr/favicon/$(echo "${addon}" | sed 's/-logo//g; s/-text//g')"
-        #if favicon folder exists, copy content to the app favicon folder
-        if [ -d "$favicon_dir" ]; then
-            cp "${favicon_dir}/." "${APP_ICON_FILEPATH}"
-            echo "Added favicon."
+        # If the addon variable has "favicon" in it, download all the favicon files from the themes.json file.
+        if [[ ${addon} == *"favicon"* ]]; then
+            echo 'Downloading favicon files...'
+            download_favicon_files "$addon"
         fi
-
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi

docker-mods/readarr/root/etc/cont-init.d/98-themepark

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default
@@ -49,6 +50,18 @@ if [[ -z ${TP_THEME} ]]; then
     TP_THEME='organizr'
 fi
 
+# Function to download files for a given addon
+download_favicon_files() {
+    local addon=$1
+    local urls=$(curl -s "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]?")
+    for url in $urls; do
+        # Remove the query parameters from the URL
+        clean_url="${url%%\?*}"
+        wget -O "${APP_ICON_FILEPATH}/$(basename "${clean_url}")" "${clean_url}"
+        printf 'Downloaded favicon: %s\n' "${clean_url}"
+    done
+}
+
 # Adding stylesheets
 if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     echo '---------------------------'
@@ -63,16 +76,11 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     if [[ -n ${TP_ADDON} ]]; then
         for addon in $(echo "$TP_ADDON" | tr "|" " "); do
         sheets="${sheets} <link rel='stylesheet' href='${url_base}/css/addons/readarr/${addon}/${addon}.css'>"
-
-        #if TP_ADDON is one that changes the logo, add the corresponding favicon
-        #find favicon folder name based on addon name
-        favicon_dir="${url_base}/css/addons/readarr/favicon/$(echo "${addon}" | sed 's/-logo//g; s/-text//g')"
-        #if favicon folder exists, copy content to the app favicon folder
-        if [ -d "$favicon_dir" ]; then
-            cp "${favicon_dir}/." "${APP_ICON_FILEPATH}"
-            echo "Added favicon."
+        # If the addon variable has "favicon" in it, download all the favicon files from the themes.json file.
+        if [[ ${addon} == *"favicon"* ]]; then
+            echo 'Downloading favicon files...'
+            download_favicon_files "$addon"
         fi
-
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi

docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default
@@ -49,6 +50,18 @@ if [[ -z ${TP_THEME} ]]; then
     TP_THEME='organizr'
 fi
 
+# Function to download files for a given addon
+download_favicon_files() {
+    local addon=$1
+    local urls=$(curl -s "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]?")
+    for url in $urls; do
+        # Remove the query parameters from the URL
+        clean_url="${url%%\?*}"
+        wget -O "${APP_ICON_FILEPATH}/$(basename "${clean_url}")" "${clean_url}"
+        printf 'Downloaded favicon: %s\n' "${clean_url}"
+    done
+}
+
 # Adding stylesheets
 if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     echo '---------------------------'
@@ -63,16 +76,11 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     if [[ -n ${TP_ADDON} ]]; then
         for addon in $(echo "$TP_ADDON" | tr "|" " "); do
         sheets="${sheets} <link rel='stylesheet' href='${url_base}/css/addons/readarr/${addon}/${addon}.css'>"
-
-        #if TP_ADDON is one that changes the logo, add the corresponding favicon
-        #find favicon folder name based on addon name
-        favicon_dir="${url_base}/css/addons/readarr/favicon/$(echo "${addon}" | sed 's/-logo//g; s/-text//g')"
-        #if favicon folder exists, copy content to the app favicon folder
-        if [ -d "$favicon_dir" ]; then
-            cp "${favicon_dir}/." "${APP_ICON_FILEPATH}"
-            echo "Added favicon."
+        # If the addon variable has "favicon" in it, download all the favicon files from the themes.json file.
+        if [[ ${addon} == *"favicon"* ]]; then
+            echo 'Downloading favicon files...'
+            download_favicon_files "$addon"
         fi
-
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi

docker-mods/sonarr/root/etc/cont-init.d/98-themepark

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default
@@ -52,10 +53,12 @@ fi
 # Function to download files for a given addon
 download_favicon_files() {
     local addon=$1
-    local urls=$(echo "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]")
+    local urls=$(curl -s "${TP_SCHEME}://${TP_DOMAIN}/themes.json" | jq -r ".addons.sonarr[\"$addon\"].files[]?")
     for url in $urls; do
-        wget -P "${APP_ICON_FILEPATH}" "$url"
-        printf 'Downloaded favicon: %s\n' "$url"
+        # Remove the query parameters from the URL
+        clean_url="${url%%\?*}"
+        wget -O "${APP_ICON_FILEPATH}/$(basename "${clean_url}")" "${clean_url}"
+        printf 'Downloaded favicon: %s\n' "${clean_url}"
     done
 }
 

docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

@@ -20,6 +20,7 @@ if [ "${TP_HOTIO}" = true ]; then
     echo 'Changing to Hotio file path!'
     APP_FILEPATH='/app/bin/UI/index.html'
     LOGIN_FILEPATH='/app/bin/UI/login.html'
+    APP_ICON_FILEPATH='/app/bin/UI/Content/Images/Icons'
 fi
 
 # Set default