瀏覽代碼

adjust some settings

CN_SZTL 6 年之前
父節點
當前提交
088124b957
共有 4 個文件被更改,包括 8 次插入10 次删除
  1. 1 1
      README.md
  2. 1 1
      luasrc/model/cbi/unblockneteasemusic.lua
  3. 2 2
      root/etc/config/unblockneteasemusic
  4. 4 6
      root/etc/init.d/unblockneteasemusic

+ 1 - 1
README.md

@@ -18,7 +18,7 @@
 
 ## 编译
 ```bash
-    #进入OpenWRT/LEDE源码package目录
+    #进入OpenWrt源码package目录
     cd package
     #克隆插件源码
     git clone https://github.com/project-openwrt/luci-app-unblockneteasemusic.git

+ 1 - 1
luasrc/model/cbi/unblockneteasemusic.lua

@@ -35,7 +35,7 @@ speedtype:value("kugou", translate("酷狗音乐"))
 speedtype:value("kuwo", translate("酷我音乐"))
 speedtype:value("migu", translate("咕咪音乐"))
 speedtype:value("joox", translate("JOOX音乐"))
-speedtype:value("all", translate("所有平台"))
+speedtype:value("youtube", translate("Youtube音乐"))
 speedtype.description = translate("音源调用接口")
 speedtype.default = "default"
 speedtype.rmempty = false

+ 2 - 2
root/etc/config/unblockneteasemusic

@@ -1,9 +1,9 @@
 
 config unblockneteasemusic
-	option enabled '0'
+	option enable '0'
 	option http_port '5200'
 	option https_port '5201'
-	option musicapptype 'default'
+	option music_source 'default'
 	option hijack_ways 'dont_hijack'
 	option auto_update '0'
 	option advanced_mode '0'

+ 4 - 6
root/etc/init.d/unblockneteasemusic

@@ -7,10 +7,10 @@ STOP=10
 
 lan_addr="$(uci get network.lan.ipaddr)"
 
-enable="$(uci get unblockneteasemusic.@unblockneteasemusic[0].enabled)"
+enable="$(uci get unblockneteasemusic.@unblockneteasemusic[0].enable)"
 http_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].http_port)"
 https_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].https_port)"
-type="$(uci get unblockneteasemusic.@unblockneteasemusic[0].musicapptype)"
+music_source="$(uci get unblockneteasemusic.@unblockneteasemusic[0].music_source)"
 hijack_ways="$(uci get unblockneteasemusic.@unblockneteasemusic[0].hijack_ways)"
 auto_update="$(uci get unblockneteasemusic.@unblockneteasemusic[0].auto_update)"
 [ "*$(uci get unblockneteasemusic.@unblockneteasemusic[0].pub_access 2>/dev/null)*" = "*1*" ] && addr="0.0.0.0" || addr="${lan_addr}"
@@ -123,12 +123,10 @@ start()
 	[ ! -e "/usr/share/unblockneteasemusic/core/app.js" ] && rm -f /usr/share/unblockneteasemusic/local_ver && bash /usr/share/unblockneteasemusic/update_core.sh
 	[ ! -e "/usr/share/unblockneteasemusic/core/app.js" ] && echo "Core Not Found, please download it before starting." >>/tmp/unblockneteasemusic.log && exit 1
 
-	if [ "${type}" = "default" ]; then
+	if [ "${music_source}" = "default" ]; then
 		nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
-	elif [ "${type}" = "all" ]; then
-		nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" -o "kuwo qq xiami baidu kugou migu joox" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
 	else
-		nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" -o "${type}" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
+		nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" -o "${music_source}" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
 	fi
 
 	if [ "*${hijack_ways}*" = "*use_ipset*" ]; then