Supports nested directories.

Author: cheind

inc/dest/util/glob.h

@@ -23,9 +23,10 @@ namespace dest {
             \param Directory to search in.
             \param extension Necessary file extension.
             \param stripExtension Whether or not to strip extension in results.
+            \param recursive Traverse sub-directories too.
             \returns List of found files.
         */
-        std::vector<std::string> findFilesInDir(const std::string &directory, const std::string &extension, bool stripExtension);
+        std::vector<std::string> findFilesInDir(const std::string &directory, const std::string &extension, bool stripExtension, bool recursive);
 
     }
 }

src/util/glob.cpp

@@ -10,46 +10,64 @@
 
 #include <dest/util/glob.h>
 #include <tinydir/tinydir.h>
+#include <stack>
 
 namespace dest {
     namespace util {
 
-        std::vector<std::string> findFilesInDir(const std::string &directory, const std::string &extension, bool stripExtension)
+        std::vector<std::string> findFilesInDir(const std::string &directory, const std::string &extension, bool stripExtension, bool recursive)
         {
             std::vector<std::string> files;
 
+            std::stack<std::string> dirsLeft;
+            dirsLeft.push(directory);
+
             tinydir_dir dir;
-            if (tinydir_open(&dir, directory.c_str()) != 0)
-                return files;
-            
-            while (dir.has_next) {
-                tinydir_file file;
-                
-                if (tinydir_readfile(&dir, &file) != 0 || file.is_dir) {
-                    tinydir_next(&dir);
-                    continue;
-                }
-                
-                if (extension != file.extension) {
-                    tinydir_next(&dir);
+            while (!dirsLeft.empty()) {
+                std::string dirPath = dirsLeft.top(); dirsLeft.pop();
+
+                // Try to open directory
+                if (tinydir_open(&dir, dirPath.c_str()) != 0)
                     continue;
 
+                while (dir.has_next) {
+                    tinydir_file file;
+
+                    if (tinydir_readfile(&dir, &file) != 0) {
+                        tinydir_next(&dir);
+                        continue;
+                    }
+
+                    if (file.is_dir) {
+                        if (recursive && file.name != std::string(".") && file.name != std::string("..")) {
+                            dirsLeft.push(file.path);
+                        }
+                        tinydir_next(&dir);
+                        continue;
+                    }
+
+                    if (extension != file.extension) {
+                        tinydir_next(&dir);
+                        continue;
+                    }
+
+                    std::string path(file.path);
+
+                    if (stripExtension) {
+                        size_t lastindex = path.find_last_of(".");
+                        std::string raw = path.substr(0, lastindex);
+                        files.push_back(raw);
+                    }
+                    else {
+                        files.push_back(path);
+                    }
+
+                    tinydir_next(&dir);
                 }
-                
-                std::string path(file.path);
-                
-                if (stripExtension) {
-                    size_t lastindex = path.find_last_of(".");
-                    std::string raw = path.substr(0, lastindex);
-                    files.push_back(raw);
-                } else {
-                    files.push_back(path);
-                }
-                
-                tinydir_next(&dir);
+
+                tinydir_close(&dir);
             }
 
-            tinydir_close(&dir);
             return files;
 
         }