From 7b53528b2ba5fb2f2ee75340572363f4c71de0a7 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 22 Aug 2020 20:04:41 +0800 Subject: [PATCH] luci-app-unblockmusic: support force replace on Go version --- .../luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua | 1 + .../lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 28eba6abc3..55a50b29a9 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -51,6 +51,7 @@ flac.default = "1" flac.rmempty = false flac.description = translate("目前仅支持酷我、QQ、咪咕") flac:depends("apptype", "nodejs") +flac:depends("apptype", "go") force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲")) force.default = "1" diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 66e7d78abe..4c30534450 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -184,7 +184,10 @@ start() add_cron echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log elif [ "$APPTYPE" == "go" ]; then - UnblockNeteaseMusic -p 5200 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & + if [ $FORCE -eq 1 ]; then + GO_EXTARG="-b" + fi + UnblockNeteaseMusic -p 5200 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -e $GO_EXTARG >>/tmp/unblockmusic.log 2>&1 & echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log else kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1