From 7e9fe271956138ded1602230afdb91a8a9cfdc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 25 Jan 2022 11:28:53 +0100 Subject: [PATCH] Testing (#74) * More config panel (#73) --- README.md | 2 +- README_fr.md | 2 +- conf/navidrome.toml | 5 ++++- config_panel.toml | 14 ++++++++++++++ manifest.json | 2 +- scripts/change_url | 2 ++ scripts/install | 4 ++++ scripts/upgrade | 12 ++++++++++++ 8 files changed, 39 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4e6e7c1..a5de690 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Navidrome indexes all digital music stored in your hard drive and makes it avail - Transcoding on the fly. Can be set per user/player. Opus encoding is supported -**Shipped version:** 0.47.5~ynh1 +**Shipped version:** 0.47.5~ynh2 **Demo:** https://demo.navidrome.org/app/#/login diff --git a/README_fr.md b/README_fr.md index b20cbdf..e081ffc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Navidrome indexe toute la musique numérique stockée sur votre disque dur et la - Compatible avec tous les clients subsonique/madsononique/aironique - Encodage à la volée. Peut être défini par utilisateur/lecteur. Le codage opus est pris en charge -**Version incluse :** 0.47.5~ynh1 +**Version incluse :** 0.47.5~ynh2 **Démo :** https://demo.navidrome.org/app/#/login diff --git a/conf/navidrome.toml b/conf/navidrome.toml index f658574..ffa96a1 100644 --- a/conf/navidrome.toml +++ b/conf/navidrome.toml @@ -16,6 +16,9 @@ BaseURL = "__PATH_URL__" # Configure periodic scans using “cron” syntax. To disable it altogether, set it to "" (empty string) ScanSchedule = "@every 1m30s" +# Enables transcoding configuration in the UI +EnableTranscodingConfig = "__ENABLE_TRANSCODING__" + # Size of transcoding cache. Set to 0 to disable cache TranscodingCacheSize = "150MB" @@ -35,7 +38,7 @@ EnableDownloads = "__ENABLE_DOWNLOADS__" UILoginBackgroundUrl = "" # Add a welcome message to the login screen -UIWelcomeMessage = "" +UIWelcomeMessage = "__WELCOME_MESSAGE__" # Controls whether the player in the UI will animate the album cover (rotation) EnableCoverAnimation = "__ENABLE_ANIMATION__" diff --git a/config_panel.toml b/config_panel.toml index c8361fe..1cef0dd 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -30,3 +30,17 @@ services = ["__APP__"] default = "taglib" help = "Select metadata extractor implementation" bind = "Scanner.Extractor:/var/lib/navidrome/navidrome.toml" + + [main.config.enable_transcoding] + ask = "Enable transcoding" + type = "boolean" + yes = "true" + no = "false" + help = "Enables transcoding configuration in the UI" + bind = "EnableTranscodingConfig:/var/lib/navidrome/navidrome.toml" + + [main.config.welcome_message] + ask = "Welcome message" + type = "string" + help = "Add a welcome message to the login screen" + bind = "UIWelcomeMessage:/var/lib/navidrome/navidrome.toml" diff --git a/manifest.json b/manifest.json index 4bea732..6476ad3 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.47.5~ynh1", + "version": "0.47.5~ynh2", "url": "https://www.navidrome.org", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/change_url b/scripts/change_url index 07c4761..2c083c3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,6 +33,8 @@ port=$(ynh_app_setting_get --app=$app --key=port) enable_downloads=$(ynh_app_setting_get --app=$app --key=enable_downloads) scanner_extractor=$(ynh_app_setting_get --app=$app --key=scanner_extractor) enable_animation=$(ynh_app_setting_get --app=$app --key=enable_animation) +enable_transcoding=$(ynh_app_setting_get --app=$app --key=enable_transcoding) +welcome_message=$(ynh_app_setting_get --app=$app --key=welcome_message) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index ef49713..695aa21 100644 --- a/scripts/install +++ b/scripts/install @@ -30,6 +30,8 @@ app=$YNH_APP_INSTANCE_NAME scanner_extractor="taglib" enable_downloads="true" enable_animation="true" +enable_transcoding="false" +welcome_message="" #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -52,6 +54,8 @@ 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 ynh_app_setting_set --app=$app --key=enable_animation --value=$enable_animation +ynh_app_setting_set --app=$app --key=enable_transcoding --value=$enable_transcoding +ynh_app_setting_set --app=$app --key=welcome_message --value=$welcome_message #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index 02fdd2e..b7cf631 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,8 @@ 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) enable_animation=$(ynh_app_setting_get --app=$app --key=enable_animation) +enable_transcoding=$(ynh_app_setting_get --app=$app --key=enable_transcoding) +welcome_message=$(ynh_app_setting_get --app=$app --key=welcome_message) #================================================= # CHECK VERSION @@ -75,6 +77,16 @@ if [ -z "$scanner_extractor" ]; then ynh_app_setting_set --app=$app --key=scanner_extractor --value=$scanner_extractor fi +if [ -z "$enable_transcoding" ]; then + enable_transcoding="false" + ynh_app_setting_set --app=$app --key=enable_transcoding --value=$enable_transcoding +fi + +if [ -z "$welcome_message" ]; then + welcome_message="" + ynh_app_setting_set --app=$app --key=welcome_message --value=$welcome_message +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all