From 1ad90eb770dae7b4ef9952443acc8c324adfc9f9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 5 Jun 2019 23:49:35 +0200
Subject: [PATCH] Use std::filesystem in argumentparser.cpp

---
 CMakeLists.txt                 |  4 +++
 application/argumentparser.cpp | 52 +++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88c10c6..3fda3a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,10 @@ else ()
     message(STATUS "Using std::fstream for NativeFileStream")
 endif ()
 
+# configure required libraries for std::filestream
+message(STATUS "calling use_filesystem()")
+use_standard_filesystem()
+
 # configure forcing UTF-8 code page under Windows
 option(FORCE_UTF8_CODEPAGE "forces use of UTF-8 code page under Windows via ApplicationUtilities::startConsole()" OFF)
 if (FORCE_UTF8_CODEPAGE)
diff --git a/application/argumentparser.cpp b/application/argumentparser.cpp
index 82b4388..ad637a5 100644
--- a/application/argumentparser.cpp
+++ b/application/argumentparser.cpp
@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 #include <iostream>
 #include <set>
 #include <sstream>
@@ -19,6 +20,7 @@
 
 using namespace std;
 using namespace std::placeholders;
+using namespace std::literals;
 using namespace ConversionUtilities;
 using namespace EscapeCodes;
 using namespace IoUtilities;
@@ -1515,36 +1517,40 @@ void ArgumentParser::printBashCompletion(int argc, const char *const *argv, unsi
     }
 
     // -> completion for files and dirs
-    DirectoryEntryType entryTypes = DirectoryEntryType::None;
-    if (completionInfo.completeFiles) {
-        entryTypes |= DirectoryEntryType::File;
-    }
-    if (completionInfo.completeDirs) {
-        entryTypes |= DirectoryEntryType::Directory;
-    }
-    if (entryTypes != DirectoryEntryType::None) {
-        const string replace("'"), with("'\"'\"'");
-        if (argc && currentWordIndex <= completionInfo.lastSpecifiedArgIndex && opening) {
-            list<string> entries = directoryEntries(actualDir.c_str(), entryTypes);
-            findAndReplace(actualDir, replace, with);
-            for (string &dirEntry : entries) {
-                if (!startsWith(dirEntry, actualFile)) {
+    if (completionInfo.completeFiles || completionInfo.completeDirs) {
+        using namespace std::filesystem;
+        const auto replace = "'"s, with = "'\"'\"'"s;
+        const auto useActualDir = argc && currentWordIndex <= completionInfo.lastSpecifiedArgIndex && opening;
+        const auto dirEntries = [&] {
+            directory_iterator i;
+            if (useActualDir) {
+                i = directory_iterator(actualDir);
+                findAndReplace(actualDir, replace, with);
+            } else {
+                i = directory_iterator(".");
+            }
+            return i;
+        }();
+        for (const auto &dirEntry : dirEntries) {
+            if (!completionInfo.completeDirs && dirEntry.is_directory()) {
+                continue;
+            }
+            if (!completionInfo.completeFiles && !dirEntry.is_directory()) {
+                continue;
+            }
+            auto dirEntryName = dirEntry.path().filename().string();
+            if (useActualDir) {
+                if (!startsWith(dirEntryName, actualFile)) {
                     continue;
                 }
                 cout << '\'';
                 if (actualDir != ".") {
                     cout << actualDir;
                 }
-                findAndReplace(dirEntry, replace, with);
-                cout << dirEntry << '\'' << ' ';
-                haveFileOrDirCompletions = true;
-            }
-        } else {
-            for (string &dirEntry : directoryEntries(".", entryTypes)) {
-                findAndReplace(dirEntry, replace, with);
-                cout << '\'' << dirEntry << '\'' << ' ';
-                haveFileOrDirCompletions = true;
             }
+            findAndReplace(dirEntryName, replace, with);
+            cout << dirEntryName << '\'' << ' ';
+            haveFileOrDirCompletions = true;
         }
     }
     cout << ')';