arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

File system: fix SeekEnd behaviour, fix size() not being updated after write()

Browse Source
This commit is contained in:
Ivan Grokhotkov 2015-09-09 14:07:00 +03:00
parent 67f4859b0c
commit f4bd97e8ee
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cores/esp8266/spiffs_api.cpp
View File

@ -221,13 +221,9 @@ public:
: _fs(fs) : _fs(fs)
, _fd(fd) , _fd(fd)
, _stat({0}) , _stat({0})
, _written(false)
{ {
CHECKFD(); _getStat();
auto rc = SPIFFS_fstat(_fs->getFs(), _fd, &_stat);
if (rc != SPIFFS_OK) {
DEBUGV("SPIFFS_fstat rc=%d\r\n", rc);
_stat = {0};
}
} }
~SPIFFSFileImpl() override { ~SPIFFSFileImpl() override {
@ -242,7 +238,7 @@ public:
DEBUGV("SPIFFS_write rc=%d\r\n", result); DEBUGV("SPIFFS_write rc=%d\r\n", result);
return 0; return 0;
} }
_written = true;
return result; return result;
} }
@ -265,11 +261,16 @@ public:
if (rc < 0) { if (rc < 0) {
DEBUGV("SPIFFS_fflush rc=%d\r\n", rc); DEBUGV("SPIFFS_fflush rc=%d\r\n", rc);
} }
_written = true;
} }
bool seek(uint32_t pos, SeekMode mode) override { bool seek(uint32_t pos, SeekMode mode) override {
CHECKFD(); CHECKFD();
int32_t offset = static_cast<int32_t>(pos);
if (mode == SeekEnd) {
offset = -offset;
}
auto rc = SPIFFS_lseek(_fs->getFs(), _fd, pos, (int) mode); auto rc = SPIFFS_lseek(_fs->getFs(), _fd, pos, (int) mode);
if (rc < 0) { if (rc < 0) {
DEBUGV("SPIFFS_lseek rc=%d\r\n", rc); DEBUGV("SPIFFS_lseek rc=%d\r\n", rc);
@ -293,7 +294,9 @@ public:
size_t size() const override { size_t size() const override {
CHECKFD(); CHECKFD();
if (_written) {
_getStat();
}
return _stat.size; return _stat.size;
} }
@ -311,9 +314,20 @@ public:
} }
protected: protected:
void _getStat() const{
CHECKFD();
auto rc = SPIFFS_fstat(_fs->getFs(), _fd, &_stat);
if (rc != SPIFFS_OK) {
DEBUGV("SPIFFS_fstat rc=%d\r\n", rc);
_stat = {0};
}
_written = false;
}
SPIFFSImpl* _fs; SPIFFSImpl* _fs;
spiffs_file _fd; spiffs_file _fd;
spiffs_stat _stat; mutable spiffs_stat _stat;
mutable bool _written;
}; };
class SPIFFSDirImpl : public DirImpl { class SPIFFSDirImpl : public DirImpl {