fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-unblockneteasemusic-go: fix bugs

Browse Source
This commit is contained in:
CN_SZTL 2019-12-28 20:16:41 +08:00
parent d400486667
commit 4a411353e8
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/ctcgfw/luci-app-unblockneteasemusic-go/luasrc/controller/unblockneteasemusic-go.lua
View File

@ -15,12 +15,11 @@ function index()
entry({"admin", "services", "unblockneteasemusic-go", "log"},form("unblockneteasemusicgo_log"), _("日志"), 2)
entry({"admin", "services", "unblockneteasemusic-go", "status"},call("act_status")).leaf=true
entry({"admin", "services", "unblockneteasemusic-go", "update_core"},call("act_update_core"))
end
function act_status()
local e={}
e.running=luci.sys.call("ps |grep UnblockNeteaseMusic-Go |grep -v grep >/dev/null")==0
e.running=luci.sys.call("pidof UnblockNeteaseMusic >/dev/null")==0
luci.http.prepare_content("application/json")
luci.http.write_json(e)
end

4
package/ctcgfw/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic-go.lua
View File

@ -1,7 +1,7 @@
mp = Map("unblockneteasemusic", translate("解除网易云音乐播放限制"))
mp = Map("unblockneteasemusic-go", translate("解除网易云音乐播放限制"))
mp.description = translate("原理：采用 [酷我/酷狗/咕咪] 音源，替换网易云音乐 无版权/收费 歌曲链接<br/>具体使用方法参见：https://github.com/project-openwrt/luci-app-unblockneteasemusic-go")
mp:section(SimpleSection).template = "unblockneteasemusic-go/unblockneteasemusicgo_status"
mp:section(SimpleSection).template = "unblockneteasemusic-go/unblockneteasemusic_go_status"
s = mp:section(TypedSection, "unblockneteasemusic-go")
s.anonymous=true

4
package/ctcgfw/luci-app-unblockneteasemusic-go/luasrc/view/unblockneteasemusic-go/unblockneteasemusicgo_status.htm → package/ctcgfw/luci-app-unblockneteasemusic-go/luasrc/view/unblockneteasemusic-go/unblockneteasemusic_go_status.htm
View File

@ -1,7 +1,7 @@
<script type="text/javascript">//<![CDATA[
XHR.poll(3, '<%=url([[admin]], [[services]], [[unblockneteasemusic-go]], [[status]])%>', null,
function(x, data) {
var tb = document.getElementById('unblockneteasemusicgo_status');
var tb = document.getElementById('unblockneteasemusic_go_status');
if (data && tb) {
if (data.running) {
var links = '<em><b><font color=green>UnblockNeteaseMusic-Go <%:RUNNING%></font></b></em>';
@ -16,7 +16,7 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[unblockneteasemusic-go]], [[statu
</script>
<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
<fieldset class="cbi-section">
<p id="unblockneteasemusicgo_status">
<p id="unblockneteasemusic_go_status">
<em><%:Collecting data...%></em>
</p>
</fieldset>

23
package/ctcgfw/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic-go
View File

@ -12,7 +12,6 @@ http_port="$(uci get unblockneteasemusic-go.@unblockneteasemusic-go[0].http_port
https_port="$(uci get unblockneteasemusic-go.@unblockneteasemusic-go[0].https_port)"
music_source="$(uci get unblockneteasemusic-go.@unblockneteasemusic-go[0].music_source)"
hijack_ways="$(uci get unblockneteasemusic-go.@unblockneteasemusic-go[0].hijack_ways)"
[
set_ipset(){
if [ "${set_type}" = "start" ]; then
@ -25,7 +24,7 @@ ipset=/interface3.music.163.com/musicgo
ipset=/apm.music.163.com/musicgo
ipset=/apm3.music.163.com/musicgo
EOF
/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
/etc/init.d/dnsmasq reload > "/dev/null" 2>&1
if ! ipset list musicgo > "/dev/null"; then ipset create musicgo hash:ip; fi
curl -s "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" |grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' |sort |uniq |awk '{print "ipset add musicgo "$1}' |bash > "/dev/null" 2>&1
@ -54,7 +53,7 @@ ipset=/apm3.music.163.com/musicgo
echo "" > "/var/etc/unblockneteasemusic-go.include"
rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-go.conf"
/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
/etc/init.d/dnsmasq reload > "/dev/null" 2>&1
fi
}
@ -70,16 +69,12 @@ address=/apm.music.163.com/${lan_addr}
address=/apm3.music.163.com/${lan_addr}
address=/music.httpdns.c.163.com/0.0.0.0
EOF
/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
echo "" > "/var/etc/unblockneteasemusic-go.include"
/etc/init.d/dnsmasq reload > "/dev/null" 2>&1
ip route add 223.252.199.10 dev lo
elif [ "${set_type}" = "stop" ]; then
rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-go.conf"
/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
echo "" > "/var/etc/unblockneteasemusic-go.include"
/etc/init.d/dnsmasq reload > "/dev/null" 2>&1
ip route del 223.252.199.10
fi
@ -90,8 +85,6 @@ start()
stop
[ "${enable}" -ne "1" ] && exit 0
UnblockNeteaseMusic -m 0 -c /usr/share/UnblockNeteaseMusic-Go/server.crt -k /usr/share/UnblockNeteaseMusic-Go/server.key -p 5200 -sp 5201 -o migu:kugou
if [ "${music_source}" = "default" ]; then
nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -m "0" -c "/usr/share/UnblockNeteaseMusic-Go/server.crt" -k "/usr/share/UnblockNeteaseMusic-Go/server.key" > "/tmp/unblockneteasemusic-go.log" 2>&1 &
else
@ -99,9 +92,9 @@ UnblockNeteaseMusic -m 0 -c /usr/share/UnblockNeteaseMusic-Go/server.crt -k /usr
fi
set_type="start"
if [ "*${hijack_ways}*" = "*use_ipset*" ]; then
if [ "${hijack_ways}" = "use_ipset" ]; then
set_ipset > "/dev/null" 2>&1
elif [ "*${hijack_ways}*" = "*use_hosts*" ]; then
elif [ "${hijack_ways}" = "use_hosts" ]; then
set_hosts > "/dev/null" 2>&1
fi
@ -114,10 +107,10 @@ stop()
{
killall -9 "UnblockNeteaseMusic" > "/dev/null" 2>&1
sed -i '/unblockneteasemusic-go/d' "/etc/crontabs/root"
sed -i '/UnblockNeteaseMusic-Go/d' "/etc/crontabs/root"
/etc/init.d/cron restart > "/dev/null" 2>&1
rm -f "/tmp/unblockneteasemusic.log"
rm -f "/tmp/unblockneteasemusic-go.log"
set_type="stop"
set_ipset > "/dev/null" 2>&1