Menu using Folder API. WIP, does not work well!

[ci skip]

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140808 ]
+    * Added unit test for file-system utils
+    * Moving Menu to Folder/File API
+
     [ 20140807 ]
     * Script parser successfully loading level scripts
     * Can also read TR3 script now

include/Exception.h

@@ -0,0 +1,29 @@
+/*!
+ * \file include/Exception.h
+ * \brief Custom global Exception
+ *
+ * \author xythobuz
+ */
+
+#ifndef _EXCEPTION_H_
+#define _EXCEPTION_H_
+
+#include <memory>
+#include <stdexcept>
+#include <string>
+
+class Exception : std::runtime_error {
+public:
+    Exception(const char *what);
+    Exception(const std::string &what);
+
+    static std::string getLastException();
+
+private:
+    static std::string lastException;
+
+    virtual void foo(); //!< We don't want to emit a vtable in every translation unit
+};
+
+#endif
+

include/Menu.h

@@ -8,7 +8,10 @@
 #ifndef _MENU_H_
 #define _MENU_H_
 
+#include <memory>
+
 #include "Font.h"
+#include "utils/Folder.h"
 
 /*!
  * \brief Menu 'overlay'
@@ -26,6 +29,8 @@ public:
      */
     ~Menu();
 
+    int initialize();
+
     void setVisible(bool visible);
 
     bool isVisible();
@@ -38,12 +43,6 @@ public:
 
 private:
 
-    void loadPakFolderRecursive(const char *dir);
-
-    void fillMapList();
-
-    void displayMapList();
-
     void play();
 
     bool mVisible;
@@ -52,9 +51,7 @@ private:
 
     FontString mainText;
 
-    bool mMapListFilled;
-    bool mFirstPass;
-    std::vector<char *> mMapList;
+    Folder *mapFolder;
 };
 
 Menu &getMenu();

include/TombRaider.h

@@ -125,7 +125,7 @@ public:
      * \param filename file to check
      * \returns 0 if it is a TombRaider pak
      */
