jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix filesystem file edit

Browse Source
This commit is contained in:
Theo Arends 2021-04-16 17:24:49 +02:00
parent 7fe9b14713
commit fa31d776c3
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
tasmota/xdrv_50_filesystem.ino
View File

@ -588,15 +588,15 @@ const char UFS_FORM_SDC_HREFedit[] PROGMEM =
"<a href=ufse?file=%s/%s>&#x1F4DD;</a>"; // 📝 "<a href=ufse?file=%s/%s>&#x1F4DD;</a>"; // 📝
const char HTTP_EDITOR_FORM_START[] PROGMEM = const char HTTP_EDITOR_FORM_START[] PROGMEM =
"<fieldset><legend><b>&nbsp;" D_EDIT_FILE "&nbsp;</b></legend>" "<fieldset><legend><b>&nbsp;" D_EDIT_FILE "&nbsp;</b></legend>"
"<form>" "<form>"
"<label for='name'>" D_FILE ":</label><input type='text' id='name' name='name' value='%s'><br><hr width='98%%'>" "<label for='name'>" D_FILE ":</label><input type='text' id='name' name='name' value='%s'><br><hr width='98%%'>"
"<textarea id='content' name='content' rows='8' cols='80' style='font-size: 12pt'>"; "<textarea id='content' name='content' rows='8' cols='80' style='font-size: 12pt'>";
const char HTTP_EDITOR_FORM_END[] PROGMEM = const char HTTP_EDITOR_FORM_END[] PROGMEM =
"</textarea>" "</textarea>"
"<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ufse' class='button bgrn'>" D_SAVE "</button>" "<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ufse' class='button bgrn'>" D_SAVE "</button>"
"</form></fieldset>"; "</form></fieldset>";
#endif // #ifdef GUI_EDIT_FILE #endif // #ifdef GUI_EDIT_FILE
@ -905,7 +905,6 @@ void UfsUploadFileClose(void) {
ufs_upload_file.close(); ufs_upload_file.close();
} }
//****************************************************************************************** //******************************************************************************************
// File Editor // File Editor
//****************************************************************************************** //******************************************************************************************
@ -917,45 +916,44 @@ void UfsEditor(void) {
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor GET")); AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor GET"));
String fname; char fname_input[UFS_FILENAME_SIZE];
if (Webserver->hasArg(F("file"))) { if (Webserver->hasArg(F("file"))) {
fname = Webserver->arg(F("file")); WebGetArg(PSTR("file"), fname_input, sizeof(fname_input));
} else {
snprintf_P(fname_input, sizeof(fname_input), PSTR(D_NEW_FILE));
} }
else { char fname[UFS_FILENAME_SIZE];
fname = D_NEW_FILE; UfsFilename(fname, fname_input); // Trim spaces and add slash
}
if (fname[0] != '/') fname = "/" +fname;
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file=%s, ffs_type=%d, TfsFileExist=%d"), fname.c_str(), ffs_type, TfsFileExists(fname.c_str())); AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file=%s, ffs_type=%d, TfsFileExist=%d"), fname, ffs_type, TfsFileExists(fname));
WSContentStart_P(PSTR(D_EDIT_FILE)); WSContentStart_P(PSTR(D_EDIT_FILE));
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(HTTP_EDITOR_FORM_START, fname.c_str()); char *bfname = fname +1;
WSContentSend_P(HTTP_EDITOR_FORM_START, bfname); // Skip leading slash
if (ffs_type && TfsFileExists(fname.c_str())) { if (ffs_type && TfsFileExists(fname)) {
File fp = ffsp->open(fname.c_str(), "r"); File fp = ffsp->open(fname, "r");
if (!fp) { if (!fp) {
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file open failed")); AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file open failed"));
WSContentSend_P(D_NEW_FILE); WSContentSend_P(D_NEW_FILE);
} else {
uint8_t *buf = (uint8_t*)malloc(FILE_BUFFER_SIZE+1);
size_t filelen = fp.size();
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file len=%d"), filelen);
while (filelen > 0) {
size_t l = fp.read(buf, FILE_BUFFER_SIZE);
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("UFS: UfsEditor: read=%d"), l);
if (l < 0) { break; }
buf[l] = '\0';
WSContentSend_P((const char*)buf);
filelen -= l;
}
fp.close();
free(buf);
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: read done"));
} }
else { } else {
uint8_t *buf = (uint8_t*)malloc(FILE_BUFFER_SIZE+1);
size_t filelen = fp.size();
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file len=%d"), filelen);
while ( filelen > 0 ) {
size_t l = fp.read(buf, FILE_BUFFER_SIZE);
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("UFS: UfsEditor: read=%d"), l);
if (l < 0) break;
buf[l] = '\0';
WSContentSend_P((const char*)buf);
filelen -= l;
}
fp.close();
free(buf);
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: read done"));
}
}
else {
WSContentSend_P(D_NEW_FILE); WSContentSend_P(D_NEW_FILE);
} }
@ -974,8 +972,12 @@ void UfsEditorUpload(void) {
WSSend(400, CT_PLAIN, F("400: Bad request - no filename")); WSSend(400, CT_PLAIN, F("400: Bad request - no filename"));
return; return;
} }
String name = Webserver->arg("name");
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file '%s'"), name.c_str()); char fname_input[UFS_FILENAME_SIZE];
WebGetArg(PSTR("name"), fname_input, sizeof(fname_input));
char fname[UFS_FILENAME_SIZE];
UfsFilename(fname, fname_input); // Trim spaces and add slash
AddLog(LOG_LEVEL_DEBUG, PSTR("UFS: UfsEditor: file '%s'"), fname);
if (!Webserver->hasArg("content")) { if (!Webserver->hasArg("content")) {
AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: file upload - no content")); AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: file upload - no content"));
@ -991,10 +993,10 @@ void UfsEditorUpload(void) {
return; return;
} }
File fp = ffsp->open(name.c_str(), "w"); File fp = ffsp->open(fname, "w");
if(!fp) { if (!fp) {
Web.upload_error = 1; Web.upload_error = 1;
AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: 400: invalid file name '%s'"), name.c_str()); AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: 400: invalid file name '%s'"), fname);
WSSend(400, CT_PLAIN, F("400: bad request - invalid filename")); WSSend(400, CT_PLAIN, F("400: bad request - invalid filename"));
return; return;
} }
@ -1005,7 +1007,7 @@ void UfsEditorUpload(void) {
} }
if (!fp.print(content)) { if (!fp.print(content)) {
AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: write error on '%s'"), name.c_str()); AddLog(LOG_LEVEL_ERROR, PSTR("UFS: UfsEditor: write error on '%s'"), fname);
} }
fp.close(); fp.close();
@ -1014,7 +1016,7 @@ void UfsEditorUpload(void) {
Webserver->send(303); Webserver->send(303);
} }
#endif // #ifdef GUI_EDIT_FILE #endif // GUI_EDIT_FILE
#endif // USE_WEBSERVER #endif // USE_WEBSERVER