From 64aadf5e1e7224e87ec9981d62e37a024c44f9ac Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 12 Jul 2021 17:39:36 +0200
Subject: [PATCH] continued functions to create/delete dir

---
 bsp_q7s/memory/FileSystemHandler.cpp | 37 ++++++++++++++++++++++++++--
 bsp_q7s/memory/FileSystemHandler.h   |  3 ++-
 fsfw                                 |  2 +-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/bsp_q7s/memory/FileSystemHandler.cpp b/bsp_q7s/memory/FileSystemHandler.cpp
index ba64a991..12c3a20b 100644
--- a/bsp_q7s/memory/FileSystemHandler.cpp
+++ b/bsp_q7s/memory/FileSystemHandler.cpp
@@ -4,6 +4,8 @@
 #include "fsfw/memory/GenericFileSystemMessage.h"
 #include "fsfw/ipc/QueueFactory.h"
 
+#include <filesystem>
+
 FileSystemHandler::FileSystemHandler(object_id_t fileSystemHandler):
         SystemObject(fileSystemHandler) {
     mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE);
@@ -133,9 +135,40 @@ ReturnValue_t FileSystemHandler::deleteFile(const char *repositoryPath, const ch
 }
 
 ReturnValue_t FileSystemHandler::createDirectory(const char *repositoryPath, void *args) {
-    return HasReturnvaluesIF::RETURN_OK;
+    std::string fullPath = currentMountPrefix + std::string(repositoryPath);
+    if(std::filesystem::exists(fullPath)) {
+        return DIRECTORY_ALREADY_EXISTS;
+    }
+    if(std::filesystem::create_directory(fullPath)) {
+        return HasReturnvaluesIF::RETURN_OK;
+    }
+    sif::warning << "Creating directory " << fullPath << " failed" << std::endl;
+    return GENERIC_FILE_ERROR;
 }
 
-ReturnValue_t FileSystemHandler::removeDirectory(const char *repositoryPath, void *args) {
+ReturnValue_t FileSystemHandler::removeDirectory(const char *repositoryPath,
+        bool deleteRecurively, void *args) {
+    std::string fullPath = currentMountPrefix + std::string(repositoryPath);
+    if(not std::filesystem::exists(fullPath)) {
+        return DIRECTORY_DOES_NOT_EXIST;
+    }
+    std::error_code err;
+    if(not deleteRecurively) {
+        if(std::filesystem::remove(fullPath, err)) {
+            return HasReturnvaluesIF::RETURN_OK;
+        }
+        else {
+            // Check error code. Most probably denied permissions because folder is not empty
+        }
+    }
+    else {
+        if(std::filesystem::remove_all(fullPath, err)) {
+            return HasReturnvaluesIF::RETURN_OK;
+        }
+        else {
+            // Check error code
+        }
+    }
+
     return HasReturnvaluesIF::RETURN_OK;
 }
diff --git a/bsp_q7s/memory/FileSystemHandler.h b/bsp_q7s/memory/FileSystemHandler.h
index 9d3285b1..4f82566d 100644
--- a/bsp_q7s/memory/FileSystemHandler.h
+++ b/bsp_q7s/memory/FileSystemHandler.h
@@ -47,7 +47,8 @@ private:
     ReturnValue_t deleteFile(const char* repositoryPath,
             const char* filename, void* args = nullptr) override;
     ReturnValue_t createDirectory(const char* repositoryPath, void* args = nullptr) override;
-    ReturnValue_t removeDirectory(const char* repositoryPath, void* args = nullptr) override;
+    ReturnValue_t removeDirectory(const char* repositoryPath,  bool deleteRecurively = false,
+            void* args = nullptr) override;
 };
 
 
diff --git a/fsfw b/fsfw
index 323577cd..da8a4470 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 323577cdc69ee2d863e6e61cebd71a8aa75c6d2b
+Subproject commit da8a4470734808bed4d872e47c192af694382c41