Merge pull request #1186 from sofia-riese/redesign-6

feat(6_core_config.sh): improve UI/UX
This commit is contained in:
juewuy
2026-01-29 07:55:39 +08:00
committed by GitHub
2 changed files with 283 additions and 191 deletions

View File

@@ -30,15 +30,16 @@ set_core_config() {
comp_box "\033[30;47m配置文件管理\033[0m"
[ -n "$list" ] && {
content_line "\033[36m输入数字可管理对应提供者\033[0m"
content_line ""
list_box "$list"
separator_line "-"
}
content_line "a) \033[32m添加提供者\033[0m(支持订阅/分享链接及本地文件)"
content_line "b) \033[36m本地生成配置文件\033[0m(By Providers,推荐!)"
content_line "c) \033[33m在线生成配置文件\033[0m(By Subconverter)"
content_line "a) \033[32m添加提供者\033[0m支持订阅分享链接及本地文件"
content_line "b) \033[36m本地生成配置文件\033[0mBy Providers推荐!"
content_line "c) \033[33m在线生成配置文件\033[0mBy Subconverter"
content_line "d) \033[31m清空提供者列表\033[0m"
content_line "e) \033[36m自定义配置文件\033[0m"
content_line ""
common_back
read -r -p "$COMMON_INPUT_L> " num
case "$num" in
@@ -58,7 +59,7 @@ set_core_config() {
. "$CRASHDIR"/menus/providers.sh
providers
else
msg_alert "\033[33m仅限Mihomo/singboxr内核使用,请更换内核!\033[0m"
msg_alert "\033[33m仅限Mihomosingboxr内核使用请更换内核!\033[0m"
fi
else
msg_alert "请先添加提供者!"
@@ -73,10 +74,12 @@ set_core_config() {
fi
;;
d)
separator_line "="
content_line "\033[33m警告这将删除所有提供者且无法还原\033[0m"
separator_line "-"
read -r -p "确认清空提供者列表?(1/0) > " res
comp_box "\033[33m警告这将删除所有提供者且无法还原\033[0m" \
"" \
"是否确认清空提供者列表:"
btm_box "1) 是" \
"0) 否,返回上级菜单"
read -r -p "$COMMON_INPUT> " res
[ "$res" = 1 ] && {
rm -f "$CRASHDIR"/configs/providers.cfg
rm -f "$CRASHDIR"/configs/providers_uri.cfg
@@ -84,26 +87,26 @@ set_core_config() {
}
;;
e)
checkcfg=$(cat $CFG_PATH)
checkcfg=$(cat "$CFG_PATH")
. "$CRASHDIR"/menus/override.sh && override
if [ -n "$PID" ]; then
checkcfg_new=$(cat $CFG_PATH)
checkcfg_new=$(cat "$CFG_PATH")
[ "$checkcfg" != "$checkcfg_new" ] && checkrestart
fi
;;
*)
error_letter
break
;;
esac
done
}
# 添加/管理提供者
setproviders() {
case "$(echo "$@" | cut -d ' ' -f 2)" in
http* | ./providers*)
set -- $@
set -- "$@"
name=$1
link=$2
interval=$3
@@ -113,7 +116,7 @@ setproviders() {
include_w=${7#\#}
;;
*://*)
set -- $line
set -- "$line"
name=$1
link_uri=$2
;;
@@ -125,24 +128,27 @@ setproviders() {
[ -z "$interval" ] && interval=3
[ -z "$interval2" ] && interval2=12
[ -z "$ua" ] && ua='clash.meta'
while true; do
link_info=$(echo "$link$link_uri" | cut -c 1-30)
comp_box "\033[36m支持添加订阅链接/分享链接/本地文件作为提供者\033[0m"
content_line "1) 设置\033[36m名称或代号\033[0m \033[32m$name\033[0m"
content_line "2) 设置\033[32m链接或路径\033[0m \033[36m$link_info...\033[0m"
content_line "2) 设置\033[32m链接或路径\033[0m \033[36m$link_info\033[0m"
[ -n "$link" ] &&
content_line "3) 设置\033[33m本地生成覆写\033[0m"
separator_line "-"
content_line ""
content_line "a) \033[36m保存此提供者\033[0m"
[ -n "$link" ] &&
content_line "b) \033[32m本地生成\033[0m仅包含此提供者的配置文件"
echo "$link$link_uri" | grep -q '://' &&
content_line "c) \033[33m在线生成\033[0m仅包含此提供者的配置文件"
echo "$link" | grep -q '^http' &&
content_line "e) 从此订阅链接直接拉取配置文件(不经过订阅转换)"
content_line "e) 从此订阅链接直接拉取配置文件不经过订阅转换"
echo "$link" | grep -q '^./providers' &&
content_line "e) 直接使用此文件作为配置文件(不经过本地生成)"
content_line "e) 直接使用此文件作为配置文件不经过本地生成"
content_line "d) \033[31m删除此提供者\033[0m"
content_line ""
common_back
read -r -p "请输入对应字母或数字> " input
case "$input" in
@@ -150,24 +156,32 @@ setproviders() {
break
;;
1)
separator_line "="
content_line "注意:不可重复,不支持纯数字,且不要超过4个汉字"
separator_line "-"
read -r -p "输入具体名称或代号 > " text
while true; do
comp_box "\033[33m注意\n名称或代号不可重复不支持纯数字且不要超过4个汉字\033[0m"
btm_box "\033[36m请直接输入具体名称或代号\033[0m" \
"输入 0 返回上级菜单"
read -r -p "请输入> " text
text=$(printf "%.12s" "$text" | sed 's/ //g') # 截断12字符+去空格
if [ -n "$text" ] && [ -z "$(echo "$text" | grep -E '^[0-9]+$')" ] && ! grep -q "^$text " "$CRASHDIR"/configs/providers.cfg; then
if [ "$text" = 0 ]; then
break
elif [ -n "$text" ] && [ -z "$(echo "$text" | grep -E '^[0-9]+$')" ] && ! grep -q "^$text " "$CRASHDIR"/configs/providers.cfg; then
name="$text"
common_success
break
else
error_input
fi
done
;;
2)
separator_line "="
content_line "\033[33m订阅链接\033[0m: https/http开头的clash配置文件订阅链接"
content_line "\033[36m分享链接\033[0m: $URI_EXP"
content_line "\033[33m本地文件\033[0m: 必须放在此目录下:\033[32m$CRASHDIR/providers\033[0m"
content_line "\033[36m Base64 \033[0m: 请直接写入本地文件"
separator_line "-"
while true; do
comp_box "\033[33m订阅链接\033[0m\nhttps/http开头的clash配置文件订阅链接" \
"" \
"\033[36m分享链接\033[0m\n$URI_EXP" \
"" \
"\033[33m本地文件\033[0m\n必须放在\033[32m$CRASHDIR/providers\033[0m目录下" \
"" \
"\033[36mBase64 \033[0m\n请直接写入本地文件"
list=$(
for f in "$CRASHDIR"/providers/*; do
[ "$f" = "$CRASHDIR"/providers/uri_group ] && continue
@@ -177,19 +191,26 @@ setproviders() {
)
if [ -n "$list" ]; then
list_box "$list"
separator_line "-"
btm_box "" \
"输入 0 返回上级菜单"
read -r -p "请选择对应文件或输入具体链接> " text
else
read -r -p "请输入具体链接 > " text
btm_box "\033[36m请直接输入具体链接\033[0m" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " text
fi
text=$(echo "$text" | sed 's/ //g') # 去空格
case "$text" in
0)
break
;;
http*)
# 处理订阅链接
text=$(echo "$text" | sed 's/ *(.*)//g; s/#.*//g') # 处理注释及超链接
link="$text"
link_uri=''
common_success
break
;;
[1-9] | [1-9][0-9])
# 处理本地文件
@@ -199,22 +220,25 @@ setproviders() {
[ -z "$name" ] && name="_$(printf "%.12s" "$file" | sed 's/ //g')"
link_uri=''
common_success
break
else
errornum
fi
;;
*)
# 处理分享链接
if [ -n "$(echo $text | grep -E "^$URI_EXP")" ]; then
if [ -n "$(echo "$text" | grep -E "^$URI_EXP")" ]; then
link_uri=$(echo "$text" | sed 's/#.*//g') # 删除注释
link=''
[ -z "$name" ] && name=$(printf '%b' "$(printf '%s' "$text" | sed 's/+/ /g; s/%/\\x/g')" | sed 's/.*#//')
common_success
break
else
error_input
fi
;;
esac
done
;;
3)
custproviders
@@ -229,7 +253,7 @@ setproviders() {
. "$CRASHDIR/menus/providers_$CORE_TYPE.sh"
gen_providers "$name" "$link" "$interval" "$interval2" "$ua" "#$exclude_w" "#$include_w"
else
content_line "\033[31m$请先完成必填选项!\033[0m"
msg_alert "\033[31m$请先完成必填选项!\033[0m"
fi
;;
c)
@@ -243,24 +267,26 @@ setproviders() {
# 获取在线文件
jump_core_config
else
content_line "\033[31m请先完成必填选项\033[0m"
msg_alert "\033[31m请先完成必填选项\033[0m"
fi
;;
d)
if [ -n "$name" ] && [ -n "$link" ]; then
sed -i "/^$name /d" "$CRASHDIR"/configs/providers.cfg
content_line "\033[32m$COMMON_SUCCESS\033[0m"
msg_alert "\033[32m$COMMON_SUCCESS\033[0m"
elif [ -n "$name" ] && [ -n "$link_uri" ]; then
sed -i "/^$name /d" "$CRASHDIR"/configs/providers_uri.cfg
content_line "\033[32m$COMMON_SUCCESS\033[0m"
msg_alert "\033[32m$COMMON_SUCCESS\033[0m"
fi
break
;;
e)
if [ -n "$link" ]; then
content_line "注意:\033[31m此功能不兼容“跳过证书验证”功能\033[0m"
content_line "\033[31m请确认你完全理解自己在做什么\033[0m"
read -p "我确认遇到问题可以自行解决(1/0) > " res
comp_box "\033[31m注意:\n此功能不兼容“跳过证书验证”功能\033[0m" \
"\033[31m请确认你完全理解自己在做什么\033[0m"
btm_box "1) 我确认遇到问题可以自行解决" \
"0) 返回上级菜单"
read -r -p "$COMMON_INPUT> " res
[ "$res" = "1" ] && {
file=$(echo "$CRASHDIR/$link" | sed 's|\./||')
if [ -f "$file" ]; then
@@ -278,21 +304,20 @@ setproviders() {
jump_core_config
break
else
content_line "\033[31m请先完成必填选项\033[0m"
msg_alert "\033[31m请先完成必填选项\033[0m"
fi
}
else
content_line "\033[31m请先完成必填选项\033[0m"
sleep 1
msg_alert "\033[31m请先完成必填选项\033[0m"
fi
;;
*)
error_letter
break
;;
esac
done
}
# 保存
saveproviders() {
[ -n "$name" ] && {
@@ -310,16 +335,19 @@ saveproviders() {
return 1
fi
}
# 本地生成覆写
custproviders() {
while true; do
separator_line '-'
content_line "1) 设置\033[33m健康检查间隔\033[0m\t\033[47;30m$interval\033[0m"
content_line "2) 设置\033[36m自动更新间隔\033[0m\t\033[47;30m$interval2\033[0m"
line_break
separator_line "="
content_line "1) 设置\033[33m健康检查间隔\033[0m\t\033[47;30m$interval\033[0m 分钟"
content_line "2) 设置\033[36m自动更新间隔\033[0m\t\033[47;30m$interval2\033[0m 小时"
echo "$link" | grep -q '^http' &&
content_line "3) 设置\033[33m虚拟浏览器UA\033[0m\t\033[47;30m$ua\033[0m"
content_line "4) 设置\033[31m排除节点正则\033[0m\t\033[47;30m$exclude_w\033[0m"
content_line "5) 设置\033[32m包含节点正则\033[0m\t\033[47;30m$include_w\033[0m"
content_line ""
common_back
read -r -p "请输入对应数字> " num
case "$num" in
@@ -327,70 +355,136 @@ custproviders() {
break
;;
1)
read -p "请输入健康检查间隔(单位:分钟) > " num
if [ -n "$num" ]; then
while true; do
comp_box "当前健康检查间隔:$interval 分钟"
btm_box "\033[36m请直接健康检查间隔单位分钟\033[0m" \
"或输入 r 重置健康检查间隔为默认值3 分钟)" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " num
if [ "$num" = "r" ]; then
interval=3
elif [ -n "$num" ] && [ "$num" -eq "$num" ] 2>/dev/null; then
interval="$num"
else
errornum
continue
fi
common_success
break
done
;;
2)
read -p "请输入自动更新间隔(单位:小时) > " num
if [ -n "$num" ]; then
while true; do
comp_box "当前健康检查间隔:$interval 分钟"
btm_box "\033[36m请直接输入自动更新间隔单位小时\033[0m" \
"或输入 r 重置自动更新间隔为默认值12 小时)" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " num
if [ "$num" = "r" ]; then
interval2=12
elif [ -n "$num" ] && [ "$num" -eq "$num" ] 2>/dev/null; then
interval2="$num"
else
errornum
continue
fi
common_success
break
done
;;
3)
read -p "请输入浏览器UA(输入0重置) > " text
if [ -z "$ua" ]; then
comp_box "当前浏览器UA无"
else
comp_box "当前浏览器UA$ua"
fi
btm_box "\033[36m请直接输入浏览器UA\033[0m" \
"或输入 r 重置浏览器UA为默认值clash.meta" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " text
case "$text" in
0)
include_w='clash.meta'
continue
;;
r)
ua='clash.meta'
;;
*)
include_w="$text"
ua="$text"
;;
esac
common_success
;;
4)
read -p "请输入需要排除的节点关键字(支持正则,不支持空格,输入0删除) > " text
if [ -z "$exclude_w" ]; then
comp_box "当前排除规则:无"
else
comp_box "当前排除规则:$exclude_w"
fi
btm_box "\033[36m请直接输入需要排除的节点关键字支持正则不支持空格\033[0m" \
"或输入 c 清空排除规则" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " text
text=$(echo "$text" | sed 's/ //g') # 去空格
case "$text" in
0)
continue
;;
c)
exclude_w=''
;;
*)
exclude_w="$text"
;;
esac
common_success
;;
5)
read -p "请输入需要筛选使用的节点关键字(支持正则,不支持空格,输入0删除) > " text
if [ -z "$include_w" ]; then
comp_box "当前包含规则:无"
else
comp_box "当前包含规则:$include_w"
fi
btm_box "\033[36m请直接输入需要包含的节点关键字支持正则不支持空格\033[0m" \
"或输入 c 清空包含规则" \
"或输入 0 返回上级菜单"
read -r -p "请输入> " text
text=$(echo "$text" | sed 's/ //g') # 去空格
case "$text" in
0)
continue
;;
c)
include_w=''
;;
*)
include_w="$text"
;;
esac
common_success
;;
*)
error_letter
break
;;
esac
done
}
# 调用工具在线获取配置文件
jump_core_config() {
. "$CRASHDIR"/starts/core_config.sh && get_core_config
if [ "$?" = 0 ]; then
if [ "$inuserguide" != 1 ]; then
read -p "是否启动服务以使配置文件生效(1/0) > " res
[ "$res" = 1 ] && start_core || main_menu
comp_box "是否启动服务以使配置文件生效"
btm_box "1) 是" \
"0) 否"
read -r -p "$COMMON_INPUT> " res
if [ "$res" = 1 ]; then
start_core
else
main_menu
fi
exit
fi
fi

View File

@@ -80,7 +80,5 @@ cancel_back() {
}
common_success() {
separator_line "-"
content_line "\033[32m$COMMON_SUCCESS\033[0m"
sleep 1
msg_alert "\033[32m$COMMON_SUCCESS\033[0m"
}