navidrome: update to v 0.51.0

- update navidrom to v 0.51.0 - use new shared folder handling
SynoCommunity · Jan 22, 2024 · 4bbd0ed · 4bbd0ed
1 parent 34be67d
commit 4bbd0ed
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 49 deletions.
diff --git a/cross/navidrome/Makefile b/cross/navidrome/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = navidrome
-PKG_VERS = 0.49.3
+PKG_VERS = 0.51.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/navidrome/navidrome/archive
@@ -19,23 +19,19 @@ COMMENT  = ����☁ Modern Music Server and Streamer compatible with Subs
 LICENSE  = GPL-3.0 License
 
 PRE_COMPILE_TARGET = navidrome_pre_compile
-COMPILE_TARGET = navidrome_compile
+COMPILE_MAKE_OPTIONS = buildall
 
 CGO_ENABLED = 1
 GO_BIN_DIR = $(WORK_DIR)/$(PKG_DIR)/$(PKG_NAME)
 
 include ../../mk/spksrc.cross-go.mk
 
 ENV += NPM_CONFIG_USER=root
-PATH := $(WORK_DIR)/../../../native/nodejs/work-native/node/bin:$(PATH)
+PATH := $(abspath $(WORK_DIR)/../../../native/nodejs/work-native/node/bin):$(PATH)
 
 # avoid webpack error ERR_OSSL_EVP_UNSUPPORTED with nodejs v18
 ENV += NODE_OPTIONS=--openssl-legacy-provider
 
 .PHONY: navidrome_pre_compile
 navidrome_pre_compile:
 	@$(RUN) $(MAKE) setup
-
-.PHONY: navidrome_compile
-navidrome_compile:
-	@$(RUN) $(MAKE) buildall
diff --git a/cross/navidrome/digests b/cross/navidrome/digests
@@ -1,3 +1,3 @@
-navidrome-0.49.3.tar.gz SHA1 b34029e626886432786291d13594ad0dcfb16e86
-navidrome-0.49.3.tar.gz SHA256 ab48eadeb74f64456b612655941bac4eb95a0f546bfee473baa316319fb4a17a
-navidrome-0.49.3.tar.gz MD5 bad6015f46be2d39e570499fbd67a803
+navidrome-0.51.0.tar.gz SHA1 374446a1c7420cc4e1fc38876963548252dd29e5
+navidrome-0.51.0.tar.gz SHA256 0f744b60c0a012c9e89e71dd1849cb342c7677ec9862ab3a75d5fdbf83b7bfbf
+navidrome-0.51.0.tar.gz MD5 71a677edf8fc16641153aa42e3f23727
diff --git a/spk/navidrome/Makefile b/spk/navidrome/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = navidrome
-SPK_VERS = 0.49.3
+SPK_VERS = 0.51.0
 SPK_REV = 1
 SPK_ICON = src/navidrome.png
 
@@ -28,8 +28,7 @@ SERVICE_PORT_TITLE = Navidrome (HTTP)
 ADMIN_PORT = $(SERVICE_PORT)
 
 WIZARDS_DIR = src/wizard
-SERVICE_WIZARD_SHARE = wizard_music_folder
-USE_DATA_SHARE_WORKER = yes
+SERVICE_WIZARD_SHARENAME = wizard_music_folder
 
 POST_STRIP_TARGET = navidrome_extra_install
 

diff --git a/spk/navidrome/src/service-setup.sh b/spk/navidrome/src/service-setup.sh
@@ -10,6 +10,6 @@ export LD_LIBRARY_PATH="${SYNOPKG_PKGDEST}/lib"
 service_postinst ()
 {
     # update config with values from wizard variables
-    sed -e "s|@@wizard_music_folder@@|${wizard_music_volume}/${wizard_music_folder}|g" \
+    sed -e "s|@@wizard_music_folder@@|${SHARE_PATH}|g" \
         -i "${CONFIG_FILE}"
 }
diff --git a/spk/navidrome/src/wizard/install_uifile b/spk/navidrome/src/wizard/install_uifile
@@ -1,37 +1,7 @@
 [{
-    "step_title": "Basic configuration",
-    "items": [{
-        "type": "combobox",
-        "desc": "Please select a volume to use for the music folder",
-        "subitems": [{
-            "key": "wizard_music_volume",
-            "desc": "Volume name",
-            "displayField": "display_name",
-            "valueField": "volume_path",
-            "editable": false,
-            "mode": "remote",
-            "api_store": {
-              "api": "SYNO.Core.Storage.Volume",
-              "method": "list",
-              "version": 1,
-              "baseParams": {
-                "limit": -1,
-                "offset": 0,
-                "location": "internal"
-              },
-              "root": "volumes",
-              "idProperty": "volume_path",
-              "fields": [
-                "display_name",
-                "volume_path"
-              ]
-            },
-            "validator": {
-              "fn": "{console.log(arguments);return true;}"
-            }
-          }
-        ]
-      }, {
+  "step_title": "Basic configuration",
+  "items": [
+     {
         "type": "textfield",
         "desc": "Shared music folder. This must be a name for the shared folder only, without any path. This share is created at installation when it does not already exist.",
         "subitems": [{
@@ -53,5 +23,4 @@
         "desc": "Navidrome runs as internal service user <b>'sc-navidrome'</b> in DSM. The shared music folder above is configured at installation time to be accessible by this user.<p>If you manually change the music folder, make sure 'sc-navidrome' has permissions to access it.<p>Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details."
       }
     ]
-  }
-]
+}]