fixed mbed_die bug, added overwrite feature, added littleFS, refactoring testing

Author: cristidragomir97

.vscode/launch.json

@@ -0,0 +1,10 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        
+
+    ]
+}

examples/advanced/advanced.ino

@@ -0,0 +1,111 @@
+/*
+This example demonstrates the usage of the "Arduino_UnifiedStorage" library with USB storage and internal storage.
+The code includes the necessary library and defines instances of the "USBStorage" and "InternalStorage" classes.
+
+In the setup function, the code initializes the serial communication and mounts the USB storage and internal storage.
+It also reformats the internal storage to ensure a clean file system. 
+Then, it creates a root directory in the internal storage and creates a subdirectory and a file inside it
+
+The code writes some data to the file and demonstrates file operations. 
+It copies the file from internal storage to USB storage and moves the subdirectory from internal storage to USB storage.
+
+After the file operations, the code prints the contents of both the USB storage and the internal storage. 
+It recursively prints the directories (marked as "[D]") and files (marked as "[F]") using the "printFolderContents" function.
+*/
+
+#include "Arduino_UnifiedStorage.h"
+
+
+USBStorage usbStorage = USBStorage();
+InternalStorage internalStorage = InternalStorage();
+
+
+void printFolderContents(Folder dir, int indentation = 0) {
+  std::vector<Folder> directories = dir.getFolders();
+  std::vector<UFile> files = dir.getFiles();
+
+  // Print directories
+  for (Folder subdir : directories) {
+    for (int i = 0; i < indentation; i++) {
+      Serial.print("  ");
+    }
+    Serial.print("[D] ");
+    Serial.println(subdir.getPath());
+    printFolderContents(subdir, indentation + 1);
+  }
+
+  // Print files
+  for (UFile file : files) {
+    for (int i = 0; i < indentation; i++) {
+      Serial.print("  ");
+    }
+    Serial.print("[F] ");
+    Serial.println(file.getPath());
+  }
+}
+
+
+
+void setup() {
+  Serial.begin(115200);
+  while (!Serial);
+
+  // Mount the USB storage
+  if(usbStorage.begin()){
+    Serial.println("USB storage mounted.");
+  } else {
+    Serial.println(errno);
+  }
+
+
+  // Mount the internal storage
+ // Serial.println("Reformatting internal storage to make sure we have a clean FS");
+ // internalStorage.format();
+  if(internalStorage.begin()){
+      Serial.println("Internal storage mounted.");
+  } else {
+     Serial.println(errno);
+  }
+
+
+  // Create a root directory in the internal storage
+  Folder root = internalStorage.getRootFolder();
+
+  // Create a subdirectory and a file inside the root directory
+  Folder subdir = root.createSubfolder("subdir");
+  UFile file = root.createFile("file.txt", FileMode::WRITE);
+
+  // Write some data to the file
+  file.write("Hello, world!");
+  file.close();
+
+  // Copy the file from internal storage to USB storage
+  bool success = file.copyTo(usbStorage.getRootFolder());
+  if (success) {
+    Serial.println("File copied successfully from internal storage to USB storage.");
+  } else {
+    Serial.println("Failed to copy file from internal storage to USB storage.");
+    Serial.println(getErrno());
+  }
+
+  // Move the subdirectory from internal storage to USB storage
+  success = subdir.moveTo(usbStorage.getRootFolder());
+  if (success) {
+    Serial.println("Subdirectory moved successfully from internal storage to USB storage.");
+  } else {
+    Serial.println("Failed to move subdirectory from internal storage to USB storage.");
+    Serial.println(getErrno());
+  }
+
+  // Print the content of the USB storage
+  Serial.println("USB storage contents:");
+  printFolderContents(usbStorage.getRootFolder());
+
+  // Print the content of the internal storage
+  Serial.println("Internal storage contents:");
+  printFolderContents(internalStorage.getRootFolder());
+}
+
+void loop() {
+  // Nothing to do here
+}

