From c6b5d3bbe37b0a297160da435f2fc4caba0fea3b Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Fri, 6 Mar 2020 08:05:07 -0800 Subject: [PATCH] UnblockNeteaseMusicGo: bump version --- .../lean/UnblockNeteaseMusic-Go/001-endpoint.patch | 13 ------------- package/lean/UnblockNeteaseMusic-Go/Makefile | 6 ++---- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../luasrc/controller/unblockmusic.lua | 4 ++-- .../po/zh_Hans/unblockmusic.po | 13 +++++++++++++ .../root/usr/share/UnblockNeteaseMusic/logcheck.sh | 7 +++++-- 6 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 package/lean/UnblockNeteaseMusic-Go/001-endpoint.patch create mode 100644 package/lean/luci-app-unblockmusic/po/zh_Hans/unblockmusic.po diff --git a/package/lean/UnblockNeteaseMusic-Go/001-endpoint.patch b/package/lean/UnblockNeteaseMusic-Go/001-endpoint.patch deleted file mode 100644 index cabe603c05..0000000000 --- a/package/lean/UnblockNeteaseMusic-Go/001-endpoint.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/processor/processor.go -+++ b/processor/processor.go -@@ -390,7 +390,7 @@ - //data["url"] = uri.Scheme + "://" + uri.Host + uri.EscapedPath() - //data["url"] = uri.String() - if *config.EndPoint{ -- data["url"]="https://music.163.com/unblockmusic/"+uri.String() -+ data["url"]="http://music.163.com/unblockmusic/"+uri.String() - }else{ - data["url"] = uri.String() - } - - diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 69d3af328e..0996893e0b 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic-Go PKG_VERSION:=0.1.6 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=4785d416e4ba33e38e446fa15f6791534d0ac182 +PKG_SOURCE_VERSION:=e38035e92a4ecca6c827ec2d572aaf8528ec3cb5 PKG_MAINTAINER:=Silvan PKG_SOURCE_SUBDIR:=$(PKG_NAME) @@ -40,8 +40,6 @@ endef define Build/Prepare tar -zxvf $(DL_DIR)/$(PKG_SOURCE) -C $(BUILD_DIR)/$(PKG_NAME) --strip-components 1 - $(CP) ./001-endpoint.patch $(BUILD_DIR)/$(PKG_NAME)/ - patch -d $(BUILD_DIR)/$(PKG_NAME) -p1 < 001-endpoint.patch endef define Build/Configure diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index e5c853154e..96fbcd5c21 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.1 -PKG_RELEASE:=32 +PKG_RELEASE:=33 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua index f2a3bcc1f4..3a4c773032 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua @@ -6,7 +6,7 @@ function index() return end - entry({"admin", "services", "unblockmusic"},firstchild(), _("解锁网易云灰色歌曲"), 50).dependent = false + entry({"admin", "services", "unblockmusic"},firstchild(), _("Unblock Netease Music"), 50).dependent = false entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic"), _("Base Setting"), 1) entry({"admin", "services", "unblockmusic", "log"},form("unblockmusiclog"), _("Log"), 2) @@ -16,7 +16,7 @@ end function act_status() local e={} - e.running=luci.sys.call("busybox ps -w | grep UnblockNeteaseMusic | grep -v grep >/dev/null")==0 + e.running=luci.sys.call("busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh >/dev/null")==0 luci.http.prepare_content("application/json") luci.http.write_json(e) end diff --git a/package/lean/luci-app-unblockmusic/po/zh_Hans/unblockmusic.po b/package/lean/luci-app-unblockmusic/po/zh_Hans/unblockmusic.po new file mode 100644 index 0000000000..07fcb644c0 --- /dev/null +++ b/package/lean/luci-app-unblockmusic/po/zh_Hans/unblockmusic.po @@ -0,0 +1,13 @@ + +msgid "Unblock Netease Music" +msgstr "解锁网易云灰色歌曲" + +msgid "Base Setting" +msgstr "基本设置" + +msgid "Log" +msgstr "日志" + +msgid "Port" +msgstr "端口" + diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh index 78dc4d5897..78eeea3473 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh @@ -6,9 +6,12 @@ log_size=0 while true do - sleep 10m - icount=`busybox ps -w | grep UnblockNeteaseMusic |grep -v grep` + ipset -! -N music hash:ip + sleep 10s + wget-ssl -q -t 99 -T 10 http://httpdns.n.netease.com/httpdns/v2/d?domain=music.163.com,interface.music.163.com,interface3.music.163.com,apm.music.163.com,apm3.music.163.com,clientlog.music.163.com,clientlog3.music.163.com -O- | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset -! add music "$1}' | sh + icount=`busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh` [ -z "$icount" ] && /etc/init.d/unblockmusic restart log_size=$(expr $(ls -l $log_file | awk '{print $5}') / 1024) [ $log_size -ge $log_max_size ] && echo "$(date -R) # Start UnblockNeteaseMusic" >/tmp/unblockmusic.log + sleep 30s done