Pārlūkot izejas kodu

feat(config): adapt new local_vip settings

Signed-off-by: Tianling Shen <[email protected]>
(cherry picked from commit a311f4f82b5cb825ab766b39da92d2017079eb30)
Tianling Shen 2 gadi atpakaļ
vecāks
revīzija
1073b03f5d

+ 6 - 4
luasrc/model/cbi/unblockneteasemusic/main.lua

@@ -73,12 +73,12 @@ o.description = translate("选择所有音源中的最高码率替换音频。")
 o.default = 0
 o.default = 0
 
 
 o = s:option(ListValue, "replace_music_source", translate("音源替换"))
 o = s:option(ListValue, "replace_music_source", translate("音源替换"))
+o.description = translate("当音乐音质低于指定数值时,尝试强制使用其他平台的高音质版本进行替换")
 o:value("dont_replace", translate("不强制替换音乐音源"))
 o:value("dont_replace", translate("不强制替换音乐音源"))
 o:value("lower_than_192kbps", translate("当音质低于 192 Kbps(中)时"))
 o:value("lower_than_192kbps", translate("当音质低于 192 Kbps(中)时"))
 o:value("lower_than_320kbps", translate("当音质低于 320 Kbps(高)时"))
 o:value("lower_than_320kbps", translate("当音质低于 320 Kbps(高)时"))
 o:value("lower_than_999kbps", translate("当音质低于 999 Kbps(无损)时"))
 o:value("lower_than_999kbps", translate("当音质低于 999 Kbps(无损)时"))
 o:value("replace_all", translate("替换所有音乐音源"))
 o:value("replace_all", translate("替换所有音乐音源"))
-o.description = translate("当音乐音质低于指定数值时,尝试强制使用其他平台的高音质版本进行替换")
 o.default = "dont_replace"
 o.default = "dont_replace"
 
 
 o = s:option(Flag, "disable_upgrade_check", translate("禁用更新检查"))
 o = s:option(Flag, "disable_upgrade_check", translate("禁用更新检查"))
@@ -89,9 +89,11 @@ o = s:option(Flag, "block_ads", translate("屏蔽广告"))
 o.description = translate("启用后,可屏蔽应用内部分广告。")
 o.description = translate("启用后,可屏蔽应用内部分广告。")
 o.default = 0
 o.default = 0
 
 
-o = s:option(Flag, "local_vip", translate("启用本地 VIP"))
-o.description = translate("启用后,可以使用去广告、个性换肤、鲸云音效等本地功能")
-o.default = 0
+o = s:option(ListValue, "local_vip", translate("伪装本地 VIP"))
+o.description = translate("设置后,可以使用去广告、个性换肤、鲸云音效等本地功能")
+o:value("", translate("禁用"))
+o:value("cvip", translate("CVIP"))
+o:value("svip", translate("SVIP"))
 
 
 o = s:option(Flag, "auto_update", translate("启用自动更新"))
 o = s:option(Flag, "auto_update", translate("启用自动更新"))
 o.description = translate("启用后,每天将定时自动检查最新版本并更新")
 o.description = translate("启用后,每天将定时自动检查最新版本并更新")

+ 1 - 1
root/etc/init.d/unblockneteasemusic

@@ -124,6 +124,7 @@ start_service() {
 	append_param_env "config" "youtube_key" "YOUTUBE_KEY"
 	append_param_env "config" "youtube_key" "YOUTUBE_KEY"
 	append_param_env "config" "self_issue_cert_crt" "SIGN_CERT" "$UNM_DIR/core/server.crt"
 	append_param_env "config" "self_issue_cert_crt" "SIGN_CERT" "$UNM_DIR/core/server.crt"
 	append_param_env "config" "self_issue_cert_key" "SIGN_KEY" "$UNM_DIR/core/server.key"
 	append_param_env "config" "self_issue_cert_key" "SIGN_KEY" "$UNM_DIR/core/server.key"
+	append_param_env "config" "local_vip" "ENABLE_LOCAL_VIP"
 
 
 	append_param_boolenv "config" "follow_source_order" "FOLLOW_SOURCE_ORDER"
 	append_param_boolenv "config" "follow_source_order" "FOLLOW_SOURCE_ORDER"
 	append_param_boolenv "config" "search_album" "SEARCH_ALBUM"
 	append_param_boolenv "config" "search_album" "SEARCH_ALBUM"
@@ -131,7 +132,6 @@ start_service() {
 	append_param_boolenv "config" "select_max_br" "SELECT_MAX_BR"
 	append_param_boolenv "config" "select_max_br" "SELECT_MAX_BR"
 	append_param_boolenv "config" "disable_upgrade_check" "DISABLE_UPGRADE_CHECK"
 	append_param_boolenv "config" "disable_upgrade_check" "DISABLE_UPGRADE_CHECK"
 	append_param_boolenv "config" "block_ads" "BLOCK_ADS"
 	append_param_boolenv "config" "block_ads" "BLOCK_ADS"
-	append_param_boolenv "config" "local_vip" "ENABLE_LOCAL_VIP"
 	case "$(config_get "config" "replace_music_source")" in
 	case "$(config_get "config" "replace_music_source")" in
 		"lower_than_192kbps") procd_append_param env MIN_BR="192000" ;;
 		"lower_than_192kbps") procd_append_param env MIN_BR="192000" ;;
 		"lower_than_320kbps") procd_append_param env MIN_BR="320000" ;;
 		"lower_than_320kbps") procd_append_param env MIN_BR="320000" ;;

+ 4 - 0
root/etc/uci-defaults/luci-unblockneteasemusic

@@ -1,5 +1,9 @@
 #!/bin/sh
 #!/bin/sh
 
 
+sed -e "s,local_vip '1',local_vip 'cvip',g" \
+    -e "/local_vip '0'/d" \
+	-i "/etc/config/unblockneteasemusic"
+
 uci -q batch <<-EOF >"/dev/null"
 uci -q batch <<-EOF >"/dev/null"
 	delete ucitrack.@unblockneteasemusic[-1]
 	delete ucitrack.@unblockneteasemusic[-1]
 	add ucitrack unblockneteasemusic
 	add ucitrack unblockneteasemusic