OrcLib: Text: Fmt: add specialization for Result

DFIR-ORC · Jan 26, 2021 · 2053818 · 2053818
1 parent b4e00ee
commit 2053818
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 0 deletions.
diff --git a/src/OrcLib/CMakeLists.txt b/src/OrcLib/CMakeLists.txt
@@ -586,6 +586,7 @@ set(SRC_INOUT_TEXT_FMT
     "Output/Text/Fmt/PartitionFlags.h"
     "Output/Text/Fmt/PartitionType.h"
     "Output/Text/Fmt/path.h"
+    "Output/Text/Fmt/Result.h"
     "Output/Text/Fmt/SYSTEMTIME.h"
     "Output/Text/Fmt/TimeUtc.h"
 )
@@ -608,6 +609,7 @@ set(SRC_INOUT_TEXT_FMT_FWD
     "Output/Text/Fmt/Fwd/PartitionFlags.h"
     "Output/Text/Fmt/Fwd/PartitionType.h"
     "Output/Text/Fmt/Fwd/SYSTEMTIME.h"
+    "Output/Text/Fmt/Fwd/Result.h"
     "Output/Text/Fmt/Fwd/TimeUtc.h")
 
 source_group(In&Out\\Output\\Text\\Fmt\\Fwd FILES ${SRC_INOUT_TEXT_FMT_FWD})

diff --git a/src/OrcLib/Output/Text/Fmt/Formatter.h b/src/OrcLib/Output/Text/Fmt/Formatter.h
@@ -25,4 +25,5 @@
 #include "Output/Text/Fmt/Fwd/PartitionType.h"
 #include "Output/Text/Fmt/Fwd/PartitionFlags.h"
 #include "Output/Text/Fmt/Fwd/SYSTEMTIME.h"
+#include "Output/Text/Fmt/Fwd/Result.h"
 #include "Output/Text/Fmt/Fwd/TimeUtc.h"
diff --git a/src/OrcLib/Output/Text/Fmt/Fwd/Result.h b/src/OrcLib/Output/Text/Fmt/Fwd/Result.h
@@ -0,0 +1,26 @@
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+//
+// Copyright © 2020 ANSSI. All Rights Reserved.
+//
+// Author(s): fabienfl (ANSSI)
+//
+
+#pragma once
+
+#include <fmt/format.h>
+#include <boost/outcome/outcome.hpp>
+
+template <typename T>
+struct fmt::formatter<boost::outcome_v2::std_result<T>> : public fmt::formatter<std::string_view>
+{
+    template <typename FormatContext>
+    auto format(const boost::outcome_v2::std_result<T>& result, FormatContext& ctx) -> decltype(ctx.out());
+};
+
+template <typename T>
+struct fmt::formatter<boost::outcome_v2::std_result<T>, wchar_t> : public fmt::formatter<std::wstring_view, wchar_t>
+{
+    template <typename FormatContext>
+    auto format(const boost::outcome_v2::std_result<T>& result, FormatContext& ctx) -> decltype(ctx.out());
+};
diff --git a/src/OrcLib/Output/Text/Fmt/Result.h b/src/OrcLib/Output/Text/Fmt/Result.h
@@ -0,0 +1,40 @@
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+//
+// Copyright © 2020 ANSSI. All Rights Reserved.
+//
+// Author(s): fabienfl (ANSSI)
+//
+
+#pragma once
+
+#include "Output/Text/Fmt/Fwd/Result.h"
+
+#include "Utils/Result.h"
+
+template <typename T>
+template <typename FormatContext>
+auto fmt::formatter<Orc::Result<T>>::format(const Orc::Result<T>& result, FormatContext& ctx) -> decltype(ctx.out())
+{
+    if (result.has_error())
+    {
+        const auto msg = fmt::format("{}", result.error());
+        return fmt::formatter<std::string_view>::format(msg, ctx);
+    }
+
+    return formatter<std::string_view>::format("Success", ctx);
+}
+
+template <typename T>
+template <typename FormatContext>
+auto fmt::formatter<Orc::Result<T>, wchar_t>::format(const Orc::Result<T>& result, FormatContext& ctx)
+    -> decltype(ctx.out())
+{
+    if (result.has_error())
+    {
+        const auto msg = fmt::format(L"{}", result.error());
+        return fmt::formatter<std::wstring_view, wchar_t>::format(msg, ctx);
+    }
+
+    return formatter<std::wstring_view, wchar_t>::format(L"Success", ctx);
+}