mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-21 21:22:31 +03:00
* Add a FAT filesystem for SD cards to Arduino FS Arduino forked a copy of SD lib several years ago, put their own wrapper around it, and it's been languishing in our ESP8266 libraries ever since as SD. It doesn't support long file names, has class names which conflict with the ESP8266 internal names, and hasn't been updated in ages. The original author of the SD library has continued work in the meantime, and produced a very feature rich implementation of SdFat. It unfortunately also conflicts with the class names we use in ESP8266 Arduino and has a different API than the internal SPIFFS or proposed LittleFS filesystem objects. This PR puts a wrapper around the latest and greatest SdFat library, by forking it and wrapping its classes in a private namespace "sdfat," and making as thin a wrapper as possible around it to conform to the ESP8266 FS, File, and Dir classes. This PR also removes the Arduino SD.h class library and rewrites it using the new SDFS filesystem to make everything in the ESP8266 Arduino core compatible with each other. By doing so it lets us use a single interface for anything needing a file instead of multiple ones (see SDWebServer and how a different object is needed vs. one serving from SPIFFS even though the logic is all the same). Same for BearSSL's CertStores and probably a few others I've missed, cleaning up our code base significantly. Like LittleFS, silently create directories when a file is created with a subdirectory specifier ("/path/to/file.txt") if they do not yet exist. Adds a blacklist of sketches to skip in the CI process (because SdFat has many examples which do not build properly on the ESP8266). Now that LittleFS and SDFS have directory support, the FS needs to be able to communicate whether a name is one or the other. Add a simple bool FS::isDirectory() and bool FS::isFile() method. SPIFFS doesn't have directories, so if it's valid it's a file and reported as such. Add ::mkdir/::rmdir to the FS class to allow users to make and destroy subdirectories. SPIFFS directory operations will, of course, fail and return false. Emulate a 16MB SD card and allow test runner to exercise it by using a custom SdFat HOST_MOCK-enabled object. Throw out the original Arduino SD.h class and rewrite from scratch using only the ESP8266 native SDFS calls. This makes "SD" based applications compatible with normal ESP8266 "File" and "FS" and "SPIFFS" operations. The only major visible change for users is that long filenames now are fully supported and work without any code changes. If there are static arrays of 11 bytes for old 8.3 names in code, they will need to be adjusted. While it is recommended to use the more powerful SDFS class to access SD cards, this SD.h wrapper allows for use of existing Arduino libraries which are built to only with with that SD class. Additional helper functions added to ESP8266 native Filesystem:: classes to help support this portability. The rewrite is good enough to run the original SDWebServer and SD example code without any changes. * Add a FSConfig and SDFSConfig param to FS.begin() Allows for configuration values to be passed into a filesystem via the begin method. By default, a FS will receive a nullptr and should so whatever is appropriate. The base FSConfig class has one parameter, _autoFormat, set by the default constructor to true. For SPIFFS, you can now disable auto formatting on mount failure by passing in a FSConfig(false) object. For SDFS a SDFSConfig parameter can be passed into config specifying the chip select and SPI configuration. If nothing is passed in, the begin will fail since there are no safe default values here. * Add FS::setConfig to set FS-specific options Add a new call, FS::setConfig(const {SDFS,SPIFFS}Config *cfg), which takes a FS-specific configuration object and copies any special settings on a per-FS basis. The call is only valid on unmounted filesystems, and checks the type of object passed in matches the FS being configured. Updates the docs and tests to utilize this new configuration method. * Add ::truncate to File interface Fixes #3846 * Use polledTimeout for formatting yields, cleanup Use the new polledTimeout class to ensure a yield every 5ms while formatting. Add in default case handling and some debug messages when invalid inputs specified. * Make setConfig take const& ref, cleaner code setConfig now can take a parameter defined directly in the call by using a const &ref to it, leading to one less line of code to write and cleaner reading of the code. Also clean up SDFS implementation pointer definition.
155 lines
5.1 KiB
C++
155 lines
5.1 KiB
C++
/*
|
|
SDFS.cpp - file system wrapper for SdFat
|
|
Copyright (c) 2019 Earle F. Philhower, III. All rights reserved.
|
|
|
|
Based on spiffs_api.cpp which is:
|
|
| Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
|
|
|
|
This code was influenced by NodeMCU and Sming libraries, and first version of
|
|
Arduino wrapper written by Hristo Gochkov.
|
|
|
|
This file is part of the esp8266 core for Arduino environment.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include "SDFS.h"
|
|
#include "SDFSFormatter.h"
|
|
#include <FS.h>
|
|
|
|
using namespace fs;
|
|
|
|
|
|
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SDFS)
|
|
FS SDFS = FS(FSImplPtr(new sdfs::SDFSImpl()));
|
|
#endif
|
|
|
|
namespace sdfs {
|
|
|
|
|
|
FileImplPtr SDFSImpl::open(const char* path, OpenMode openMode, AccessMode accessMode)
|
|
{
|
|
if (!_mounted) {
|
|
DEBUGV("SDFSImpl::open() called on unmounted FS\n");
|
|
return FileImplPtr();
|
|
}
|
|
if (!path || !path[0]) {
|
|
DEBUGV("SDFSImpl::open() called with invalid filename\n");
|
|
return FileImplPtr();
|
|
}
|
|
int flags = _getFlags(openMode, accessMode);
|
|
if ((openMode && OM_CREATE) && strchr(path, '/')) {
|
|
// For file creation, silently make subdirs as needed. If any fail,
|
|
// it will be caught by the real file open later on
|
|
char *pathStr = strdup(path);
|
|
if (pathStr) {
|
|
// Make dirs up to the final fnamepart
|
|
char *ptr = strrchr(pathStr, '/');
|
|
if (ptr && ptr != pathStr) { // Don't try to make root dir!
|
|
*ptr = 0;
|
|
_fs.mkdir(pathStr, true);
|
|
}
|
|
}
|
|
free(pathStr);
|
|
}
|
|
sdfat::File fd = _fs.open(path, flags);
|
|
if (!fd) {
|
|
DEBUGV("SDFSImpl::openFile: fd=%p path=`%s` openMode=%d accessMode=%d",
|
|
&fd, path, openMode, accessMode);
|
|
return FileImplPtr();
|
|
}
|
|
auto sharedFd = std::make_shared<sdfat::File>(fd);
|
|
return std::make_shared<SDFSFileImpl>(this, sharedFd, path);
|
|
}
|
|
|
|
DirImplPtr SDFSImpl::openDir(const char* path)
|
|
{
|
|
if (!_mounted) {
|
|
return DirImplPtr();
|
|
}
|
|
char *pathStr = strdup(path); // Allow edits on our scratch copy
|
|
if (!pathStr) {
|
|
// OOM
|
|
return DirImplPtr();
|
|
}
|
|
// Get rid of any trailing slashes
|
|
while (strlen(pathStr) && (pathStr[strlen(pathStr)-1]=='/')) {
|
|
pathStr[strlen(pathStr)-1] = 0;
|
|
}
|
|
// At this point we have a name of "/blah/blah/blah" or "blah" or ""
|
|
// If that references a directory, just open it and we're done.
|
|
sdfat::File dirFile;
|
|
const char *filter = "";
|
|
if (!pathStr[0]) {
|
|
// openDir("") === openDir("/")
|
|
dirFile = _fs.open("/", sdfat::O_RDONLY);
|
|
filter = "";
|
|
} else if (_fs.exists(pathStr)) {
|
|
dirFile = _fs.open(pathStr, sdfat::O_RDONLY);
|
|
if (dirFile.isDir()) {
|
|
// Easy peasy, path specifies an existing dir!
|
|
filter = "";
|
|
} else {
|
|
dirFile.close();
|
|
// This is a file, so open the containing dir
|
|
char *ptr = strrchr(pathStr, '/');
|
|
if (!ptr) {
|
|
// No slashes, open the root dir
|
|
dirFile = _fs.open("/", sdfat::O_RDONLY);
|
|
filter = pathStr;
|
|
} else {
|
|
// We've got slashes, open the dir one up
|
|
*ptr = 0; // Remove slash, truncare string
|
|
dirFile = _fs.open(pathStr, sdfat::O_RDONLY);
|
|
filter = ptr + 1;
|
|
}
|
|
}
|
|
} else {
|
|
// Name doesn't exist, so use the parent dir of whatever was sent in
|
|
// This is a file, so open the containing dir
|
|
char *ptr = strrchr(pathStr, '/');
|
|
if (!ptr) {
|
|
// No slashes, open the root dir
|
|
dirFile = _fs.open("/", sdfat::O_RDONLY);
|
|
filter = pathStr;
|
|
} else {
|
|
// We've got slashes, open the dir one up
|
|
*ptr = 0; // Remove slash, truncare string
|
|
dirFile = _fs.open(pathStr, sdfat::O_RDONLY);
|
|
filter = ptr + 1;
|
|
}
|
|
}
|
|
if (!dirFile) {
|
|
DEBUGV("SDFSImpl::openDir: path=`%s`\n", path);
|
|
return DirImplPtr();
|
|
}
|
|
auto sharedDir = std::make_shared<sdfat::File>(dirFile);
|
|
auto ret = std::make_shared<SDFSDirImpl>(filter, this, sharedDir, pathStr);
|
|
free(pathStr);
|
|
return ret;
|
|
}
|
|
|
|
bool SDFSImpl::format() {
|
|
if (_mounted) {
|
|
return false;
|
|
}
|
|
SDFSFormatter formatter;
|
|
bool ret = formatter.format(&_fs, _cfg._csPin, _cfg._spiSettings);
|
|
return ret;
|
|
}
|
|
|
|
|
|
}; // namespace sdfs
|
|
|