From dbe082b6a953b323f805b37287eb9cd4e654d672 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 22 Aug 2020 19:53:05 +0800 Subject: [PATCH] luci-app-unblockneteasemusic-go: sync with upstream source --- .../lean/luci-app-unblockneteasemusic-go/Makefile | 2 +- .../luasrc/model/cbi/unblockneteasemusic.lua | 12 +++++++++--- .../luasrc/model/cbi/unblockneteasemusic_log.lua | 2 +- .../root/etc/init.d/unblockneteasemusic | 6 +++++- .../{unblockneteasemusic-go => unblockneteasemusic} | 0 5 files changed, 16 insertions(+), 6 deletions(-) rename package/lean/luci-app-unblockneteasemusic-go/root/lib/upgrade/keep.d/{unblockneteasemusic-go => unblockneteasemusic} (100%) mode change 100755 => 100644 diff --git a/package/lean/luci-app-unblockneteasemusic-go/Makefile b/package/lean/luci-app-unblockneteasemusic-go/Makefile index 53fdbef707..c90cbd8fe7 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-go/Makefile @@ -5,7 +5,7 @@ LUCI_TITLE:=LuCI support for UnblockNeteaseMusic Go LUCI_DEPENDS:=+bash +busybox +coreutils-nohup +curl +dnsmasq-full +openssl-util +ipset +UnblockNeteaseMusic-Go LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic-go -PKG_VERSION:=1.6 +PKG_VERSION:=1.8 PKG_RELEASE:=1 PKG_MAINTAINER:=https://github.com/cnsilvan/luci-app-unblockneteasemusic diff --git a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua index f445ba8ef0..010bd4329a 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua +++ b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua @@ -1,7 +1,7 @@ local http = luci.http mp = Map("unblockneteasemusic", translate("解除网易云音乐播放限制 (Golang)")) -mp.description = translate("原理：采用 [酷我/酷狗/咕咪] 音源(后续有空补充)，替换网易云音乐 灰色 歌曲链接
具体使用方法参见：https://github.com/cnsilvan/luci-app-unblockneteasemusic
首次使用会自动生成证书，可能较慢") +mp.description = translate("原理：采用 [酷我/酷狗/咕咪] 音源(后续有空补充)，替换网易云音乐 灰色 歌曲链接
具体使用方法参见：https://github.com/cnsilvan/luci-app-unblockneteasemusic
提示：客户端网易云音乐能用就别升级app，最新版本不一定能用") mp:section(SimpleSection).template = "unblockneteasemusic/unblockneteasemusic_status" s = mp:section(TypedSection, "unblockneteasemusic") @@ -48,16 +48,22 @@ hijack.description = translate("如果使用Hosts劫持，请将HTTP/HTTPS端口 hijack.default = "dont_hijack" hijack.rmempty = false + daemon_enable = s:option(Flag, "daemon_enable", translate("启用进程守护")) daemon_enable.description = translate("开启后，附属程序会自动检测主程序运行状态，在主程序退出时自动重启") daemon_enable.default = 0 daemon_enable.rmempty = false endpoint_enable = s:option(Flag, "endpoint_enable", translate("启用地址转换")) -endpoint_enable.description = translate("开启后，设备需要信任证书，经测试ios设备需要开启，其他设备无法使用时再开启尝试") +endpoint_enable.description = translate("开启后，设备需要信任证书，经测试ios设备需要开启，android设备使用咪咕源下载时需要开启，其他情况无法使用时再开启尝试") endpoint_enable.default = 0 endpoint_enable.rmempty = false +force_best_quality = s:option(Flag, "force_best_quality", translate("强制音质优先")) +force_best_quality.description = translate("开启后，客户端选择音质将失效") +force_best_quality.default = 0 +force_best_quality.rmempty = false + delete = s:option(Button,"_delete", translate("删除根证书")) delete.description = translate("删除证书，以便下次启动时生成，可用于解决过期证书等问题") delete.inputstyle = "reload" @@ -65,7 +71,7 @@ delete.write = function() delete_() end download = s:option(Button,"_download", translate("下载根证书")) -download.description = translate("请在客户端信任该证书。该证书由你设备自动生成，安全可靠") +download.description = translate("请在客户端信任该证书。该证书由你设备自动生成，安全可靠
IOS信任证书步骤：1. 安装证书--设置-描述文件-安装 2. 通用-关于本机-证书信任设置-启动完全信任") download.inputstyle = "reload" download.write = function() download_() diff --git a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic_log.lua b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic_log.lua index 65df21d852..7185296d35 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic_log.lua +++ b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic_log.lua @@ -5,7 +5,7 @@ f = SimpleForm("logview") t = f:field(TextValue, "conf") t.rmempty = true -t.rows = 15 +t.rows = 20 function t.cfgvalue() return fs.readfile(conffile) or "" end diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic b/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic index 4ac8741224..88987f0ec4 100755 --- a/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic +++ b/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -START=80 +START=96 STOP=10 lan_addr="$(uci get network.lan.ipaddr)" @@ -12,6 +12,7 @@ music_source="$(uci get unblockneteasemusic.@unblockneteasemusic[0].music_source music_customize_source="$(uci get unblockneteasemusic.@unblockneteasemusic[0].music_customize_source)" hijack_ways="$(uci get unblockneteasemusic.@unblockneteasemusic[0].hijack_ways)" endpoint="$(uci get unblockneteasemusic.@unblockneteasemusic[0].endpoint_enable)" +force_best_quality="$(uci get unblockneteasemusic.@unblockneteasemusic[0].force_best_quality)" extFile="/usr/share/UnblockNeteaseMusic/extFile.txt" serverCrt="/usr/share/UnblockNeteaseMusic/server.crt" serverKey="/usr/share/UnblockNeteaseMusic/server.key" @@ -135,6 +136,9 @@ start() { if [ "${endpoint}" = "1" ]; then exArgs="-e" fi + if [ "${force_best_quality}" = "1" ]; then + exArgs="${exArgs} -b" + fi if [ "${music_source}" = "default" ]; then nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o kuwo -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & else diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/lib/upgrade/keep.d/unblockneteasemusic-go b/package/lean/luci-app-unblockneteasemusic-go/root/lib/upgrade/keep.d/unblockneteasemusic old mode 100755 new mode 100644 similarity index 100% rename from package/lean/luci-app-unblockneteasemusic-go/root/lib/upgrade/keep.d/unblockneteasemusic-go rename to package/lean/luci-app-unblockneteasemusic-go/root/lib/upgrade/keep.d/unblockneteasemusic