fix music_source conflict

Signed-off-by: Tianling Shen <[email protected]>

htdocs/luci-static/resources/view/unblockneteasemusic/config.js

@@ -106,8 +106,8 @@ return view.extend({
 		o.default = o.disabled;
 		o.rmempty = false;
 
-		o = s.option(CBIStaticList, 'music_source', _('音源接口'));
-		o.value('default', _('默认'));
+		o = s.option(CBIStaticList, 'music_source', _('音源接口'),
+			_('留空以使用默认音源。'));
 		o.value('bilibili', _('Bilibili 音乐'));
 		o.value('joox', _('JOOX 音乐'));
 		o.value('kugou', _('酷狗音乐'));
@@ -119,8 +119,6 @@ return view.extend({
 		o.value('youtubedl', _('Youtube 音乐（youtube-dl）'));
 		o.value('ytdlp', _('Youtube 音乐（yt-dlp）'));
 		o.value('ytdownload', _('Youtube 音乐（ytdownload）'));
-		o.default = 'default';
-		o.rmempty = false;
 
 		o = s.option(form.Value, 'joox_cookie', _('JOOX Cookie'),
 			_('在 joox.com 获取，需要 wmid 和 session_key 值。'));

root/etc/config/unblockneteasemusic

@@ -1,7 +1,7 @@
 
 config unblockneteasemusic 'config'
 	option enable '0'
-	option music_source 'default'
+	option music_source ''
 	option follow_source_order '0'
 	option local_vip '0'
 	option enable_flac '0'

root/etc/init.d/unblockneteasemusic

@@ -126,10 +126,7 @@ start_service() {
 		fi
 	fi
 
-	local music_source
-	config_get music_source "config" "music_source" "default"
-	[ "${music_source}" != "default" ] && append_param -o "${music_source}"
-
+	append_param_arg "config" "music_source" "-o"
 	append_param_arg "config" "cnrelay" "-c"
 	append_param_arg "config" "endpoint_url" "-e" "https://music.163.com"
 	append_param_arg "config" "netease_server_ip" "-f"

root/etc/uci-defaults/luci-unblockneteasemusic

@@ -1,18 +1,23 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
+if [ "$(uci -q get unblockneteasemusic.config.music_source)" = "default" ]; then
+	uci -q delete unblockneteasemusic.config.music_source
+	uci -q commit unblockneteasemusic
+fi
+
+uci -q batch <<-EOF
 	delete ucitrack.@unblockneteasemusic[-1]
 	commit ucitrack
 EOF
 [ -e "$(command -v fw4)" ] || {
-uci -q batch <<-EOF >/dev/null
-	delete firewall.unblockneteasemusic
-	set firewall.unblockneteasemusic=include
-	set firewall.unblockneteasemusic.type=script
-	set firewall.unblockneteasemusic.path=/var/etc/unblockneteasemusic.include
-	set firewall.unblockneteasemusic.reload=1
-	commit firewall
-EOF
+	uci -q batch <<-EOF
+		delete firewall.unblockneteasemusic
+		set firewall.unblockneteasemusic=include
+		set firewall.unblockneteasemusic.type=script
+		set firewall.unblockneteasemusic.path=/var/etc/unblockneteasemusic.include
+		set firewall.unblockneteasemusic.reload=1
+		commit firewall
+	EOF
 }
 
 rm -f /tmp/luci-indexcache