GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-04 19:40:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix _filename

Browse Source 
remove /. reference
This commit is contained in:
Luc 2019-10-17 20:35:41 +02:00
parent 5cede996cc
commit e7818cb5e6
3 changed files with 41 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
esp3d/src/modules/filesystem/sd/sd_native_esp32.cpp
View File

@ -224,27 +224,10 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
if (!tSDFile_handle[i]) { if (!tSDFile_handle[i]) {
tSDFile_handle[i] = *((File*)handle); tSDFile_handle[i] = *((File*)handle);
//filename //filename
_filename = tSDFile_handle[i].name(); _name = tSDFile_handle[i].name();
_filename = path;
//if root if (_name.endsWith("/")) {
if (_filename == "/") { _name.remove( _name.length() - 1,1);
_filename = "/.";
}
if (_isdir) {
if (_filename[_filename.length()-1] != '.') {
if (_filename[_filename.length()-2] != '/') {
_filename+="/";
}
_filename+=".";
}
}
//name
if (_filename == "/.") {
_name = "/";
} else {
_name = _filename;
if (_name.endsWith("/.")) {
_name.remove( _name.length() - 2,2);
_isfakedir = true; _isfakedir = true;
_isdir = true; _isdir = true;
} }
@ -255,7 +238,6 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
if (pos != -1) { if (pos != -1) {
_name.remove( 0, pos+1); _name.remove( 0, pos+1);
} }
}
//size //size
_size = tSDFile_handle[i].size(); _size = tSDFile_handle[i].size();
//time //time
@ -299,39 +281,14 @@ ESP_SDFile ESP_SDFile::openNextFile()
return ESP_SDFile(); return ESP_SDFile();
} }
File tmp = tSDFile_handle[_index].openNextFile(); File tmp = tSDFile_handle[_index].openNextFile();
while (tmp) { if (tmp) {
log_esp3d("tmp name :%s %s", tmp.name(), (tmp.isDirectory())?"isDir":"isFile"); log_esp3d("tmp name :%s %s %s", tmp.name(), (tmp.isDirectory())?"isDir":"isFile", _filename.c_str());
ESP_SDFile esptmp(&tmp, tmp.isDirectory()); String s = tmp.name() ;
//if (s!="/")s+="/";
//s += tmp.name();
ESP_SDFile esptmp(&tmp, tmp.isDirectory(),false, s.c_str());
esptmp.close(); esptmp.close();
String sub = esptmp.filename();
sub.remove(0,_filename.length()-1);
int pos = sub.indexOf("/");
if (pos!=-1) {
//is subdir
sub = sub.substring(0,pos);
//log_esp3d("file name:%s name: %s %s sub:%s root:%s", esptmp.filename(), esptmp.name(), (esptmp.isDirectory())?"isDir":"isFile", sub.c_str(), _filename.c_str());
String tag = "*" + sub + "*";
//test if already in directory list
if (_dirlist.indexOf(tag) == -1) {//not in list so add it and return the info
_dirlist+= tag;
String fname = _filename.substring(0,_filename.length()-1) + sub + "/.";
//log_esp3d("Found dir name: %s filename:%s", sub.c_str(), fname.c_str());
esptmp = ESP_SDFile(sub.c_str(), fname.c_str());
return esptmp; return esptmp;
} else { //already in list so ignore it
//log_esp3d("Dir name: %s already in list", sub.c_str());
tmp = tSDFile_handle[_index].openNextFile();
}
} else { //is file
//log_esp3d("file name:%s name: %s %s sub:%s root:%s", esptmp.filename(), esptmp.name(), (esptmp.isDirectory())?"isDir":"isFile", sub.c_str(), _filename.c_str());
if (sub == ".") {
//log_esp3d("Dir tag, ignore it");
tmp = tSDFile_handle[_index].openNextFile();
} else {
return esptmp;
}
}
} }
return ESP_SDFile(); return ESP_SDFile();
} }

3
esp3d/src/modules/filesystem/sd/sd_native_esp8266.cpp
View File

@ -226,9 +226,6 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
_index = -1; _index = -1;
_filename = ""; _filename = "";
_name = ""; _name = "";
//TODO: FIXME
//forget what is for
(void)path;
#ifdef FILESYSTEM_TIMESTAMP_FEATURE #ifdef FILESYSTEM_TIMESTAMP_FEATURE
memset (&_lastwrite,0,sizeof(time_t)); memset (&_lastwrite,0,sizeof(time_t));
#endif //FILESYSTEM_TIMESTAMP_FEATURE #endif //FILESYSTEM_TIMESTAMP_FEATURE

72
esp3d/src/modules/filesystem/sd/sdio_esp32.cpp
View File

@ -213,27 +213,10 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
if (!tSDFile_handle[i]) { if (!tSDFile_handle[i]) {
tSDFile_handle[i] = *((File*)handle); tSDFile_handle[i] = *((File*)handle);
//filename //filename
_filename = tSDFile_handle[i].name(); _name = tSDFile_handle[i].name();
_filename = path;
//if root if (_name.endsWith("/")) {
if (_filename == "/") { _name.remove( _name.length() - 1,1);
_filename = "/.";
}
if (_isdir) {
if (_filename[_filename.length()-1] != '.') {
if (_filename[_filename.length()-2] != '/') {
_filename+="/";
}
_filename+=".";
}
}
//name
if (_filename == "/.") {
_name = "/";
} else {
_name = _filename;
if (_name.endsWith("/.")) {
_name.remove( _name.length() - 2,2);
_isfakedir = true; _isfakedir = true;
_isdir = true; _isdir = true;
} }
@ -244,7 +227,6 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
if (pos != -1) { if (pos != -1) {
_name.remove( 0, pos+1); _name.remove( 0, pos+1);
} }
}
//size //size
_size = tSDFile_handle[i].size(); _size = tSDFile_handle[i].size();
//time //time
@ -288,53 +270,27 @@ ESP_SDFile ESP_SDFile::openNextFile()
return ESP_SDFile(); return ESP_SDFile();
} }
File tmp = tSDFile_handle[_index].openNextFile(); File tmp = tSDFile_handle[_index].openNextFile();
while (tmp) { if (tmp) {
log_esp3d("tmp name :%s %s", tmp.name(), (tmp.isDirectory())?"isDir":"isFile"); log_esp3d("tmp name :%s %s %s", tmp.name(), (tmp.isDirectory())?"isDir":"isFile", _filename.c_str());
ESP_SDFile esptmp(&tmp, tmp.isDirectory()); String s = tmp.name() ;
//if (s!="/")s+="/";
//s += tmp.name();
ESP_SDFile esptmp(&tmp, tmp.isDirectory(),false, s.c_str());
esptmp.close(); esptmp.close();
String sub = esptmp.filename();
sub.remove(0,_filename.length()-1);
int pos = sub.indexOf("/");
if (pos!=-1) {
//is subdir
sub = sub.substring(0,pos);
//log_esp3d("file name:%s name: %s %s sub:%s root:%s", esptmp.filename(), esptmp.name(), (esptmp.isDirectory())?"isDir":"isFile", sub.c_str(), _filename.c_str());
String tag = "*" + sub + "*";
//test if already in directory list
if (_dirlist.indexOf(tag) == -1) {//not in list so add it and return the info
_dirlist+= tag;
String fname = _filename.substring(0,_filename.length()-1) + sub + "/.";
//log_esp3d("Found dir name: %s filename:%s", sub.c_str(), fname.c_str());
esptmp = ESP_SDFile(sub.c_str(), fname.c_str());
return esptmp; return esptmp;
} else { //already in list so ignore it
//log_esp3d("Dir name: %s already in list", sub.c_str());
tmp = tSDFile_handle[_index].openNextFile();
}
} else { //is file
//log_esp3d("file name:%s name: %s %s sub:%s root:%s", esptmp.filename(), esptmp.name(), (esptmp.isDirectory())?"isDir":"isFile", sub.c_str(), _filename.c_str());
if (sub == ".") {
//log_esp3d("Dir tag, ignore it");
tmp = tSDFile_handle[_index].openNextFile();
} else {
return esptmp;
}
}
} }
return ESP_SDFile(); return ESP_SDFile();
} }
const char * ESP_SD::FilesystemName()
{
return "SDIO";
}
//TODO need to find reliable way //TODO need to find reliable way
const char* ESP_SDFile::shortname() const const char* ESP_SDFile::shortname() const
{ {
return _name.c_str(); return _name.c_str();
} }
const char * ESP_SD::FilesystemName()
{
return "SDIO";
}
#endif //SD_DEVICE == ESP_SDIO #endif //SD_DEVICE == ESP_SDIO
#endif //ARCH_ESP32 && SD_DEVICE #endif //ARCH_ESP32 && SD_DEVICE