[uncia] update to 2.0.4 simplify code and improve cli

CMakeLists.txt

@@ -73,7 +73,7 @@ endif()
 
 set(UNCIA_VERSION_MAJOR 2)
 set(UNCIA_VERSION_MINOR 0)
-set(UNCIA_VERSION_PATCH 3)
+set(UNCIA_VERSION_PATCH 4)
 set(PACKAGE_VERSION "${UNCIA_VERSION_MAJOR}.${UNCIA_VERSION_MINOR}.${UNCIA_VERSION_PATCH}")
 
 string(TOLOWER "${CMAKE_C_COMPILER_ARCHITECTURE_ID}" UNCIA_ARCH_NAME)

include/archive.hpp

@@ -1,15 +1,40 @@
 #include <bela/base.hpp>
 #include <bela/str_cat.hpp>
+#include <filesystem>
 
 namespace uncia::archive {
-std::optional<std::string> JoinSanitizePath(std::wstring_view root, std::string_view filename, bool always_utf8 = true);
-bool MakeFlattened(std::wstring_view dir, std::wstring_view dest, bela::error_code &ec);
-bool MakeDir(std::wstring_view path, bela::error_code &ec);
-std::wstring_view PathRemoveExtension(std::wstring_view p);
-inline std::wstring FileDestination(std::wstring_view arfile) {
-  if (auto d = PathRemoveExtension(arfile); d.size() != arfile.size()) {
-    return std::wstring(d);
-  }
-  return bela::StringCat(arfile, L".out");
+// Flattened: find flatten child directories
+std::optional<std::filesystem::path> Flattened(const std::filesystem::path &d);
+// MakeFlattened: Flatten directories
+bool MakeFlattened(const std::filesystem::path &d, bela::error_code &ec);
+
+inline bool MakeDirectories(const std::filesystem::path &path, bela::error_code &ec) {
+  std::error_code e;
+  if (std::filesystem::exists(path, e)) {
+    return true;
+  }
+  if (std::filesystem::create_directories(path, e); e) {
+    ec = bela::make_error_code_from_std(e);
+    return false;
+  }
+  return true;
+}
+
+inline bool MakeParentDirectories(const std::filesystem::path &path, bela::error_code &ec) {
+  std::error_code e;
+  auto parent = path.parent_path();
+  if (std::filesystem::exists(parent, e)) {
+    return true;
+  }
+  if (std::filesystem::create_directories(parent, e); e) {
+    ec = bela::make_error_code_from_std(e);
+    return false;
+  }
+  return true;
 }
+std::wstring_view PathStripExtension(std::wstring_view p);
+std::optional<std::filesystem::path> MakeUnqiueExtractedDestination(const std::filesystem::path &archive_file,
+                                                                    std::filesystem::path &strict_folder);
+std::optional<std::filesystem::path> JoinSanitizeFsPath(const std::filesystem::path &root, std::string_view child_path,
+                                                        bool always_utf8, std::wstring &encoded_path);
 } // namespace uncia::archive

include/fmt.lock

@@ -1 +1 @@
-8.0.1
+8.1.1

include/fmt/args.h

@@ -143,6 +143,8 @@ class dynamic_format_arg_store
   }
 
  public:
+  constexpr dynamic_format_arg_store() = default;
+
   /**
     \rst
     Adds an argument into the dynamic store for later passing to a formatting