From f4a9966616fd4442b6c58e08e0cc44a3279c9ef2 Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Tue, 14 Apr 2020 09:21:40 +0800 Subject: [PATCH] luci-app-unblockmusic: add flac switch for nodejs (#4302) * Update unblockmusic.lua * Update unblockmusic --- .../luasrc/model/cbi/unblockmusic.lua | 12 +++++++++--- .../root/etc/init.d/unblockmusic | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) 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 ca3a9fe7f..68bfa674d 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -30,7 +30,7 @@ speedtype:value("qq", translate("QQ音乐")) speedtype:value("xiami", translate("虾米音乐")) speedtype:value("baidu", translate("百度音乐")) speedtype:value("kugou", translate("酷狗音乐")) -speedtype:value("kuwo", translate("酷我音乐(高音质/FLACの解锁可能性)")) +speedtype:value("kuwo", translate("酷我音乐")) speedtype:value("migu", translate("咕咪音乐")) speedtype:value("joox", translate("JOOX音乐")) speedtype.default = "kuwo" @@ -47,8 +47,11 @@ cloudserver.default = "cdn-shanghai.service.project-openwrt.eu.org:30000:30001" cloudserver.rmempty = true cloudserver:depends("apptype", "cloud") -download_certificate=s:option(DummyValue,"opennewwindow",translate("HTTPS 证书")) -download_certificate.description = translate("
Mac/iOS客户端需要安装 CA根证书并信任
iOS系统需要在“设置 -> 通用 -> 关于本机 -> 证书信任设置”中,信任 UnblockNeteaseMusic Root CA
Linux 设备请在启用时加入 --ignore-certificate-errors 参数") +flac = s:option(Flag, "flac_enabled", translate("启用无损音质")) +flac.default = 1 +flac.rmempty = false +flac.description = translate("目前仅支持酷我、QQ、咪咕") +flac:depends("apptype", "nodejs") o = s:option(Flag, "autoupdate") o.title = translate("自动检查更新主程序") @@ -57,6 +60,9 @@ o.rmempty = false o.description = translate("每天自动检测并更新到最新版本") o:depends("apptype", "nodejs") +download_certificate=s:option(DummyValue,"opennewwindow",translate("HTTPS 证书")) +download_certificate.description = translate("
Mac/iOS客户端需要安装 CA根证书并信任
iOS系统需要在“设置 -> 通用 -> 关于本机 -> 证书信任设置”中,信任 UnblockNeteaseMusic Root CA
Linux 设备请在启用时加入 --ignore-certificate-errors 参数") + local ver = fs.readfile("/usr/share/UnblockNeteaseMusic/core_ver") or "0.00" o = s:option(Button, "restart",translate("手动更新")) 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 585291277..3fdc4f9a7 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -65,6 +65,7 @@ ENABLE=$(uci_get_by_type unblockmusic enabled 0) TYPE=$(uci_get_by_type unblockmusic musicapptype default) AUTOUPDATE=$(uci_get_by_type unblockmusic autoupdate 0) APPTYPE=$(uci_get_by_type unblockmusic apptype go) +FLAC=$(uci_get_by_type unblockmusic flac_enabled 0) CLOUD=$(uci_get_by_type unblockmusic cloudserver "127.0.0.1:5200:5201") cloudadd=$(echo "$CLOUD" | awk -F ':' '{print $1}') @@ -168,7 +169,9 @@ start() fi if [ "$APPTYPE" == "nodejs" ]; then + if [ $FLAC -eq 1 ]; then export ENABLE_FLAC=true + fi node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & add_cron echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log