-    static int checkMime(char *filename);
+    static int checkMime(const char *filename);
 
     /*!
      * \brief Loads TombRaider 1-5 pak into memory

include/utils/File.h

@@ -8,7 +8,6 @@
 #ifndef _UTILS_FILE_H_
 #define _UTILS_FILE_H_
 
-#include <memory>
 #include <string>
 
 class Folder;
@@ -16,14 +15,13 @@ class Folder;
 class File {
 public:
     File(std::string file);
-    ~File();
 
-    std::shared_ptr<Folder> getParent();
+    std::string &getName();
+    std::string &getPath();
 
 private:
     std::string name;
     std::string path;
-    std::weak_ptr<Folder> parent;
 };
 
 #endif

include/utils/Folder.h

@@ -8,21 +8,45 @@
 #ifndef _UTILS_FOLDER_H_
 #define _UTILS_FOLDER_H_
 
+#include "Exception.h"
+#include "utils/File.h"
+
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
-class File;
-
 class Folder {
 public:
-    Folder(std::string folder);
-    ~Folder();
+    Folder(std::string folder, bool listDotFiles = false);
+
+    std::string &getName();
+    std::string &getPath();
+
+    unsigned long fileCount();
+    File &getFile(unsigned long i);
+
+    unsigned long folderCount();
+    Folder &getFolder(unsigned long i);
+
+    unsigned long countRecursiveItems();
+    void executeRemoveRecursiveItems(std::function<bool (File &f)> func);
+    std::string getRecursiveItemName(unsigned long i);
+    //File &getRecursiveItem(unsigned long i);
 
 private:
-    std::string name;
-    std::string path;
-    std::vector<std::shared_ptr<File>> files;
+
+    void createFolderItems();
+    int readFolderItems(std::vector<std::string> &foundFiles, std::vector<std::string> &foundFolders);
+
+    std::string name; //!< Only last part of path
+    std::string path; //!< Full path, with name and '/' at end
+
+    bool hasListed;
+    bool listDot;
+
+    std::vector<File> files;
+    std::vector<Folder> folders;
 };
 
 #endif

src/CMakeLists.txt

@@ -51,6 +51,7 @@ set (SRCS ${SRCS} "Camera.cpp")
 set (SRCS ${SRCS} "Command.cpp")
 set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
+set (SRCS ${SRCS} "Exception.cpp")
 set (SRCS ${SRCS} "Font.cpp")
 set (SRCS ${SRCS} "FontManager.cpp")
 set (SRCS ${SRCS} "FontTRLE.cpp")

src/Exception.cpp

@@ -0,0 +1,26 @@
+/*!
+ * \file src/Exception.cpp
+ * \brief Custom global Exception
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Exception.h"
+
+std::string Exception::lastException("No custom exception since start!");
+
+Exception::Exception(const char *what) : runtime_error(what) {
+    lastException = what;
+}
+
+Exception::Exception(const std::string &what) : runtime_error(what) {
+    lastException = what;
+}
+
+std::string Exception::getLastException() {
+    return lastException;
+}
+
+void Exception::foo() { }
+

src/Menu.cpp

@@ -16,20 +16,12 @@
 #include "Window.h"
 #include "Menu.h"
 
-#if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
-#include <dirent.h>
-#define USE_DIRENT
-#elif defined (_WIN32)
-#include <windows.h>
-#define USE_FINDFILE
-#else
-#error No support for recursive folder traversal
-#endif
 
 Menu::Menu() {
     mVisible = false;
     mCursor = 0;
     mMin = 0;
+    mapFolder = nullptr;
 
     mainText.text = bufferString("%s", VERSION);
     mainText.color[0] = BLUE[0];
@@ -40,19 +32,36 @@ Menu::Menu() {
     mainText.y = 10;
     mainText.w = 0;
     mainText.h = 0;
-
-    mMapListFilled = false;
-    mFirstPass = false;
 }
 
 Menu::~Menu() {
     delete [] mainText.text;
-    mainText.text = NULL;
+    mainText.text = nullptr;
 
-    while (mMapList.size() > 0) {
-        delete [] mMapList.back();
-        mMapList.pop_back();
-    }
+    delete mapFolder;
+    mapFolder = nullptr;
+}
+
+int Menu::initialize() {
+    mapFolder = new Folder(getOpenRaider().mPakDir);
+
+    mapFolder->executeRemoveRecursiveItems([](File &f) {
+        if ((f.getName().compare(f.getName().length() - 4, 4, ".phd") != 0)
+            && (f.getName().compare(f.getName().length() - 4, 4, ".tr2") != 0)
+            && (f.getName().compare(f.getName().length() - 4, 4, ".tr4") != 0)
+            && (f.getName().compare(f.getName().length() - 4, 4, ".trc") != 0)) {
+            return true;
+        }
+        int error = TombRaider::checkMime(f.getPath().c_str());
+        if (error != 0) {
+            getConsole().print("Error: pak file '%s' %s",
+                    f.getName().c_str(), (error == -1) ? "not found" : "invalid");
+            return true;
+        }
+        return false;
+    });
+
+    return 0;
 }
 
 void Menu::setVisible(bool visible) {
@@ -63,189 +72,71 @@ bool Menu::isVisible() {
     return mVisible;
 }
 
-void Menu::loadPakFolderRecursive(const char *dir) {
-    assert(dir != NULL);
-    assert(dir[0] != '\0');
-#ifdef USE_DIRENT
-    struct dirent entry;
-    struct dirent *ep = NULL;
-    DIR *pakDir;
-
-    pakDir = opendir(dir);
-    if (pakDir != NULL) {
-        readdir_r(pakDir, &entry, &ep);
-        while (ep != NULL) {
-            if (ep->d_type == DT_DIR) {
-                if ((strcmp(".", ep->d_name) != 0)
-                 && (strcmp("..", ep->d_name) != 0)) {
-                    char *tmp = bufferString("%s%s", dir, ep->d_name);
-                    char *next = fullPath(tmp, '/');
-                    loadPakFolderRecursive(next);
-                    delete next;
-                    delete tmp;
-                }
-            } else {
-                char *fullPathMap = bufferString("%s%s", dir, ep->d_name);
+void Menu::display() {
+    if (!mVisible)
+        return;
 
-                char *lowerPath = bufferString("%s", fullPathMap);
-                for (char *p = lowerPath; *p; ++p) *p = (char)tolower(*p);
+    // Draw half-transparent *overlay*
+    glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
+    glDisable(GL_TEXTURE_2D);
+    glRecti(0, 0, getWindow().getWidth(), getWindow().getHeight());
+    glEnable(GL_TEXTURE_2D);
 
-                // Check for valid extension
-                if (stringEndsWith(lowerPath, ".phd")
-                     || stringEndsWith(lowerPath, ".tr2")
-                     || stringEndsWith(lowerPath, ".tr4")
-                    // || stringEndsWith(lowerPath, ".psx")
-                     || stringEndsWith(lowerPath, ".trc")) {
-                    int error = TombRaider::checkMime(fullPathMap);
-                    if (error == 0) {
-                        // Just load relative filename
-                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(getOpenRaider().mPakDir) + 1)));
-                    } else {
-                        getConsole().print("Error: pak file '%s' %s",
-                                fullPathMap, (error == -1) ? "not found" : "invalid");
-                    }
-                }
+    // Draw heading text, using FontString so we can get the
+    // width of the drawn text to center it
+    mainText.x = (getWindow().getWidth() / 2) - (mainText.w / 2);
+    getFont().writeString(mainText);
 
-                delete [] lowerPath;
-                delete [] fullPathMap;
-            }
-            readdir_r(pakDir, &entry, &ep);
-        }
-        closedir(pakDir);
+    if ((mapFolder == nullptr) || (mapFolder->countRecursiveItems() == 0)) {
+        getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, RED, "No maps found! See README.md");
+        return;
     } else {
-        getConsole().print("Could not open PAK dir %s!", dir);
-    }
-#elif defined(USE_FINDFILE)
-    std::vector<char *> list;
-    list.push_back(bufferString("%s", dir));
-    do {
-        WIN32_FIND_DATA fd;
-        char *tmp = bufferString("%s\\*", list.at(0));
-        HANDLE hFind = FindFirstFile(tmp, &fd);
-        do {
-            if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-                list.push_back(bufferString("%s\\%s", list.at(0), fd.cFileName));
-            } else {
-                char *fullPathMap = bufferString("%s\\%s", list.at(0), fd.cFileName);
-
-                char *lowerPath = bufferString("%s", fullPathMap);
-                for (char *p = lowerPath; *p; ++p) *p = (char)tolower(*p);
-
-                // Check for valid extension
-                if (stringEndsWith(lowerPath, ".phd")
-                     || stringEndsWith(lowerPath, ".tr2")
-                     || stringEndsWith(lowerPath, ".tr4")
-                    // || stringEndsWith(lowerPath, ".psx")
-                     || stringEndsWith(lowerPath, ".trc")) {
-                    int error = TombRaider::checkMime(fullPathMap);
-                    if (error == 0) {
-                        // Just load relative filename
-                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(getOpenRaider().mPakDir) + 1)));
-                    } else {
-                        getConsole().print("Error: pak file '%s' %s",
-                                fullPathMap, (error == -1) ? "not found" : "invalid");
-                    }
-                }
-
-                delete [] lowerPath;
-                delete [] fullPathMap;
-            }
-        } while (FindNextFile(hFind, &fd) != 0);
-        FindClose(hFind);
-        delete [] tmp;
-        delete [] list.at(0);
-        list.erase(list.begin());
-    } while (list.size() > 0);
-#endif
-}
-
-void Menu::fillMapList() {
-    char *tmp = fullPath(getOpenRaider().mPakDir, '/');
-    loadPakFolderRecursive(tmp);
-    delete [] tmp;
-    mMapListFilled = true;
-}
-
-void Menu::displayMapList() {
-    // Estimate displayable number of items
-    int items = (getWindow().getHeight() - 110) / 25;
-
-    // Select which part of the list to show
-    long min, max;
-    if (((long)mCursor - (items / 2)) > 0)
-        min = mCursor - (items / 2);
-    else
-        min = 0;
-
-    if ((mCursor + (items / 2)) < mMapList.size())
-        max = mCursor + (items / 2);
-    else
-        max = mMapList.size();
-
-    while ((max - min) < items) {
-        if (min > 0)
-            min--;
-        else if (max < ((int)mMapList.size()))
-            max++;
-        else
-            break;
-    }
-
-    mMin = min;
-
-    for (int i = 0; i < (max - min); i++) {
-        char *map = mMapList[i + min];
-        if ((i + min) == (int)mCursor)
-            getFont().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
-        else
-            getFont().drawText(25, 100 + (25 * i), 0.75f, BLUE, "%s", map);
-    }
-}
-
-void Menu::display() {
-    if (mVisible) {
-        // Draw half-transparent *overlay*
-        glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
+        // draw *play button* above list
+        glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
         glDisable(GL_TEXTURE_2D);
-        glRecti(0, 0, getWindow().getWidth(), getWindow().getHeight());
+        glRecti(25, 25, 100, 75);
         glEnable(GL_TEXTURE_2D);
+        getFont().drawText(40, 35, 0.75f, BLACK, "Play");
 
-        // Draw heading text, using FontString so we can get the
-        // width of the drawn text to center it
-        mainText.x = (getWindow().getWidth() / 2) - (mainText.w / 2);
-        getFont().writeString(mainText);
+        // Estimate displayable number of items
+        int items = (getWindow().getHeight() - 110) / 25;
 
-        if (!mMapListFilled) {
-            getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, BLUE, "Generating map list...");
-        } else {
-            if (mMapList.size() == 0) {
-                getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, RED, "No maps found! See README.md");
-            } else {
-                // draw *play button* above list
-                glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-                glDisable(GL_TEXTURE_2D);
-                glRecti(25, 25, 100, 75);
-                glEnable(GL_TEXTURE_2D);
-                getFont().drawText(40, 35, 0.75f, BLACK, "Play");
+        // Select which part of the list to show
+        long min, max;
+        if (((long)mCursor - (items / 2)) > 0)
+            min = mCursor - (items / 2);
+        else
+            min = 0;
 
-                displayMapList();
-            }
+        if ((mCursor + (items / 2)) < mapFolder->countRecursiveItems())
+            max = mCursor + (items / 2);
+        else
+            max = mapFolder->countRecursiveItems();
+
+        while ((max - min) < items) {
+            if (min > 0)
+                min--;
+            else if (max < ((int)mapFolder->countRecursiveItems()))
+                max++;
+            else
+                break;
         }
 
-        // Fill map list after first render pass,
-        // so menu *loading screen* is visible
-        if (mFirstPass) {
-            if (!mMapListFilled) {
-                fillMapList();
-            }
-        } else {
-            mFirstPass = true;
+        mMin = min;
+
+        for (int i = 0; i < (max - min); i++) {
+            const char *map = mapFolder->getRecursiveItemName(i + min).c_str();
+            if ((i + min) == (int)mCursor)
+                getFont().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
+            else
+                getFont().drawText(25, 100 + (25 * i), 0.75f, BLUE, "%s", map);
         }
     }
 }
 
 void Menu::play() {
-    char *tmp = bufferString("load %s", mMapList[mCursor]);
+    char *tmp = bufferString("load %s", mapFolder->getRecursiveItemName(mCursor).c_str());
+    getConsole().print("%s", tmp);
     if (getOpenRaider().command(tmp) == 0) {
         setVisible(false);
     } else {
@@ -262,16 +153,16 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
         if (mCursor > 0)
             mCursor--;
         else
-            mCursor = mMapList.size() - 1;
+            mCursor = mapFolder->countRecursiveItems() - 1;
     } else if (key == downKey) {
-        if (mCursor < (mMapList.size() - 1))
+        if (mCursor < (mapFolder->countRecursiveItems() - 1))
             mCursor++;
         else
             mCursor = 0;
     } else if (key == rightKey) {
         long i = 10;
-        if (mCursor > (mMapList.size() - 11))
-            i = mMapList.size() - 1 - mCursor;
+        if (mCursor > (mapFolder->countRecursiveItems() - 11))
+            i = mapFolder->countRecursiveItems() - 1 - mCursor;
         while (i-- > 0)
             handleKeyboard(downKey, true);
     } else if (key == leftKey) {

src/OpenRaider.cpp

@@ -90,6 +90,13 @@ int OpenRaider::initialize() {
         return -6;
     }
 
+    // Initialize main menu
+    error = getMenu().initialize();
+    if (error != 0) {
+        printf("Could not initialize Menu (%d)!\n", error);
+        return -7;
+    }
+
 #ifdef DEBUG
     mFPS = true;
 #endif

src/TombRaider.cpp

@@ -366,7 +366,7 @@ unsigned char *TombRaider::Palette8()
 }
 
 
-int TombRaider::checkMime(char *filename) {
+int TombRaider::checkMime(const char *filename) {
     FILE *f;
     unsigned int version;
 

src/main.cpp

@@ -12,6 +12,7 @@
 #include "global.h"
 #include "Camera.h"
 #include "Console.h"
+#include "Exception.h"
 #include "FontManager.h"
 #include "Game.h"
 #include "Menu.h"
@@ -23,6 +24,8 @@
 #include "utils/strings.h"
 #include "utils/time.h"
 
+#ifndef UNIT_TEST
+
 #ifdef USING_AL
 #include "SoundAL.h"
 #else
@@ -362,3 +365,39 @@ KeyboardButton stringToKeyboardButton(const char *key) {
     return unknownKey;
 }
 
+#endif // UNIT_TEST
+
+#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS)
+#ifndef NDEBUG
+
+#include <exception>
+#include <execinfo.h>
+
+namespace {
+    extern std::terminate_handler oldTerminateHandler;
+
+    [[noreturn]] void terminateHandler() {
+        const unsigned int maxSize = 128;
+        void *callstack[maxSize];
+        int frames = backtrace(callstack, maxSize);
+        char **strs = backtrace_symbols(callstack, frames);
+
+        std::cout << std::endl;
+        for (int i = 0; i < frames; i++)
+            std::cout << strs[i] << std::endl;
+
+        delete [] strs;
+
+        std::cout << std::endl << "Last custom Exception:" << std::endl;
+        std::cout << "    " << Exception::getLastException() << std::endl << std::endl;
+
+        oldTerminateHandler();
+        abort();
+    }
+
+    std::terminate_handler oldTerminateHandler = std::set_terminate(terminateHandler);
+}
+
+#endif // NDEBUG
+#endif // HAVE_EXECINFO_H && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
+

src/utils/File.cpp

@@ -5,15 +5,25 @@
  * \author xythobuz
  */
 
