From 31cc9922ac86bcacc117a24dd4cc0da55d8e3a2e Mon Sep 17 00:00:00 2001
From: Hugo Yuan <429632952@163.com>
Date: Wed, 20 May 2020 10:02:10 +0800
Subject: [PATCH] luci-app-unblockmusic: Refresh ipset music list when ifup
 (#4576)

* luci-app-unblockmusic: Refresh ipset music list when ifup

* Update 099-unblockmusic
---
 .../root/etc/hotplug.d/iface/099-unblockmusic                    | 1 +
 package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic  | 1 +
 .../root/usr/share/UnblockNeteaseMusic/logcheck.sh               | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic
index 3a3c0d92c..3caadee09 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic
@@ -3,4 +3,5 @@
 [ "$ACTION" = ifup ] || exit 0
 
 sleep 10
+ipset flush music 2>/dev/null
 /usr/share/UnblockNeteaseMusic/getmusicip.sh
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 3fdc4f9a7..66dc0f97b 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -111,6 +111,7 @@ del_rule(){
 	$ipt_n -X CLOUD_MUSIC  2>/dev/null
 	iptables -D OUTPUT -d 223.252.199.10 -j DROP 2>/dev/null
 	
+	ipset flush music 2>/dev/null
 	ipset -X music_http 2>/dev/null
 	ipset -X music_https 2>/dev/null
 	
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 8d53d96c3..7a6d48712 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
@@ -11,7 +11,6 @@ while true
 do
   icount=`busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh`
 	if [ -z "$icount" ]; then
-      /usr/share/UnblockNeteaseMusic/getmusicip.sh
       /etc/init.d/unblockmusic restart 
   fi
 	log_size=$(expr $(ls -l $log_file | awk '{print $5}') / 1024)