Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
d1584c10
Commit
d1584c10
authored
Feb 18, 2022
by
longpanda
Browse files
Add tip when save ventoy.json failed.
parent
43e92187
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
Plugson/src/Core/ventoy_util.h
Plugson/src/Core/ventoy_util.h
+1
-0
Plugson/src/Web/ventoy_http.c
Plugson/src/Web/ventoy_http.c
+4
-2
Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe
Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe
+0
-0
Plugson/www/static/js/vtoy.js
Plugson/www/static/js/vtoy.js
+2
-1
No files found.
Plugson/src/Core/ventoy_util.h
View file @
d1584c10
...
@@ -88,6 +88,7 @@ typedef struct SYSINFO
...
@@ -88,6 +88,7 @@ typedef struct SYSINFO
char
buildtime
[
128
];
char
buildtime
[
128
];
int
syntax_error
;
int
syntax_error
;
int
invalid_config
;
int
invalid_config
;
int
config_save_error
;
int
language
;
int
language
;
int
pathcase
;
int
pathcase
;
...
...
Plugson/src/Web/ventoy_http.c
View file @
d1584c10
...
@@ -325,8 +325,7 @@ static int ventoy_api_sysinfo(struct mg_connection *conn, VTOY_JSON *json)
...
@@ -325,8 +325,7 @@ static int ventoy_api_sysinfo(struct mg_connection *conn, VTOY_JSON *json)
VTOY_JSON_FMT_SINT
(
"invalid_config"
,
g_sysinfo
.
invalid_config
);
VTOY_JSON_FMT_SINT
(
"invalid_config"
,
g_sysinfo
.
invalid_config
);
g_sysinfo
.
invalid_config
=
0
;
g_sysinfo
.
invalid_config
=
0
;
#if defined(_MSC_VER) || defined(WIN32)
#if defined(_MSC_VER) || defined(WIN32)
VTOY_JSON_FMT_STRN
(
"os"
,
"windows"
);
VTOY_JSON_FMT_STRN
(
"os"
,
"windows"
);
#else
#else
...
@@ -349,6 +348,8 @@ static int ventoy_api_handshake(struct mg_connection *conn, VTOY_JSON *json)
...
@@ -349,6 +348,8 @@ static int ventoy_api_handshake(struct mg_connection *conn, VTOY_JSON *json)
VTOY_JSON_FMT_BEGIN
(
pos
,
JSON_BUFFER
,
JSON_BUF_MAX
);
VTOY_JSON_FMT_BEGIN
(
pos
,
JSON_BUFFER
,
JSON_BUF_MAX
);
VTOY_JSON_FMT_OBJ_BEGIN
();
VTOY_JSON_FMT_OBJ_BEGIN
();
VTOY_JSON_FMT_SINT
(
"status"
,
0
);
VTOY_JSON_FMT_SINT
(
"status"
,
0
);
VTOY_JSON_FMT_SINT
(
"save_error"
,
g_sysinfo
.
config_save_error
);
g_sysinfo
.
config_save_error
=
0
;
VTOY_JSON_FMT_OBJ_END
();
VTOY_JSON_FMT_OBJ_END
();
VTOY_JSON_FMT_END
(
pos
);
VTOY_JSON_FMT_END
(
pos
);
...
@@ -3577,6 +3578,7 @@ int ventoy_http_writeback(void)
...
@@ -3577,6 +3578,7 @@ int ventoy_http_writeback(void)
if
(
ret
)
if
(
ret
)
{
{
vlog
(
"Failed to write ventoy.json file.
\n
"
);
vlog
(
"Failed to write ventoy.json file.
\n
"
);
g_sysinfo
.
config_save_error
=
1
;
}
}
return
0
;
return
0
;
...
...
Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe
View file @
d1584c10
No preview for this file type
Plugson/www/static/js/vtoy.js
View file @
d1584c10
...
@@ -480,6 +480,7 @@ var g_vtoy_cur_language_en =
...
@@ -480,6 +480,7 @@ var g_vtoy_cur_language_en =
"
STR_SECURE_BOOT_DISABLE
"
:
"
Disable
"
,
"
STR_SECURE_BOOT_DISABLE
"
:
"
Disable
"
,
"
STR_SYNTAX_ERROR_TIP
"
:
"
Syntax error detected in ventoy.json, so the configuration is not loaded!
"
,
"
STR_SYNTAX_ERROR_TIP
"
:
"
Syntax error detected in ventoy.json, so the configuration is not loaded!
"
,
"
STR_INVALID_CONFIG_TIP
"
:
"
Invalid configuration detected in ventoy.json, so the configuration is not loaded!
"
,
"
STR_INVALID_CONFIG_TIP
"
:
"
Invalid configuration detected in ventoy.json, so the configuration is not loaded!
"
,
"
STR_CONFIG_SAVE_ERROR_TIP
"
:
"
Failed to write ventoy.json file. Check VentoyPlugson.log for more details!
"
,
"
STR_XXX
"
:
"
xxx
"
"
STR_XXX
"
:
"
xxx
"
};
};
...
@@ -615,7 +616,7 @@ var g_vtoy_cur_language_cn =
...
@@ -615,7 +616,7 @@ var g_vtoy_cur_language_cn =
"
STR_SECURE_BOOT_DISABLE
"
:
"
未开启
"
,
"
STR_SECURE_BOOT_DISABLE
"
:
"
未开启
"
,
"
STR_SYNTAX_ERROR_TIP
"
:
"
ventoy.json 文件中存在语法错误,配置未加载!
"
,
"
STR_SYNTAX_ERROR_TIP
"
:
"
ventoy.json 文件中存在语法错误,配置未加载!
"
,
"
STR_INVALID_CONFIG_TIP
"
:
"
ventoy.json 文件中存在错误配置,配置未加载!
"
,
"
STR_INVALID_CONFIG_TIP
"
:
"
ventoy.json 文件中存在错误配置,配置未加载!
"
,
"
STR_CONFIG_SAVE_ERROR_TIP
"
:
"
ventoy.json 文件写入失败,详细信息请参考 VentoyPlugson.log 文件!
"
,
"
STR_XXX
"
:
"
xxx
"
"
STR_XXX
"
:
"
xxx
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment