jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 19:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix accessing zip paths with no characters after the hash (#18894)

Browse Source 
Add passthrough of openNextFile, so that folders can be opened and read via the ZipFS proxied filesystems.
This commit is contained in:
btsimonh 2023-06-18 17:42:39 +01:00 committed by GitHub
parent 4452228dca
commit b2fd311186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libesp32/Zip-readonly-FS/src/ZipReadFS.cpp
View File

@ -125,6 +125,8 @@ protected:
class ZipReadFileImpl; class ZipReadFileImpl;
typedef std::shared_ptr<FileImpl> ZipReadFileImplPtr; typedef std::shared_ptr<FileImpl> ZipReadFileImplPtr;
// this is the proxy FileImpl - used for passing through real files.
class ZipReadFileImpl : public FileImpl { class ZipReadFileImpl : public FileImpl {
public: public:
ZipReadFileImpl(File f) { _f = f; } ZipReadFileImpl(File f) { _f = f; }
@ -163,7 +165,9 @@ public:
return _f.isDirectory(); return _f.isDirectory();
} }
FileImplPtr openNextFile(const char* mode) { FileImplPtr openNextFile(const char* mode) {
return nullptr; // TODO File f = _f.openNextFile(mode);
return ZipReadFileImplPtr(new ZipReadFileImpl(f));
//return nullptr; // TODO
} }
void rewindDirectory(void) { void rewindDirectory(void) {
return _f.rewindDirectory(); return _f.rewindDirectory();
@ -469,6 +473,9 @@ FileImplPtr ZipReadFSImpl::open(const char* path, const char* mode, const bool c
char *tok; char *tok;
char *prefix = strtok_r(sub_path, "#", &tok); char *prefix = strtok_r(sub_path, "#", &tok);
char *suffix = strtok_r(NULL, "", &tok); char *suffix = strtok_r(NULL, "", &tok);
if (!suffix || *suffix == 0){ // bad filename - nothing after #
return ZipReadFileImplPtr(); // return an error
}
// if suffix starts with '/', skip the first char // if suffix starts with '/', skip the first char
if (*suffix == '/') { suffix++; } if (*suffix == '/') { suffix++; }
// AddLog(LOG_LEVEL_DEBUG, "ZIP: prefix=%s suffix=%s", prefix, suffix); // AddLog(LOG_LEVEL_DEBUG, "ZIP: prefix=%s suffix=%s", prefix, suffix);