jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10476 from gemu2015/filemanager

Browse Source 
Filemanager
This commit is contained in:
Theo Arends 2021-01-09 16:41:08 +01:00 committed by GitHub
commit 4217880946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
esp32_partition_app1984k_spiffs60k.csv
View File

@ -1,8 +0,0 @@
# ESP-IDF Partition Table
# Name, Type, SubType, Offset, Size, Flags
nvs,data,nvs,0x9000,20K,
otadata,data,ota,0xe000,8K,
app0,app,ota_0,0x10000,1984K,
app1,app,ota_1,0x200000,1984K,
spiffs,data,spiffs,0x3f0000,60K,
eeprom,data,nvs,0x3ff000,4K,
1 # ESP-IDF Partition Table
2 # Name, Type, SubType, Offset, Size, Flags
3 nvs,data,nvs,0x9000,20K,
4 otadata,data,ota,0xe000,8K,
5 app0,app,ota_0,0x10000,1984K,
6 app1,app,ota_1,0x200000,1984K,
7 spiffs,data,spiffs,0x3f0000,60K,
8 eeprom,data,nvs,0x3ff000,4K,

23
tasmota/xdrv_50_filesystem.ino
View File

@ -440,9 +440,15 @@ const char UFS_FORM_FILE_UPGb[] PROGMEM =
const char UFS_FORM_SDC_DIRd[] PROGMEM =
"<pre><a href='%s' file='%s'>%s</a></pre>";
const char UFS_FORM_SDC_DIRb[] PROGMEM =
"<pre><a href='%s' file='%s'>%s</a> %s %8d</pre>";
"<pre><a href='%s' file='%s'>%s</a> %s %8d %s</pre>";
const char UFS_FORM_SDC_HREF[] PROGMEM =
"http://%s/ufsd?download=%s/%s";
#ifdef GUI_TRASH_FILE
const char UFS_FORM_SDC_HREFdel[] PROGMEM =
//"<a href=http://%s/ufsd?delete=%s/%s>&#128465;</a>";
"<a href=http://%s/ufsd?delete=%s/%s>&#128293;</a>"; // 🔥
#endif // GUI_TRASH_FILE
void UfsDirectory(void) {
uint8_t depth = 0;
@ -471,6 +477,12 @@ void UfsDirectory(void) {
}
}
if (Webserver->hasArg("delete")) {
String stmp = Webserver->arg("delete");
char *cp = (char*)stmp.c_str();
dfsp->remove(cp);
}
WSContentStart_P(PSTR(D_MANAGE_FILE_SYSTEM));
WSContentSendStyle();
WSContentSend_P(UFS_FORM_FILE_UPLOAD);
@ -561,8 +573,15 @@ void UfsListDir(char *path, uint8_t depth) {
UfsListDir(path, depth + 4);
path[plen] = 0;
} else {
#ifdef GUI_TRASH_FILE
char delpath[128];
snprintf_P(delpath, sizeof(delpath), UFS_FORM_SDC_HREFdel, WiFi.localIP().toString().c_str(), pp, ep);
#else
char delpath[2];
delpath[0]=0;
#endif // GUI_TRASH_FILE
snprintf_P(npath, sizeof(npath), UFS_FORM_SDC_HREF, WiFi.localIP().toString().c_str(), pp, ep);
WSContentSend_P(UFS_FORM_SDC_DIRb, npath, ep, name, tstr.c_str(), entry.size());
WSContentSend_P(UFS_FORM_SDC_DIRb, npath, ep, name, tstr.c_str(), entry.size(), delpath);
}
}
entry.close();