UnblockNeteaseMusic: add local VIP and repair failure to replace 320K music source (#8538)

package/lean/luci-app-unblockmusic/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.3.5
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=lean

package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic/unblockmusic.lua

@@ -55,11 +55,21 @@ flac.rmempty = false
 flac:depends("apptype", "nodejs")
 flac:depends("apptype", "go")
 
-force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲"))
-force.description = translate("如果歌曲音质在 320Kbps 以内，则尝试强制替换为高音质版本")
-force.default = "1"
-force.rmempty = false
-force:depends("apptype", "nodejs")
+replace_music_source = s:option(ListValue, "replace_music_source", translate("强制音乐音源替换"))
+replace_music_source:value("0", translate("不强制替换音乐音源"))
+replace_music_source:value("192000", translate("当音质低于 192 Kbps（中）时"))
+replace_music_source:value("320000", translate("当音质低于 320 Kbps（高）时"))
+replace_music_source:value("600000", translate("当音质低于 999 Kbps（无损）时"))
+replace_music_source.description = translate("当音乐音质低于指定数值时，尝试强制使用其他平台的高音质版本进行替换")
+replace_music_source.default = "0"
+replace_music_source.rmempty = false
+replace_music_source:depends("apptype", "nodejs")
+
+local_vip = s:option(Flag, "local_vip", translate("启用本地 VIP"))
+local_vip.description = translate("启用后，可以使用去广告、个性换肤、鲸云音效等本地功能")
+local_vip.default = 0
+local_vip.rmempty = false
+local_vip:depends("apptype", "nodejs")
 
 autoupdate = s:option(Flag, "autoupdate", translate("自动检查更新主程序"))
 autoupdate.description = translate("每天自动检测并更新到最新版本")

package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic

@@ -67,7 +67,8 @@ AUTOUPDATE=$(uci_get_by_type unblockmusic autoupdate 0)
 APPTYPE=$(uci_get_by_type unblockmusic apptype go)
 SEARCHLIMIT=$(uci_get_by_type unblockmusic search_limit 0)
 FLAC=$(uci_get_by_type unblockmusic flac_enabled 0)
-FORCE=$(uci_get_by_type unblockmusic force_enabled 0)
+REPLACE_MUSIC_SOURCE=$(uci_get_by_type unblockmusic replace_music_source 0)
+LOCAL_VIP=$(uci_get_by_type unblockmusic local_vip 0)
 
 CLOUD=$(uci_get_by_type unblockmusic cloudserver "127.0.0.1:5200:5201")
 cloudadd=$(echo "$CLOUD" | awk -F ':' '{print $1}')
@@ -175,26 +176,27 @@ start()
     if [ $FLAC -eq 1 ]; then
       export ENABLE_FLAC=true
     fi
-    if [ $FORCE -eq 1 ]; then
-      sed -i '/item.code != 200/ { s/item.code != 200 || item.freeTrialInfo/item.br < 320000/g; }'  /usr/share/UnblockNeteaseMusic/src/hook.js
-    else
-      sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }'  /usr/share/UnblockNeteaseMusic/src/hook.js
+    if [ $REPLACE_MUSIC_SOURCE -ne 0 ]; then
+      export MIN_BR=$REPLACE_MUSIC_SOURCE
+    fi
+	if [ $LOCAL_VIP -eq 1 ]; then
+      export ENABLE_LOCAL_VIP=true
     fi
     node /usr/share/UnblockNeteaseMusic/app.js -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 &
     node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 &
     add_cron
     echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log  
-	elif [ "$APPTYPE" == "go" ]; then
+  elif [ "$APPTYPE" == "go" ]; then
     if [ $FLAC -eq 1 ]; then
       ENABLE_FLAC="-b "
     fi
     UnblockNeteaseMusic -o "kuwo:kugou" $ENABLE_FLAC -p 5200 -sp 5201 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e -sl ${SEARCHLIMIT} -l /tmp/unblockmusic.log &
     echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log
-  else
+    else
     kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1
     /usr/bin/UnblockNeteaseMusicCloud >/dev/null 2>&1 &
      echo "$(date -R) # UnblockNeteaseMusic Cloud Version - Server: $cloudip (http:$cloudhttp, https:$cloudhttps)" >>/tmp/unblockmusic.log
-	fi
+  fi
 		
 	set_firewall