From 77121adaf9ef6a979b108541785449b9fdbb3c4f Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 24 Feb 2020 21:54:59 -0800 Subject: [PATCH] luci-app-unblockneteasemusic-mini: add flac server --- package/lean/luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../luasrc/controller/unblockneteasemusic-mini.lua | 2 +- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 3 ++- .../root/etc/init.d/unblockneteasemusic-mini | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-unblockneteasemusic-mini/Makefile b/package/lean/luci-app-unblockneteasemusic-mini/Makefile index f379063dc..17eb8547f 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-mini/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 PKG_RELEASE:=6 -LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(Mini) +LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index 25d48deef..73460b723 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -10,7 +10,7 @@ function index() end local page - page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("云解锁网易云音乐"), 100) + page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("解除网易云音乐播放限制 (Mini)"), 100) page.dependent = true entry({"admin", "services", "unblockneteasemusic-mini", "status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index a40f77d10..561b1332e 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -16,9 +16,10 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务端类型")) +select_server:value("tencent_shanghai_golang", translate("腾讯云上海 Golang 版本（低音质）")) select_server:value("tencent_shanghai_nodejs", translate("腾讯云上海 Node.js 版本（高音质）")) select_server:value("aliyun_beijing_nodejs", translate("阿里云北京 Node.js 版本（高音质）")) -select_server:value("tencent_shanghai_golang", translate("腾讯云上海 Golang 版本（低音质）")) +select_server:value("mobile_henan_nodejs",translate("移动河南 Node.js 版本（无损音质）")) select_server.description = translate("Node.js版使用QQ、酷我、咪咕音源，Golang版使用酷狗、酷我、咪咕音源") select_server.default = "tencent_shanghai_nodejs" select_server.rmempty = false diff --git a/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 6f53bf379..577f17116 100755 --- a/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -20,6 +20,12 @@ elif [ "${select_server}" = "aliyun_beijing_nodejs" ]; then [ -z "${unblock_server_ip}" ] && unblock_server_ip="182.92.84.98" unblock_server_http_port="30000" unblock_server_https_port="30001" +elif [ "${select_server}" = "mobile_henan_nodejs" ]; then + unblock_server_addr="cdn-henan.service.project-openwrt.eu.org" + unblock_server_ip="$(ping "cdn-henan.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" + [ -z "${unblock_server_ip}" ] && exit 1 + unblock_server_http_port="33221" + unblock_server_https_port="33222" elif [ "${select_server}" = "tencent_shanghai_golang" ]; then unblock_server_addr="cdn-shanghai.service.project-openwrt.eu.org" unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" @@ -68,6 +74,7 @@ ipset=/clientlog3.music.163.com/neteasemusic iptables -t nat -D "PREROUTING" -p tcp -m set --match-set "neteasemusic" dst -j "unblock_netease_music" iptables -t nat -F "unblock_netease_music" iptables -t nat -X "unblock_netease_music" + ipset destroy "neteasemusic" echo "" > "/var/etc/unblockneteasemusic-mini.include" rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-mini.conf"