Fix espressif#2750 (espressif#2763)

* Fix espressif#2750 * Fixes for pull comments * latest modifications following comments from me-no-dev * Move SPIFFSFSImpl to .cpp file

Author: judge2005

libraries/SPIFFS/src/SPIFFS.cpp

@@ -20,13 +20,33 @@ extern "C" {
 #include <dirent.h>
 #include "esp_spiffs.h"
 }
+
 #include "SPIFFS.h"
 
 using namespace fs;
 
-SPIFFSFS::SPIFFSFS(FSImplPtr impl)
- : FS(impl)
-{}
+class SPIFFSImpl : public VFSImpl
+{
+public:
+ SPIFFSImpl();
+ virtual ~SPIFFSImpl() { }
+ virtual bool exists(const char* path);
+};
+
+SPIFFSImpl::SPIFFSImpl()
+{
+}
+
+bool SPIFFSImpl::exists(const char* path)
+{
+ File f = open(path, "r");
+ return (f == true) && !f.isDirectory();
+}
+
+SPIFFSFS::SPIFFSFS() : FS(FSImplPtr(new SPIFFSImpl()))
+{
+
+}
 
 bool SPIFFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles)
 {
@@ -98,16 +118,5 @@ size_t SPIFFSFS::usedBytes()
  return used;
 }
 
-bool SPIFFSFS::exists(const char* path)
-{
- File f = open(path, "r");
- return (f == true) && !f.isDirectory();
-}
-
-bool SPIFFSFS::exists(const String& path)
-{
- return exists(path.c_str());
-}
-
+SPIFFSFS SPIFFS;
 
-SPIFFSFS SPIFFS = SPIFFSFS(FSImplPtr(new VFSImpl()));

libraries/SPIFFS/src/SPIFFS.h

@@ -22,18 +22,17 @@ namespace fs
 class SPIFFSFS : public FS
 {
 public:
- SPIFFSFS(FSImplPtr impl);
+ SPIFFSFS();
  bool begin(bool formatOnFail=false, const char * basePath="/spiffs", uint8_t maxOpenFiles=10);
  bool format();
  size_t totalBytes();
  size_t usedBytes();
  void end();
- bool exists(const char* path);
- bool exists(const String& path);
 };
 
 }
 
 extern fs::SPIFFSFS SPIFFS;
 
-#endif /* _SPIFFS_H_ */
+
+#endif