fix: 修正log打印错误

MaaXYZ · Oct 21, 2023 · 5d25d34 · 5d25d34
1 parent da539c6
commit 5d25d34
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/3rdparty/include/meojson/json.hpp b/3rdparty/include/meojson/json.hpp
@@ -2577,6 +2577,10 @@ namespace _serialization_helper
         using char_t = typename string_t::value_type;
         using ostringstream_t = std::basic_ostringstream<char_t, std::char_traits<char_t>, std::allocator<char_t>>;
 
+        template <typename input_t>
+        static constexpr bool is_convertible =
+            std::is_constructible_v<string_t, input_t> || (loose && has_output_operator<char_t, input_t>::value);
+
         template <typename input_t>
         string_t operator()(input_t&& arg) const
         {
@@ -2596,7 +2600,21 @@ namespace _serialization_helper
             }
         }
     };
-}
+
+    template <typename T>
+    void unable_to_serialize()
+    {
+        static_assert(!sizeof(T), "Unable to serialize T. "
+                                  "You can define the conversion of T to json, or overload operator<< for it. "
+                                  "See T below: "
+#ifdef _MSC_VER
+                      __FUNCSIG__
+#else
+                      __PRETTY_FUNCTION__
+#endif
+        );
+    }
+} // namespace _serialization_helper
 
 template <bool loose, typename any_t, typename string_t, typename string_converter_t>
 MEOJSON_INLINE basic_value<string_t> serialize(any_t&& arg, string_converter_t&& string_converter)
@@ -2612,12 +2630,16 @@ MEOJSON_INLINE basic_value<string_t> serialize(any_t&& arg, string_converter_t&&
     else if constexpr (std::is_constructible_v<basic_object<string_t>, any_t>) {
         return basic_object<string_t>(std::forward<any_t>(arg));
     }
+    else if constexpr (std::decay_t<string_converter_t>::template is_convertible<any_t>) {
+        return string_converter(std::forward<any_t>(arg));
+    }
     else if constexpr (is_sequence_container<std::decay_t<any_t>>) {
         basic_value<string_t> result;
         for (auto&& val : arg) {
             using value_t = decltype(val);
 
-            result.emplace(serialize<loose, value_t, string_t>(std::forward<value_t>(val), string_converter));
+            result.emplace(serialize<loose, value_t, string_t>(std::forward<value_t>(val),
+                                                               std::forward<string_converter_t>(string_converter)));
         }
         return result;
     }
@@ -2628,12 +2650,13 @@ MEOJSON_INLINE basic_value<string_t> serialize(any_t&& arg, string_converter_t&&
             using value_t = decltype(val);
 
             result.emplace(string_converter(std::forward<key_t>(key)),
-                           serialize<loose, value_t, string_t>(std::forward<value_t>(val), string_converter));
+                           serialize<loose, value_t, string_t>(std::forward<value_t>(val),
+                                                               std::forward<string_converter_t>(string_converter)));
         }
         return result;
     }
     else {
-        return string_converter(std::forward<any_t>(arg));
+        unable_to_serialize<any_t>();
     }
 }
 

diff --git a/source/include/Utils/Logger.h b/source/include/Utils/Logger.h
@@ -101,6 +101,11 @@ class MAA_UTILS_API Logger
     private:
         struct string_converter
         {
+            template <typename T>
+            static constexpr bool is_convertible =
+                std::same_as<std::filesystem::path, std::decay_t<T>> || std::same_as<std::wstring, std::decay_t<T>> ||
+                has_output_operator<T>;
+
             template <typename T>
             std::string operator()(T&& value) const
             {