From d4f8b14e53a0f962f0f4fec569f6ac8b24d6cc7f Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 12 Sep 2020 18:11:17 +0800 Subject: [PATCH] UnblockNeteaseMusic-Go: bump to 0.2.6 --- package/lean/UnblockNeteaseMusic-Go/Makefile | 4 ++-- package/lean/luci-app-unblockneteasemusic-go/Makefile | 4 ++-- .../luasrc/model/cbi/unblockneteasemusic.lua | 4 ++++ .../root/etc/init.d/unblockneteasemusic | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index adb249026f..3c3a285512 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic-Go -PKG_VERSION:=0.2.5 +PKG_VERSION:=0.2.6 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=aa1eb0186206671de9a6b4fa27d933bb306d4e25 +PKG_SOURCE_VERSION:=7ff431267eb2b2683ea25e1b3860447aa7b482e9 PKG_MAINTAINER:=Silvan PKG_SOURCE_SUBDIR:=$(PKG_NAME) diff --git a/package/lean/luci-app-unblockneteasemusic-go/Makefile b/package/lean/luci-app-unblockneteasemusic-go/Makefile index c90cbd8fe7..8b11c61c59 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-go/Makefile @@ -2,10 +2,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for UnblockNeteaseMusic Go -LUCI_DEPENDS:=+bash +busybox +coreutils-nohup +curl +dnsmasq-full +openssl-util +ipset +UnblockNeteaseMusic-Go +LUCI_DEPENDS:=+bash +busybox +coreutils +coreutils-nohup +curl +dnsmasq-full +openssl-util +ipset +UnblockNeteaseMusic-Go LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic-go -PKG_VERSION:=1.8 +PKG_VERSION:=1.9 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 010bd4329a..c5a4e9ccaf 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 @@ -48,6 +48,10 @@ hijack.description = translate("如果使用Hosts劫持，请将HTTP/HTTPS端口 hijack.default = "dont_hijack" hijack.rmempty = false +search_limit = s:option(Value, "search_limit", translate("搜索结果限制")) +search_limit.description = translate("在搜索页面显示其他平台搜索结果个数，可填（0-3）") +search_limit.default = "0" +search_limit.rmempty = false daemon_enable = s:option(Flag, "daemon_enable", translate("启用进程守护")) daemon_enable.description = translate("开启后，附属程序会自动检测主程序运行状态，在主程序退出时自动重启") 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 88987f0ec4..657774c049 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 @@ -140,9 +140,9 @@ start() { 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 & + nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o kuwo -m 0 -c "${serverCrt}" -k "${serverKey}" -l "${logFile}" -sl "${search_limit}" ${exArgs} >>"${logFile}" 2>&1 & else - nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o "${music_customize_source}" -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & + nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o "${music_customize_source}" -m 0 -c "${serverCrt}" -k "${serverKey}" -l "${logFile}" -sl "${search_limit}" ${exArgs} >>"${logFile}" 2>&1 & fi set_type="start" if [ "${hijack_ways}" = "use_ipset" ]; then