Merge branch 'master' into spiffs-0.3.3

Author: pgollor

main.cpp

@@ -163,27 +163,55 @@ int addFile(char* name, const char* path) {
     return 0;
 }
 
-int addFiles(const char* dirname){
+int addFiles(const char* dirname, const char* subPath) {
     DIR *dir;
     struct dirent *ent;
     bool error = false;
-    if ((dir = opendir (dirname)) != NULL) {
+    std::string dirPath = dirname;
+    dirPath += subPath;
+
+    // Open directory
+    if ((dir = opendir (dirPath.c_str())) != NULL) {
+
+        // Read files from directory.
         while ((ent = readdir (dir)) != NULL) {
+            // Ignore dir itself.
             if (ent->d_name[0] == '.')
                 continue;
-            std::string fullpath = dirname;
-            fullpath += '/';
+
+            std::string fullpath = dirPath;
             fullpath += ent->d_name;
             struct stat path_stat;
             stat (fullpath.c_str(), &path_stat);
+
             if (!S_ISREG(path_stat.st_mode)) {
-                std::cerr << "skipping " << ent->d_name << std::endl;
-                continue;
+                // Check if path is a directory.
+                if (S_ISDIR(path_stat.st_mode)) {
+                    // Prepare new sub path.
+                    std::string newSubPath = subPath;
+                    newSubPath += ent->d_name;
+                    newSubPath += "/";
+
+                    if (addFiles(dirname, newSubPath.c_str()) != 0)
+                    {
+                        std::cerr << "Error for adding content from " << ent->d_name << "!" << std::endl;
+                    }
+
+                    continue;
+                }
+                else
+                {
+                    std::cerr << "skipping " << ent->d_name << std::endl;
+                    continue;
+                }
             }
 
-            std::string filepath = "/";
+            // Filepath with dirname as root folder.
+            std::string filepath = subPath;
             filepath += ent->d_name;
             std::cout << filepath << std::endl;
+
+            // Add File to image.
             if (addFile((char*)filepath.c_str(), fullpath.c_str()) != 0) {
                 std::cerr << "error adding file!" << std::endl;
                 error = true;
@@ -192,12 +220,13 @@ int addFiles(const char* dirname){
                 }
                 break;
             }
-        }
+        } // end while
         closedir (dir);
     } else {
         std::cerr << "warning: can't read source directory" << std::endl;
         return 1;
     }
+
     return (error) ? 1 : 0;
 }
 
@@ -235,6 +264,32 @@ bool dirExists(const char* path) {
     return false;
 }
 
+/**
+ * @brief Create directory if it not exists.
+ * @param path Directory path.
+ * @return True or false.
+ *
+ * @author Pascal Gollor (http://www.pgollor.de/cms/)
+ */
+bool dirCreate(const char* path) {
+    // Check if directory also exists.
+    if (dirExists(path)) {
+	    return false;
+    }
+
+    // platform stuff...
+#if defined(_WIN32)
+    if (_mkdir(path) != 0) {
+#else
+    if (mkdir(path, S_IRWXU | S_IXGRP | S_IRGRP | S_IROTH | S_IXOTH) != 0) {
+#endif
+	    std::cerr << "Can not create directory!!!" << std::endl;
+		return false;
+    }
+
+    return true;
+}
+
 /**
  * @brief Unpack file from file system.
  * @param spiffsFile SPIFFS dir entry pointer.
@@ -283,7 +338,7 @@ bool unpackFiles(std::string sDest) {
     spiffs_dirent ent;
 
     // Add "./" to path if is not given.
-    if (sDest.find("./") == std::string::npos) {
+    if (sDest.find("./") == std::string::npos && sDest.find("/") == std::string::npos) {
         sDest = "./" + sDest;
     }
 
@@ -292,13 +347,7 @@ bool unpackFiles(std::string sDest) {
         std::cout << "Directory " << sDest << " does not exists. Try to create it." << std::endl;
 
         // Try to create directory.
-        // platform stuff...
-#if defined(_WIN32)
-        if (_mkdir(sDest.c_str()) != 0) {
-#else
-        if (mkdir(sDest.c_str(), S_IRWXU | S_IXGRP | S_IRGRP | S_IROTH | S_IXOTH) != 0) {
-#endif
-            std::cerr << "Can not create directory!!!" << std::endl;
+        if (! dirCreate(sDest.c_str())) {
             return false;
         }
     }
@@ -311,7 +360,23 @@ bool unpackFiles(std::string sDest) {
     while (it) {
         // Check if content is a file.
         if ((int)(it->type) == 1) {
-            std::string sDestFilePath = sDest + (const char*)(it->name);
+            std::string name = (const char*)(it->name);
+            std::string sDestFilePath = sDest + name;
+            size_t pos = name.find_last_of("/");
+
+            // If file is in sub directory?
+            if (pos > 0) {
+                // Subdir path.
+                std::string path = sDest;
+                path += name.substr(0, pos);
+
+                // Create subddir if subdir not exists.
+                if (!dirExists(path.c_str())) {
+                    if (!dirCreate(path.c_str())) {
+                        return false;
+                    }
+                }
+            }
 
             // Unpack file to destination directory.
             if (! unpackFile(it, sDestFilePath.c_str()) ) {
@@ -329,8 +394,9 @@ bool unpackFiles(std::string sDest) {
                 << std::endl;
         }
 
+        // Get next file handle.
         it = SPIFFS_readdir(&dir, &ent);
-    }
+    } // end while
 
     // Close directory.
     SPIFFS_closedir(&dir);
@@ -350,7 +416,7 @@ int actionPack() {
     }
 
     spiffsFormat();
-    int result = addFiles(s_dirName.c_str());
+    int result = addFiles(s_dirName.c_str(), "/");
     spiffsUnmount();
 
     fwrite(&s_flashmem[0], 4, s_flashmem.size()/4, fdres);