From cc44f95a2841389f5a8f1541a437dc57aad92a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:43:33 +0200
Subject: [PATCH] Testing (#47)

* Upgrade to version 0.41.1
---
 README.md           |  6 +++---
 README_fr.md        |  6 +++---
 conf/arm64.src      |  4 ++--
 conf/armv5.src      |  4 ++--
 conf/armv6.src      |  4 ++--
 conf/armv7.src      |  4 ++--
 conf/i386.src       |  4 ++--
 conf/navidrome.toml |  3 +++
 conf/x86-64.src     |  4 ++--
 manifest.json       |  2 +-
 scripts/change_url  | 14 ++++++++------
 scripts/upgrade     | 14 ++------------
 12 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 0b8335e..f8e43ae 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device.
 
-**Shipped version:** 0.41.0
+**Shipped version:** 0.41.1
 
 ## Screenshots
 
@@ -47,8 +47,8 @@ You must activate *public site* if you want to connect a client player to Navidr
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/)
 
 ## Links
 
diff --git a/README_fr.md b/README_fr.md
index afb2333..2d1bfcf 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile.
 
-**Version incluse :** 0.41.0
+**Version incluse :** 0.41.1
 
 ## Captures d'écran
 
@@ -47,8 +47,8 @@ Vous devez activer *site public* si vous souhaitez connecter un lecteur client 
 
 #### Architectures supportées
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/)
 
 ## Liens
 
diff --git a/conf/arm64.src b/conf/arm64.src
index 48e3f5f..5ce39d9 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_arm64.tar.gz
-SOURCE_SUM=8d7a3a236d842e38c41a672a9699cde0a86408d821c570dc4b2daa0684394a85
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_arm64.tar.gz
+SOURCE_SUM=dd2ea41746e5d88832476f7aab53e0502e46cac98ace3e46cbee32acf39ccb77
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/armv5.src b/conf/armv5.src
index 88376bc..0c2cbb5 100644
--- a/conf/armv5.src
+++ b/conf/armv5.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv5.tar.gz
-SOURCE_SUM=15d4017d10db7c85ae6dae006f36d329e58eebd38a663725c0f8b92f197c57d1
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv5.tar.gz
+SOURCE_SUM=476ca7775486f641cbee85e749bb063660e310d729d40f68e193f8227718ca7c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/armv6.src b/conf/armv6.src
index 3a2cfed..1d01b05 100644
--- a/conf/armv6.src
+++ b/conf/armv6.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv6.tar.gz
-SOURCE_SUM=8ef6998631e7684456898d3d46fba56d5e85c15ec390fdb06cf5c60ddb058e93
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv6.tar.gz
+SOURCE_SUM=7f8c5ac1a024442f5d0f5612f381d1b094a34439523d7c6c5f89cc35ed055f21
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/armv7.src b/conf/armv7.src
index 4cfe5ab..3d61fe6 100644
--- a/conf/armv7.src
+++ b/conf/armv7.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv7.tar.gz
-SOURCE_SUM=39e6bfe97934b95477042e9a287139507ebf48c7dbdb79df1038785a852dd8c4
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv7.tar.gz
+SOURCE_SUM=31fb9b2ff5812bc95c278954edac03c8baf990b51493e98f3621fd3026ae8ebc
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/i386.src b/conf/i386.src
index ed53669..2d44923 100644
--- a/conf/i386.src
+++ b/conf/i386.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_i386.tar.gz
-SOURCE_SUM=13317bd9779a847bd49bef23b8640dd3594ff89c447024552e076c9c4424e5fd
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_i386.tar.gz
+SOURCE_SUM=069a01ebc7b7c3421bdad023ca2bfa537813bd96f16e848581e914dac7de8a03
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/navidrome.toml b/conf/navidrome.toml
index 70f8e37..4ae039f 100644
--- a/conf/navidrome.toml
+++ b/conf/navidrome.toml
@@ -28,6 +28,9 @@ DataFolder = "__CONFIG_PATH__"
 # Folder where your music library is stored. Can be read-only
 MusicFolder = "/home/yunohost.multimedia/share/Music"
 
+# Enable the option in the UI to download music/albums/artists/playlists from the server
+EnableDownloads = "true"
+
 #Change background image used in the Login page
 UILoginBackgroundUrl = ""
 
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 8fa1420..c887d5f 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_x86_64.tar.gz
-SOURCE_SUM=9b6f5376b5d64ce929c1d5ca655d6b52d7fe30339c93e312ccee6cc5bea5b9c2
+SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_x86_64.tar.gz
+SOURCE_SUM=ee9d6f201cc20d059d2436b29502f82b50b56bdeeee3f95d9196365dab2c89ba
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index 614437a..3f6a412 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic",
         "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic"
     },
-    "version": "0.41.0~ynh1",
+    "version": "0.41.1~ynh1",
     "url": "https://github.com/deluan/navidrome/",
     "license": "GPL-3.0-only",
     "maintainer": {
diff --git a/scripts/change_url b/scripts/change_url
index 69455b1..66a8984 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -109,14 +109,16 @@ ynh_script_progression --message="Modifying a config file..." --weight=1
 config_path="/var/lib/$app"
 path_url="$new_path"
 
-cp ../conf/navidrome.toml "$config_path/navidrome.toml"
+# cp ../conf/navidrome.toml "$config_path/navidrome.toml"
 
-# Main config File
-ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml"
-ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml"
-ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml"
+# # Main config File
+# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml"
+# ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml"
+# ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml"
 
-ynh_store_file_checksum --file="$config_path/navidrome.toml"
+# ynh_store_file_checksum --file="$config_path/navidrome.toml"
+
+ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml"
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 6e42272..58fbb31 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -80,22 +80,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# # Create a temporary directory
-	#tmpdir="$(mktemp -d)"
-	# # Backup the config file in the temp dir
-	# cp -a "/var/lib/$app/navidrome.toml" "$tmpdir/navidrome.toml"
-	
 	# Remove the app directory securely
 	ynh_secure_remove --file=$final_path
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir=$final_path --source_id="$architecture"
-
-	# # Copy the admin saved settings from tmp directory to final config path	
-	# cp -a "$tmpdir/navidrome.toml" "/var/lib/$app/navidrome.toml" 
-
-	# # Remove the tmp directory securely
-	# ynh_secure_remove --file="$tmpdir"
 fi
 
 #=================================================
@@ -120,7 +109,8 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2
 
 config_path="/var/lib/$app"
 
-ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml"
+# Uncomment when there is new options added upstream
+#ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml"
 
 # Create a dedicated systemd config
 ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service"