MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VentoyPlugson: Add Windows duplicate file path check for different upper/lower case.

This commit is contained in:
longpanda 2022-12-21 13:21:54 +08:00
parent 9b7d6cbc3d
commit 3e75b2df3b
16 changed files with 178 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugson/src/Core/ventoy_util_windows.c
View File

@ -638,7 +638,8 @@ int CheckRuntimeEnvironment(char Letter, ventoy_disk *disk)
return 1;
}
if (_stricmp(FsName, "NTFS") == 0)
/* Fix: enable for all file system on Windows */
/* if (_stricmp(FsName, "NTFS") == 0) */
{
disk->pathcase = 1;
}

128
Plugson/src/Web/ventoy_http.c
View File

@ -21,6 +21,7 @@
#include <stdint.h>
#include <string.h>
#include <stdarg.h>
#include <stddef.h>
#include <errno.h>
#include <time.h>
@ -97,6 +98,9 @@ static char *g_pub_save_buffer = NULL;
static pthread_mutex_t g_api_mutex;
static struct mg_context *g_ventoy_http_ctx = NULL;
#define ventoy_is_real_exist_common(xpath, xnode, xtype) \
ventoy_path_is_real_exist(xpath, xnode, offsetof(xtype, path), offsetof(xtype, next))
static int ventoy_is_kbd_valid(const char *key)
{
int i = 0;
@ -170,6 +174,40 @@ static void ventoy_free_path_node_list(path_node *list)
}
}
static int ventoy_path_is_real_exist(const char *path, void *head, size_t pathoff, size_t nextoff)
{
char *node = NULL;
const char *nodepath = NULL;
const char *realpath = NULL;
char pathbuf[MAX_PATH];
if (strchr(path, '*'))
{
return 0;
}
realpath = ventoy_real_path(path);
scnprintf(pathbuf, sizeof(pathbuf), "%s", realpath);
node = (char *)head;
while (node)
{
nodepath = node + pathoff;
if (NULL == strchr(nodepath, '*'))
{
realpath = ventoy_real_path(nodepath);
if (strcmp(pathbuf, realpath) == 0)
{
return 1;
}
}
memcpy(&node, node + nextoff, sizeof(node));
}
return 0;
}
static path_node * ventoy_path_node_add_array(VTOY_JSON *array)
{
path_node *head = NULL;
@ -913,16 +951,15 @@ static int ventoy_api_save_theme(struct mg_connection *conn, VTOY_JSON *json)
return 0;
}
static int ventoy_api_theme_add_file(struct mg_connection *conn, VTOY_JSON *json)
{
int ret;
int index = 0;
const char *path = NULL;
const char *realpath = NULL;
path_node *node = NULL;
path_node *cur = NULL;
data_theme *data = NULL;
char pathbuf[MAX_PATH];
vtoy_json_get_int(json, "index", &index);
data = g_data_theme + index;
@ -930,19 +967,12 @@ static int ventoy_api_theme_add_file(struct mg_connection *conn, VTOY_JSON *json
path = VTOY_JSON_STR_EX("path");
if (path)
{
realpath = ventoy_real_path(path);
scnprintf(pathbuf, sizeof(pathbuf), "%s", realpath);
for (node = data->filelist; node; node = node->next)
if (ventoy_is_real_exist_common(path, data->filelist, path_node))
{
realpath = ventoy_real_path(node->path);
if (strcmp(pathbuf, realpath) == 0)
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(path_node));
if (node)
{
@ -989,17 +1019,14 @@ static int ventoy_api_theme_del_file(struct mg_connection *conn, VTOY_JSON *json
return 0;
}
static int ventoy_api_theme_add_font(struct mg_connection *conn, VTOY_JSON *json)
{
int ret;
int index = 0;
const char *path = NULL;
const char *realpath = NULL;
path_node *node = NULL;
path_node *cur = NULL;
data_theme *data = NULL;
char pathbuf[MAX_PATH];
vtoy_json_get_int(json, "index", &index);
data = g_data_theme + index;
@ -1007,19 +1034,12 @@ static int ventoy_api_theme_add_font(struct mg_connection *conn, VTOY_JSON *json
path = VTOY_JSON_STR_EX("path");
if (path)
{
realpath = ventoy_real_path(path);
scnprintf(pathbuf, sizeof(pathbuf), "%s", realpath);
for (node = data->fontslist; node; node = node->next)
if (ventoy_is_real_exist_common(path, data->fontslist, path_node))
{
realpath = ventoy_real_path(node->path);
if (strcmp(pathbuf, realpath) == 0)
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(path_node));
if (node)
{
@ -1222,6 +1242,12 @@ static int ventoy_api_alias_add(struct mg_connection *conn, VTOY_JSON *json)
alias = VTOY_JSON_STR_EX("alias");
if (path && alias)
{
if (ventoy_is_real_exist_common(path, data->list, data_alias_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(data_alias_node));
if (node)
{
@ -1467,6 +1493,12 @@ static int ventoy_api_tip_add(struct mg_connection *conn, VTOY_JSON *json)
tip = VTOY_JSON_STR_EX("tip");
if (path && tip)
{
if (ventoy_is_real_exist_common(path, data->list, data_tip_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(data_tip_node));
if (node)
{
@ -1816,6 +1848,12 @@ static int ventoy_api_auto_memdisk_add(struct mg_connection *conn, VTOY_JSON *js
path = VTOY_JSON_STR_EX("path");
if (path)
{
if (ventoy_is_real_exist_common(path, data->list, path_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(path_node));
if (node)
{
@ -1998,6 +2036,12 @@ static int ventoy_api_image_list_add(struct mg_connection *conn, VTOY_JSON *json
path = VTOY_JSON_STR_EX("path");
if (path)
{
if (ventoy_is_real_exist_common(path, data->list, path_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(path_node));
if (node)
{
@ -2253,6 +2297,12 @@ static int ventoy_api_password_add(struct mg_connection *conn, VTOY_JSON *json)
pwd = VTOY_JSON_STR_EX("pwd");
if (path && pwd)
{
if (ventoy_is_real_exist_common(path, data->list, menu_password))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(menu_password));
if (node)
{
@ -2658,6 +2708,12 @@ static int ventoy_api_dud_add(struct mg_connection *conn, VTOY_JSON *json)
path = VTOY_JSON_STR_EX("path");
if (path && array)
{
if (ventoy_is_real_exist_common(path, data->list, dud_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(dud_node));
if (node)
{
@ -3013,6 +3069,12 @@ static int ventoy_api_auto_install_add(struct mg_connection *conn, VTOY_JSON *js
path = VTOY_JSON_STR_EX("path");
if (path && array)
{
if (ventoy_is_real_exist_common(path, data->list, auto_install_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(auto_install_node));
if (node)
{
@ -3355,6 +3417,12 @@ static int ventoy_api_persistence_add(struct mg_connection *conn, VTOY_JSON *jso
path = VTOY_JSON_STR_EX("path");
if (path && array)
{
if (ventoy_is_real_exist_common(path, data->list, persistence_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(persistence_node));
if (node)
{
@ -3648,6 +3716,12 @@ static int ventoy_api_injection_add(struct mg_connection *conn, VTOY_JSON *json)
archive = VTOY_JSON_STR_EX("archive");
if (path && archive)
{
if (ventoy_is_real_exist_common(path, data->list, injection_node))
{
ventoy_json_result(conn, VTOY_JSON_DUPLICATE);
return 0;
}
node = zalloc(sizeof(injection_node));
if (node)
{

BIN
Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe
View File

Binary file not shown.

BIN
Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe
View File

Binary file not shown.

2
Plugson/www/buildtime
View File

@ -1 +1 @@
20221220 18:30:51
20221221 12:11:59

8
Plugson/www/index.html
View File

@ -757,7 +757,7 @@
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b id="plugson_build_date">20221220 19:41:37</b>
<b id="plugson_build_date">20221221 12:11:59</b>
</div>
<strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>
</footer>
@ -777,10 +777,10 @@
<script src="/static/js/jQuery-2.1.4.min.js"></script>
<!-- jquery validate -->
<script src="/static/js/jquery.validate.min.js"></script>
<script src="/static/js/jquery.validate.vtoymethods.js?v=102"></script>
<script src="/static/js/jquery.validate.vtoymethods.js?v=103"></script>
<script src="/static/js/jquery.vtoy.alert.js?v=102"></script>
<script src="/static/js/vtoy.js?v=102"></script>
<script src="/static/js/jquery.vtoy.alert.js?v=103"></script>
<script src="/static/js/vtoy.js?v=103"></script>
<script src="/static/js/md5.min.js"></script>
<!-- Bootstrap 3.3.5 -->

10
Plugson/www/plugson_auto_install.html
View File

@ -359,9 +359,13 @@
template: call_array,
type: type
}, function(e) {
list.push(data);
FillAutoInsTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillAutoInsTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_auto_memdisk.html
View File

@ -131,9 +131,13 @@
index: current_tab_index,
path: data.path,
}, function(e) {
list.push(data);
FillMemdiskTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillMemdiskTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_dud.html
View File

@ -203,9 +203,13 @@
dud: call_array,
type: type
}, function(e) {
list.push(data);
FillDudTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillDudTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_image_list.html
View File

@ -221,9 +221,13 @@
index: current_tab_index,
path: data.path,
}, function(e) {
list.push(data);
FillImageListTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillImageListTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_injection.html
View File

@ -158,9 +158,13 @@
archive: data.archive,
type: type
}, function(e) {
list.push(data);
FillInjectionTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillInjectionTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_menu_alias.html
View File

@ -152,9 +152,13 @@
alias: data.alias,
type: type
}, function(e) {
list.push(data);
FillAliasTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillAliasTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_menu_class.html
View File

@ -178,9 +178,13 @@
class: data.class,
type: type
}, function(e) {
list.push(data);
FillClassTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillClassTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_menu_tip.html
View File

@ -244,9 +244,13 @@
tip: data.tip,
type: type
}, function(e) {
list.push(data);
FillTipTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillTipTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_password.html
View File

@ -464,9 +464,13 @@ function VtoySetPassword(common, type, cb, data) {
path: data.path,
pwd: data.pwd
}, function(e) {
list.push(data);
FillMenuPwdTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillMenuPwdTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}

10
Plugson/www/plugson_persistence.html
View File

@ -358,9 +358,13 @@
backend: call_array,
type: type
}, function(e) {
list.push(data);
FillPersistenceTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
if (e.result === 'success') {
list.push(data);
FillPersistenceTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
}
});
}