+#include <algorithm>
+
 #include "global.h"
 #include "utils/File.h"
 #include "utils/Folder.h"
 
 File::File(std::string file) {
+    path = file;
 
+    size_t pos = path.rfind('/', path.length() - 2);
+    name = path.substr(pos + 1);
+    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 }
 
-File::~File() {
+std::string &File::getName() {
+    return name;
+}
 
+std::string &File::getPath() {
+    return path;
 }
 

src/utils/Folder.cpp

@@ -5,15 +5,250 @@
  * \author xythobuz
  */
 
+#include <algorithm>
+#include <iostream>
+#include <sstream>
+
 #include "global.h"
+#include "utils/filesystem.h"
 #include "utils/File.h"
 #include "utils/Folder.h"
 
-Folder::Folder(std::string folder) {
+#if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
+#include <dirent.h>
+#define USE_DIRENT
+#elif defined (_WIN32)
+#include <windows.h>
+#define USE_FINDFILE
+#else
+#error No support for recursive folder traversal
+#endif
+
+Folder::Folder(std::string folder, bool listDotFiles) {
+    if (((folder.length() == 0) || (folder.compare(".") == 0))
+#ifdef _WIN32
+            || ((folder.compare(1, 2, std::string(":\\")) != 0) && (folder.at(0) != '~'))
+#else
+            || ((folder.at(0) != '/') && (folder.at(0) != '~'))
+#endif
+            ) {
+        // Prepend current working directory
+        path = getCurrentWorkingDirectory();
+        if (folder.length() > 1)
+            path += folder.substr(1);
+    } else if (folder.at(0) == '~') {
+        // Prepend home directory
+        path = getHomeDirectory();
+        std::cout << "Home: " << path << std::endl;
+        if (folder.length() > 1)
+            path += folder.substr(1);
+    } else {
+        path = folder;
+    }
+
+    // Find all '\\' replace with '/'
+    size_t pos = path.find('\\');
+    while (pos != std::string::npos) {
+        path.at(pos) = '/';
+        pos = path.find('\\');
+    }
+
+    size_t last = path.rfind('/', path.length() - 2);
+    name = path.substr(last + 1);
+    if (name.back() == '/')
+        name.erase(name.length() - 1);
+
+    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+
+    if (path.back() != '/')
+        path.append(1, '/');
+
+    hasListed = false;
+    listDot = listDotFiles;
+}
+
+std::string &Folder::getName() {
+    return name;
+}
+
+std::string &Folder::getPath() {
+    return path;
+}
+
+unsigned long Folder::fileCount() {
+    createFolderItems();
+    return files.size();
+}
+
+File &Folder::getFile(unsigned long i) {
+    createFolderItems();
+    assert(i < files.size());
+    return files.at(i);
+}
+
+unsigned long Folder::folderCount() {
+    createFolderItems();
+    return folders.size();
+}
+
+Folder &Folder::getFolder(unsigned long i) {
+    createFolderItems();
+    assert(i < folders.size());
+    return folders.at(i);
+}
+
+unsigned long Folder::countRecursiveItems() {
+    unsigned long count = fileCount();
+
+    for (unsigned long i = 0; i < folderCount(); i++) {
+        count += getFolder(i).countRecursiveItems();
+    }
+
+    return count;
+}
+
+void Folder::executeRemoveRecursiveItems(std::function<bool (File &f)> func) {
+    for (unsigned long i = 0; i < fileCount(); i++) {
+        if (func(getFile(i))) {
+            files.erase(files.begin() + (long)i);
+        }
+    }
+
+    for (unsigned long i = 0; i < folderCount(); i++) {
+        getFolder(i).executeRemoveRecursiveItems(func);
+    }
+}
+
+std::string Folder::getRecursiveItemName(unsigned long i) {
+    assert(i < countRecursiveItems());
+    if (i < fileCount()) {
+        return getFile(i).getName();
+    } else {
+        for (unsigned long n = 0; n < folderCount(); n++) {
+            if ((i - fileCount()) < getFolder(n).countRecursiveItems()) {
+                return getFolder(n).getName() + '/'
+                    + getFolder(n).getRecursiveItemName(i - fileCount());
+            }
+        }
+    }
+
+    assert(false);
+    return "";
+}
+
+/*
+File &Folder::getRecursiveItem(unsigned long i) {
+    assert(i < countRecursiveItems());
+    if (i < fileCount()) {
+        return getFile(i);
+    } else {
+        for (unsigned long n = 0; n < folderCount(); n++) {
+            if ((i - fileCount()) < getFolder(n).countRecursiveItems()) {
+                return getFolder(n).getRecursiveItem(i - fileCount());
+            }
+        }
+    }
+
+    assert(false);
+    return files.at(0);
+}
+*/
+
+void Folder::createFolderItems() {
+    if (hasListed)
+        return;
+
+    std::vector<std::string> foundFiles, foundFolders;
+    if (readFolderItems(foundFiles, foundFolders) != 0)
+        throw Exception(std::string("Could not open folder ") + name);
+
+    if (!listDot) {
+        std::vector<std::string>::iterator it = foundFiles.begin();
+        while (it != foundFiles.end()) {
+            size_t pos = it->rfind('/', it->length() - 2);
+            if (it->at(pos + 1) == '.')
+                it = foundFiles.erase(it);
+            else
+                ++it;
+        }
 
+        it = foundFolders.begin();
+        while (it != foundFolders.end()) {
+            size_t pos = it->rfind('/', it->length() - 2);
+            if (it->at(pos + 1) == '.')
+                it = foundFolders.erase(it);
+            else
+                ++it;
+        }
+    }
+
+    for (unsigned long i = 0; i < foundFiles.size(); i++)
+        files.emplace_back(File(foundFiles.at(i)));
+
+    for (unsigned long i = 0; i < foundFolders.size(); i++)
+        folders.emplace_back(Folder(foundFolders.at(i)));
+
+    hasListed = true;
+}
+
+#ifdef USE_DIRENT
+
+int Folder::readFolderItems(std::vector<std::string> &foundFiles, std::vector<std::string> &foundFolders) {
+    struct dirent entry;
+    struct dirent *ep = nullptr;
+    DIR *pakDir;
+
+    pakDir = opendir(path.c_str());
+    if (pakDir != nullptr) {
+        readdir_r(pakDir, &entry, &ep);
+        while (ep != nullptr) {
+            if ((strcmp(".", ep->d_name) != 0)
+                     && (strcmp("..", ep->d_name) != 0)) {
+                std::string tmp(path);
+                if (tmp.back() != '/')
+                    tmp += '/';
+                tmp += ep->d_name;
+                if (ep->d_type == DT_DIR) {
+                    if (tmp.back() != '/')
+                        tmp += '/';
+                    foundFolders.push_back(std::string(tmp));
+                } else {
+                    foundFiles.push_back(std::string(tmp));
+                }
+            }
+            readdir_r(pakDir, &entry, &ep);
+        }
+        closedir(pakDir);
+    } else {
+        return 1;
+    }
+
+    return 0;
 }
 
-Folder::~Folder() {
+#elif defined(USE_FINDFILE)
+
+int Folder::readFolderItems(std::vector<std::string> &foundFiles, std::vector<std::string> &foundFolders) {
+    std::string tmp(path);
+    tmp += "/*";
 
+    WIN32_FIND_DATA fd;
+    HANDLE hFind = FindFirstFile(tmp.c_str(), &fd);
+    if (hFind == nullptr)
+        return 1;
+
+    do {
+        std::string s(path);
+        s = s + "/" + fd.cFileName;
+        if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            foundFolders.push_back(s);
+        else
+            foundFiles.push_back(s);
+    } while (FindNextFile(hFind, &fd) != 0);
+
+    FindClose(hFind);
+    return 0;
 }
 
+#endif
+

test/CMakeLists.txt

@@ -7,19 +7,29 @@ add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
 #################################################################
 
 add_executable (tester_binary EXCLUDE_FROM_ALL
-    "binary.cpp" "../src/utils/binary.cpp"
+    "binary.cpp" "../src/utils/binary.cpp" "../src/main.cpp"
 )
 add_dependencies (check tester_binary)
 add_test (NAME test_binary COMMAND tester_binary)
 
 #################################################################
 
+add_executable (tester_folder EXCLUDE_FROM_ALL
+    "Folder.cpp" "../src/utils/filesystem.cpp"
+    "../src/utils/Folder.cpp" "../src/utils/File.cpp"
+    "../src/Exception.cpp" "../src/main.cpp"
+)
+
+#add_dependencies (check tester_folder)
+#add_test (NAME test_folder COMMAND tester_folder)
+
+#################################################################
+
 add_executable (tester_script EXCLUDE_FROM_ALL
-    "Script.cpp" "../src/Script.cpp"
+    "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
     "../src/utils/binary.cpp" "../src/utils/strings.cpp"
 )
 
-# Currently not running Script test on make check (for Travis)
 #add_dependencies (check tester_script)
 #add_test (NAME test_script COMMAND tester_script)
 

test/Folder.cpp

@@ -0,0 +1,27 @@
+/*!
+ * \file test/Folder.cpp
+ * \brief File system utils unit test
+ *
+ * \author xythobuz
+ */
+
+#include <iostream>
+
+#include "global.h"
+#include "utils/File.h"
+#include "utils/Folder.h"
+
+int main() {
+    Folder f(".");
+
+    std::cout << f.folderCount() << " folders:" << std::endl;
+    for (unsigned long i = 0; i < f.folderCount(); i++)
+        std::cout << "\t" << f.getFolder(i).getName() << std::endl;
+
+    std::cout << f.fileCount() << " files:" << std::endl;
+    for (unsigned long i = 0; i < f.fileCount(); i++)
+        std::cout << "\t" << f.getFile(i).getName() << std::endl;
+
+    return 0;
+}
+