From 4153bab277bac1d1b764857825dbbbf247cdbbdd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 13 Jan 2022 11:05:30 +0100
Subject: [PATCH] Fix

---
 config_panel.toml | 10 +++++++++-
 scripts/install   |  2 ++
 scripts/upgrade   |  8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 25ea267..973d70d 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -8,7 +8,15 @@ name = "Navidrome configuration"
     services = ["__APP__"]
 
         [main.config.enable_downloads]
-        ask = "Allow music download from the server?"
+        ask = "Allow music download"
         type = "boolean"
         help = "Enable the option in the UI to download music/albums/artists/playlists from the server"
         bind = "EnableDownloads:/var/lib/navidrome/navidrome.toml"
+
+        [main.config.scanner_extractor]
+        ask = "Select metadata extractor"
+        type = "select"
+        choices = ["taglib", "ffmpeg"]
+        default = "taglib"
+        help = "Select metadata extractor implementation."
+        bind = "Scanner.Extractor:/var/lib/navidrome/navidrome.toml"
diff --git a/scripts/install b/scripts/install
index e08f132..cbd97d8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,7 @@ architecture=$YNH_ARCH
 app=$YNH_APP_INSTANCE_NAME
 
 enable_downloads="true"
+scanner_extractor="taglib"
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -48,6 +49,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=enable_downloads --value=$enable_downloads
+ynh_app_setting_set --app=$app --key=scanner_extractor --value=$scanner_extractor
 
 #=================================================
 # STANDARD MODIFICATIONS
diff --git a/scripts/upgrade b/scripts/upgrade
index 9fca772..e9c5c84 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 architecture=$YNH_ARCH
 
 enable_downloads=$(ynh_app_setting_get --app=$app --key=enable_downloads)
+scanner_extractor=$(ynh_app_setting_get --app=$app --key=scanner_extractor)
 
 #=================================================
 # CHECK VERSION
@@ -58,11 +59,16 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
-if [ -z "$enable_downloads" ] ||
+if [ -z "$enable_downloads" ]; then
 	enable_downloads="true"
 	ynh_app_setting_set --app=$app --key=enable_downloads --value=$enable_downloads
 fi
 
+if [ -z "$scanner_extractor" ]; then
+	scanner_extractor="true"
+	ynh_app_setting_set --app=$app --key=scanner_extractor --value=$scanner_extractor
+fi
+
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
 	ynh_legacy_permissions_delete_all