zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix adding folders

Browse Source
This commit is contained in:
zefie
2022-12-05 21:07:04 -05:00
parent 8cd5148b04
commit 871b4919fa
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js
View File

@@ -2,35 +2,34 @@ var minisrv_service_file = true;
var foldername = request_headers.query.new_folder_name; var foldername = request_headers.query.new_folder_name;
var favstore_exists = session_data.favstore.favstoreExists(); var favstore_exists = session_data.favstore.favstoreExists();
var folder_exists = session_data.favstore.folderExists(foldername); var valid_foldername = session_data.favstore.checkFolderName(foldername);
var folder_array = session_data.favstore.getFolders();
if (foldername)
{ if (!valid_foldername) {
if (favstore_exists != true) headers = `400 That folder name is not valid. Choose a different name and try again.`
} else {
var folder_exists = session_data.favstore.folderExists(foldername);
var folder_array = session_data.favstore.getFolders();
if (foldername) {
if (favstore_exists === false)
session_data.favstore.createFavstore(); session_data.favstore.createFavstore();
if (folder_exists != true) if (folder_exists === false) {
{ if (folder_array.length < minisrv_config.services[service_name].max_folders) {
if (folder_array.length < minisrv_config.services[service_name].max_folders)
{
if (session_data.favstore.checkFolderName(foldername) == true)
{
session_data.favstore.createFolder(foldername); session_data.favstore.createFolder(foldername);
headers = `300 OK headers = `300 OK
Connection: Keep-Alive Connection: Keep-Alive
Content-Type: text/html Content-Type: text/html
Location: wtv-favorite:/favorite Location: wtv-favorite:/favorite
wtv-expire-all: wtv-favorite:` wtv-expire-all: wtv-favorite:`
} else {
headers = `400 That folder name is not valid. Choose a different name and try again.`
}
} else { } else {
headers = `400 You can only have ${minisrv_config.services[service_name].max_folders} folders at one time. Delete some folders and try again.` headers = `400 You can only have ${minisrv_config.services[service_name].max_folders} folders at one time. Delete some folders and try again.`
} }
} else { } else {
headers = `400 That folder already exists. Choose a different name and try again.` headers = `400 That folder already exists. Choose a different name and try again.`
} }
} else { } else {
headers = `400 Please type a folder name.` headers = `400 Please type a folder name.`
}
} }

12
zefie_wtvp_minisrv/includes/classes/WTVFavorites.js
View File

@@ -75,14 +75,6 @@ class WTVFavorites {
return store_dir; return store_dir;
} }
checkFolderName(foldername) {
var regex_str = "^([A-Za-z0-9\-\_]{1,}$";
var regex = new RegExp(regex_str);
return regex.test(foldername);
}
createTemplateFolder(folder) { createTemplateFolder(folder) {
// create emply folder // create emply folder
this.createFolder(folder) this.createFolder(folder)
@@ -231,9 +223,7 @@ class WTVFavorites {
} }
checkFolderName(folder) { checkFolderName(folder) {
var check1 = /^([A-Za-z0-9\-\_])$/.test(folder); return /^([a-z0-9\-\_\ ]{3,})$/i.test(folder);
var check2 = /^[A-Za-z]/.test(folder);
return (check1 && check2);
} }
deleteFavorite(favoriteid, folder) { deleteFavorite(favoriteid, folder) {