src/Arduino_UnifiedStorage.h

@@ -35,7 +35,9 @@ class Arduino_UnifiedStorage {
 
         virtual Folder getRootFolder() = 0;
 
-        virtual int format() = 0;
+        virtual int formatLittleFS() = 0;
+
+        virtual int formatFAT() = 0;
 };
 
 

src/Folder.cpp

@@ -7,6 +7,7 @@
 Folder::Folder() {}
 
 Folder::Folder(const char* path) {
+
     DIR* dir = opendir(path);
     if (dir != nullptr) {
         this->path = std::string(path);
@@ -15,9 +16,7 @@ Folder::Folder(const char* path) {
         int result = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO);
         if (result == 0) {
             this->path = std::string(path);
-        } else {
-            this->path = "";
-        }
+        } // else ...not sure about this one yet
     }
 }
 
@@ -104,34 +103,35 @@ String Folder::getPathString() {
     return String(this->getPath());
 }
 
-Folder Folder::createSubfolder(const char* subfolderName) {
-    bool alreadyExists = false;
+Folder Folder::createSubfolder(const char* subfolderName, bool overwrite) {
     std::string subfolderPath = this->path + "/" + subfolderName;
 
-     for(Folder d: this->getFolders()){
-        if(d.getPath() == subfolderPath){
-            alreadyExists = true;
+    DIR* dir = opendir(subfolderPath.c_str());
+    if (dir != nullptr) {
+        if(!overwrite){
+            errno = EEXIST;
+            closedir(dir);
+            return Folder(subfolderPath.c_str());
+
+        } else {
+            closedir(dir);
+            Folder(subfolderPath.c_str()).remove();
+        }   
+    } 
 
-        }
-    }
 
-    // Construct the full path of the subfolder
- 
-    if (!alreadyExists){
     int result = mkdir(subfolderPath.c_str(), 0777);
-        if (result == 0) {
-           return Folder(subfolderPath.c_str());
-        } else {
-            return Folder();
-        }
-    } else {
+    if (result == 0) {
         return Folder(subfolderPath.c_str());
+    } else {
+        return Folder();
     }
+
 
 }
 
-Folder Folder::createSubfolder(String subfolderName) {
-    return this->createSubfolder(subfolderName.c_str());
+Folder Folder::createSubfolder(String subfolderName, bool overwrite)  {
+    return this->createSubfolder(subfolderName.c_str(), overwrite);
 }
 
 std::vector<UFile> Folder::getFiles() {
@@ -173,11 +173,13 @@ std::vector<Folder> Folder::getFolders() {
     }
 }
 
-bool Folder::copyTo(Folder destination) {
-    return this->copyTo(destination.getPath());
+bool Folder::copyTo(Folder destination, bool overwrite) {
+    return this->copyTo(destination.getPath(), overwrite);
 }
 
-bool Folder::copyTo(const char* destinationPath) {
+
+
+bool Folder::copyTo(const char* destinationPath, bool overwrite) {
     std::string source = this->path;
     std::string fileName = getLastPathComponent(this->path.c_str());
     std::string destination = std::string(destinationPath) + "/" + fileName;
@@ -187,12 +189,21 @@ bool Folder::copyTo(const char* destinationPath) {
         return false;
     }
 
-    // Create destination directory if it doesn't exist
-    if (mkdir(destination.c_str(), 0777) != 0 && errno != EEXIST) {
+
+    if(opendir(destination.c_str())){
+        if(overwrite){
+            Folder(destination.c_str()).remove();
+        } else {
+            return false;
+        }
+
+    } else  if (mkdir(destination.c_str(), 0777) != 0 && errno != EEXIST) {
         closedir(dir);
-        return false;
     }
 
+    // Create destination directory if it doesn't exist
+
+
     struct dirent* entry;
     while ((entry = readdir(dir)) != nullptr) {
         if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
@@ -240,29 +251,43 @@ bool Folder::copyTo(const char* destinationPath) {
     return true;
 }
 
-bool Folder::copyTo(String destination) {
-    return this->copyTo(destination.c_str());
+
+bool Folder::copyTo(String destination, bool overwrite) { 
+    return this->copyTo(destination.c_str(), overwrite);
 }
 
-bool Folder::moveTo(Folder destination) {
-    return this->moveTo(destination.getPath());
+bool Folder::moveTo(Folder destination, bool overwrite) {
+    return this->moveTo(destination.getPath(), overwrite);
 }
 
-bool Folder::moveTo(const char* destination) {
+bool Folder::moveTo(const char* destination, bool overwrite) {
     std::string newPath = replaceFirstPathComponent(this->path.c_str(), destination);
 
-    if (!this->copyTo(destination)) {
-        return false; // Return false if the copy operation fails
+/*
+    DIR* dir = opendir(newPath.c_str());
+    if (dir != nullptr) {
+        if(!overwrite){
+            errno = EEXIST;
+            return false;
+        } else {
+            closedir(dir);
+            Folder(newPath.c_str()).remove();
+        }
     }
+    */
 
-    if (::remove(this->path.c_str()) != 0) {
-        return false;
+    if (!this->copyTo(destination, overwrite)) {
+        return false; // Return false if the copy operation fails
+    } else {
+        if (::remove(this->path.c_str()) != 0) {
+            return false;
+        }
     }
 
     this->path = newPath;
     return true;
 }
 
-bool Folder::moveTo(String destination) {
-    return this->moveTo(destination.c_str());
+bool Folder::moveTo(String destination, bool overwrite) {
+    return this->moveTo(destination.c_str(), overwrite);
 }

src/Folder.h

@@ -87,16 +87,18 @@ class Folder {
     /*
      * @brief Creates a subfolder in the directory.
      * @param const char * subfolderName - he name of the subfolder to create.
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return The created subfolder.
     */
-    Folder createSubfolder(const char * subfolderName);
+    Folder createSubfolder(const char * subfolderName, bool overwrite = false);
 
     /*
      * @brief Creates a subfolder in the directory.
      * @param String subfolderName - he name of the subfolder to create.
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return The created subfolder.
      */
-    Folder createSubfolder(String subfolderName);
+    Folder createSubfolder(String subfolderName, bool overwrite = false);
 
     /*
      * @brief Returns File objects for all files in the current dirctory.
@@ -115,42 +117,47 @@ class Folder {
      * @param Folder destination - a Folder object representing the destination
      * @return True upon success, false otherwise. 
      */
-    bool copyTo(Folder destination);
+    bool copyTo(Folder destination, bool overwrite = false);
 
     /*
      * @brief Copies the current directory
      * @param const char * destination - the path of the destination location
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return True upon success, false otherwise. 
      */
-    bool copyTo(const char * destination);
+    bool copyTo(const char * destination, bool overwrite = false);
 
     /*
      * @brief Copies the current directory
      * @param String destination - the path of the destination location
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return True upon success, false otherwise. 
      */
-    bool copyTo(String destination);
+    bool copyTo(String destination, bool overwrite = false);
 
     /*
      * @brief Moves the current directory
      * @param Folder destination - a Folder object representing the destination
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return True upon success, false otherwise. 
      */
-    bool moveTo(Folder destination);
+    bool moveTo(Folder destination, bool overwrite = false);
 
     /*
      * @brief Moves the current directory
      * @param const char * destination - the path of the destination location
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return True upon success, false otherwise. 
     */
-    bool moveTo(const char * destination);
+    bool moveTo(const char * destination, bool overwrite = false);
 
     /*
      * @brief Move the current directory
      * @param String destination - the path of the destination location
+     * @param overwrite - behaviour in case the folder already exists, default is false
      * @return True upon success, false otherwise. 
      */
-    bool moveTo(String destination);
+    bool moveTo(String destination, bool overwrite = false);
 
   private: