Final version 1.1.0

Author: ediazva

src/package.cpp

@@ -43,8 +43,11 @@ namespace app {
       }
 
       m_pool.queueJob([path = std::move(path), this] {
+        if(m_shouldStop) return;
+        
         if(!processFile(path)) {
           m_promise.set_value(false);
+          m_shouldStop = true;
           return;
         }
 
@@ -90,11 +93,17 @@ namespace app {
     const auto& output = m_info.outputDir / fs::relative(dirpath, m_info.inputDir);
     VERBOSE("Creating directory in '{}'...", output.string());
     std::error_code e;
-    fs::create_directories(output, e);
+    if(!fs::create_directory(output, e)) {
+      if(e) {
+        ERROR("Failed to create directory in '{}'", output.string());
+        return false;
+      }
 
-    if(e) {
-      ERROR("Failed to create directory in '{}'", output.string());
-      return false;
+      WARNING("Directory located in '{}' already exists", output.string());
+    } else {
+      std::unique_lock lock(m_mtx);
+      m_cachefile.writePath(output);
+      m_cachefile.flush();
     }
 
     return true;
@@ -125,9 +134,9 @@ namespace app {
     m_cachefile{cachepath} {
     char buf[6];
     m_cachefile.read(buf, 6);
-    if(strcmp(buf, Package::MAGIC_NUMBER) != 0) {
+    if(strncmp(buf, Package::MAGIC_NUMBER, sizeof(buf)) != 0) {
       WARNING("File '{}' isn't a cache", m_cachefile.filepath().string());
-      return;
+      return; 
     }
 
     unsigned flags;
@@ -160,15 +169,24 @@ namespace app {
   }
 
   bool UninstallPackage::processDirectory(const fs::path& dirpath) {
-    // Nothing to do
+    m_disposeDirs.push(dirpath);
     return true;
   }
 
   void UninstallPackage::onEndProcess() {
     auto f = m_cachefile.filepath();
     m_cachefile.close();
 
-    fs::remove_all(m_info.outputDir);
+    for(fs::path p; !m_disposeDirs.empty(); m_disposeDirs.pop()) {
+      p = m_disposeDirs.top();
+      VERBOSE("Deleting directory located in '{}'", p.string());
+      if(std::error_code e; fs::remove(p, e), e) {
+        WARNING("Failed to delete directory '{}': {}", p.string(), e.message());
+      }
+    }
+
+    if(std::error_code e; !fs::remove(m_info.outputDir, e))
+      WARNING("Directory '{}' isn't empty", m_info.outputDir.string());
     fs::remove(f);
   }
 } // namespace app

src/package.hpp

@@ -35,6 +35,7 @@ namespace app {
 
     PackageInfo m_info;
   private:
+    bool m_shouldStop{};
     ThreadPool m_pool;
     std::mutex m_mtx;
     std::promise<bool> m_promise;
@@ -73,5 +74,6 @@ namespace app {
 
     std::queue<fs::path> m_dirs;
     utils::File m_cachefile;
+    std::priority_queue<fs::path> m_disposeDirs;
   };
 } // namespace app

src/program_options.cpp

@@ -163,15 +163,14 @@ namespace app {
 
    std::ostream& operator<<(std::ostream& out, const ProgramOptions& po) {
       using namespace std::literals;
-      utils::table<5> options(1);
+      utils::table<4> options(1);
       options.setTitle("OPTIONS");
-      options.addRow({"UNIQUE", "REQUIRED", "SHORT VERSION", "LONG VERSION", "DESCRIPTION"});
+      options.addRow({"UNIQUE", "SHORT VERSION", "LONG VERSION", "DESCRIPTION"});
 
       for(const auto& opt : po.options())
          options.addRow(
             {
                opt.isUniqueOption() ? "*" : "",
-               opt.doesRequiresValue() ? "*" : "",
                opt.aliasChr() != EOF ? "-"s + opt.aliasChr() + (opt.doesRequiresValue() ? " <" + opt.valueName() + ">" : "")  : "",
                "--" + opt.name() + (opt.doesRequiresValue() ? "=<" + opt.valueName() + ">" : ""),
                opt.description()

src/thread_pool.cpp

@@ -23,7 +23,11 @@ namespace app {
         job = m_jobs.front();
         m_jobs.pop();
       }
-      job();
+      try {
+        job();
+      } catch(...) {
+        break;
+      }
     }
   }