chore(config): make port settings simple

Signed-off-by: Tianling Shen <[email protected]>

htdocs/luci-static/resources/view/unblockneteasemusic/config.js

@@ -157,7 +157,7 @@ return view.extend({
 		o.default = o.disabled;
 
 		o = s.option(form.ListValue, 'replace_music_source', _('音源替换'),
-			_('当音乐音质低于指定数值时，尝试强制使用其他平台的高音质版本进行替换。'));
+			_('当源音乐音质低于指定数值时，尝试强制使用其他平台的高音质版本进行替换。'));
 		o.value('dont_replace', _('不强制替换音乐音源'));
 		o.value('lower_than_192kbps', _('当音质低于 192 Kbps（中）时'));
 		o.value('lower_than_320kbps', _('当音质低于 320 Kbps（高）时'));
@@ -165,18 +165,18 @@ return view.extend({
 		o.value('replace_all', _('替换所有音乐音源'));
 		o.default = 'dont_replace';
 
+		o = s.option(form.Flag, 'disable_upgrade_check', _('禁用更新检查'),
+			_('拦截网易云音乐客户端更新请求，全平台支持。'));
+		o.default = o.disabled;
+
 		o = s.option(form.Flag, 'block_ads', _('屏蔽广告'),
-			('开启后，可屏蔽应用内<strong>部分</strong>广告。'));
+			('启用后，可屏蔽应用内<strong>部分</strong>广告。'));
 		o.default = o.disabled;
 
 		o = s.option(form.Flag, 'local_vip', _('启用本地 VIP'),
 			_('启用后，可以使用去广告、个性换肤、鲸云音效等本地功能。'));
 		o.default = o.disabled;
 
-		o = s.option(form.Flag, 'disable_upgrade_check', _('禁用更新检查'),
-			_('拦截网易云音乐客户端更新请求，全平台支持。'));
-		o.default = o.disabled;
-
 		o = s.option(form.Flag, 'auto_update', _('启用自动更新'),
 			_('启用后，每天将定时自动检查最新核心版本并更新。'));
 		o.default = o.disabled;
@@ -207,7 +207,7 @@ return view.extend({
 		}
 
 		o = s.option(form.Flag, 'advanced_mode', _('启用进阶设置'),
-			_('非必要不推荐使用。'));
+			_('非必要不推荐启用。'));
 		o.default = o.disabled,
 
 		o = s.option(form.ListValue, 'log_level', _('日志等级'));
@@ -221,13 +221,15 @@ return view.extend({
 		o.datatype = 'port';
 		o.default = '5200';
 		o.rmempty = false;
-		o.depends('advanced_mode', '1');
+		o.depends('hijack_ways', 'dont_hijack');
+		o.depends('hijack_ways', 'use_ipset');
 
 		o = s.option(form.Value, 'https_port', _('HTTPS 监听端口'));
 		o.datatype = 'port';
 		o.default = '5201';
 		o.rmempty = false;
-		o.depends('advanced_mode', '1');
+		o.depends('hijack_ways', 'dont_hijack');
+		o.depends('hijack_ways', 'use_ipset');
 
 		o = s.option(form.Value, 'endpoint_url', _('EndPoint'),
 			_('音源地址反代（包装）。'));
@@ -240,36 +242,14 @@ return view.extend({
 		o.placeholder = 'http(s)://host:port'
 		o.depends('advanced_mode', '1');
 
-		o = s.option(form.ListValue, 'hijack_ways', _('劫持方法'));
+		o = s.option(form.ListValue, 'hijack_ways', _('劫持方法'),
+			 _('如果使用 Hosts 劫持，监听端口将固定为 80/443，请注意更改您的 webUI 端口。'));
 		o.value('dont_hijack', _('不开启劫持'));
 		o.value('use_ipset', _('使用 IPSet 劫持'));
 		o.value('use_hosts', _('使用 Hosts 劫持'));
 		o.default = 'dont_hijack';
 		o.rmempty = false;
 		o.depends('advanced_mode', '1');
-		o.onchange = function(ev, section_id, value) {
-			if (!section_id || !value)
-				return null;
-
-			var ele_http_port = this.map.findElement('id', 'widget.cbid.unblockneteasemusic.%s.http_port'.format(section_id));
-			var ele_https_port = this.map.findElement('id', 'widget.cbid.unblockneteasemusic.%s.https_port'.format(section_id));
-
-			if (value === 'use_hosts') {
-				ele_http_port.value = '80';
-				ele_http_port.disabled = true;
-
-				ele_https_port.value = '443';
-				ele_https_port.disabled = true;
-			} else if (ele_http_port.disabled || ele_https_port.disabled) {
-				L.resolveDefault(this.map.data.loaded.unblockneteasemusic).then((res) => {
-					ele_http_port.disabled = null;
-					ele_http_port.value = res.config.http_port || '5200';
-
-					ele_https_port.disabled = null;
-					ele_https_port.value = res.config.https_port || '5201';
-				});
-			}
-		}
 
 		o = s.option(form.Flag, 'keep_core_when_upgrade', _('升级时保留核心程序'));
 		o.default = o.disabled;

root/etc/init.d/unblockneteasemusic

@@ -106,6 +106,7 @@ start_service() {
 	config_get http_port "config" "http_port" "5200"
 	config_get https_port "config" "https_port" "5201"
 	config_get hijack_ways "config" "hijack_ways" "use_ipset"
+	[ "$hijack_ways" != "use_hosts" ] || { http_port="80"; https_port="443"; }
 	append_param "-p" "${http_port}":"${https_port}"
 
 	if [ -n "$FW4" ]; then
@@ -152,9 +153,9 @@ start_service() {
 	append_param_boolenv "config" "search_album" "SEARCH_ALBUM"
 	append_param_boolenv "config" "enable_flac" "ENABLE_FLAC"
 	append_param_boolenv "config" "select_max_br" "SELECT_MAX_BR"
+	append_param_boolenv "config" "disable_upgrade_check" "DISABLE_UPGRADE_CHECK"
 	append_param_boolenv "config" "block_ads" "BLOCK_ADS"
 	append_param_boolenv "config" "local_vip" "ENABLE_LOCAL_VIP"
-	append_param_boolenv "config" "disable_upgrade_check" "DISABLE_UPGRADE_CHECK"
 	case "$(config_get "config" "replace_music_source")" in
 		"lower_than_192kbps") procd_append_param env MIN_BR="192000" ;;
 		"lower_than_320kbps") procd_append_param env MIN_BR="320000" ;;

root/etc/uci-defaults/luci-unblockneteasemusic

@@ -5,14 +5,6 @@ if [ "$(uci -q get unblockneteasemusic.config.music_source)" = "default" ]; then
 	uci -q commit "unblockneteasemusic"
 fi
 
-if [ "$(uci -q get unblockneteasemusic.config.hijack_ways)" = "use_hosts" ]; then
-	[ "$(uci -q get "unblockneteasemusic.config.http_port")" = "80" ] || {
-		uci -q set "unblockneteasemusic.config.http_port"="80"
-		uci -q set "unblockneteasemusic.config.https_port"="443"
-		uci -q commit "unblockneteasemusic"
-	}
-fi
-
 uci -q batch <<-EOF >"/dev/null"
 	delete ucitrack.@unblockneteasemusic[-1]
 	commit ucitrack