From c557970ef438dd19d15ddc7cd1c9778a7448b1f2 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 9 Sep 2022 23:06:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9D=E7=89=88=20Logger::separator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/Controller.cpp |  2 +-
 src/MeoAssistant/Logger.hpp     | 57 ++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp
index 408aa4b7d9..5f3f587061 100644
--- a/src/MeoAssistant/Controller.cpp
+++ b/src/MeoAssistant/Controller.cpp
@@ -422,7 +422,7 @@ std::optional<std::string> asst::Controller::call_command(const std::string& cmd
     Log.info("Call `", cmd, "` ret", exit_ret, ", cost", duration, "ms , stdout size:", pipe_data.size(),
              ", socket size:", sock_data.size());
     if (!pipe_data.empty() && pipe_data.size() < 4096) {
-        Log.trace("output:\n", pipe_data);
+        Log.trace("output:", Logger::separator("\n"), pipe_data);
     }
 
     if (!exit_ret) {
diff --git a/src/MeoAssistant/Logger.hpp b/src/MeoAssistant/Logger.hpp
index 26a52c6970..668142eb90 100644
--- a/src/MeoAssistant/Logger.hpp
+++ b/src/MeoAssistant/Logger.hpp
@@ -17,6 +17,13 @@ namespace asst
 {
     class Logger : public SingletonHolder<Logger>
     {
+    public:
+        struct separator
+        {
+            separator(std::string_view str) : str(str) {}
+            std::string_view str;
+        };
+
     public:
         virtual ~Logger() override { flush(); }
 
@@ -35,7 +42,7 @@ namespace asst
         {
 #ifdef ASST_DEBUG
             std::string_view level = "DEB";
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
 #endif
         }
 
@@ -43,30 +50,30 @@ namespace asst
         inline void trace(Args&&... args)
         {
             std::string_view level = "TRC";
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
         }
         template <typename... Args>
         inline void info(Args&&... args)
         {
             std::string_view level = "INF";
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
         }
         template <typename... Args>
         inline void warn(Args&&... args)
         {
             std::string_view level = "WRN";
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
         }
         template <typename... Args>
         inline void error(Args&&... args)
         {
             std::string_view level = "ERR";
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
         }
         template <typename... Args>
         inline void log_with_custom_level(std::string_view level, Args&&... args)
         {
-            log(level, std::forward<Args>(args)...);
+            log(level, DefaultSeparator, std::forward<Args>(args)...);
         }
         void flush()
         {
@@ -111,7 +118,7 @@ namespace asst
         }
 
         template <typename... Args>
-        void log(std::string_view level, Args&&... args)
+        void log(std::string_view level, const separator& sep, Args&&... args)
         {
             std::unique_lock<std::mutex> trace_lock(m_trace_mutex);
 
@@ -134,13 +141,13 @@ namespace asst
                 m_ofs = std::ofstream(m_log_path, std::ios::out | std::ios::app);
             }
 #ifdef ASST_DEBUG
-            stream_put_line(m_ofs, buff, args...);
+            stream_put_line(m_ofs, sep, buff, args...);
 #else
-            stream_put_line<false>(m_ofs, buff, std::forward<Args>(args)...);
+            stream_put_line<false>(m_ofs, sep, buff, std::forward<Args>(args)...);
 #endif
 
 #ifdef ASST_DEBUG
-            stream_put_line<true>(std::cout, buff, std::forward<Args>(args)...);
+            stream_put_line<true>(std::cout, sep, buff, std::forward<Args>(args)...);
 #endif
         }
 
@@ -181,7 +188,7 @@ namespace asst
                 for (const auto& elem : std::forward<T>(v)) {
                     s << comma;
                     stream_put<ToAnsi>(s, elem);
-                    comma = ",";
+                    comma = ", ";
                 }
                 s << "]";
                 return s;
@@ -202,18 +209,31 @@ namespace asst
         template <bool ToAnsi, typename Stream>
         struct stream_put_line_impl<ToAnsi, Stream>
         {
-            static constexpr Stream& apply(Stream& s)
+            static constexpr Stream& apply(Stream& s, const separator& sep)
             {
+                std::ignore = sep;
                 s << std::endl;
                 return s;
             }
         };
 
+        template <bool ToAnsi, typename Stream, typename... Rest>
+        struct stream_put_line_impl<ToAnsi, Stream, separator, Rest...>
+        {
+            static constexpr Stream& apply(Stream& s, const separator& sep, const separator& new_sep, Rest&&... rs)
+            {
+                std::ignore = sep;
+                stream_put_line_impl<ToAnsi, Stream, Rest...>::apply(s, new_sep, std::forward<Rest>(rs)...);
+                return s;
+            }
+        };
+
         template <bool ToAnsi, typename Stream, typename Only>
         struct stream_put_line_impl<ToAnsi, Stream, Only>
         {
-            static constexpr Stream& apply(Stream& s, Only&& only)
+            static constexpr Stream& apply(Stream& s, const separator& sep, Only&& only)
             {
+                std::ignore = sep;
                 stream_put<ToAnsi>(s, std::forward<Only>(only));
                 s << std::endl;
                 return s;
@@ -223,21 +243,22 @@ namespace asst
         template <bool ToAnsi, typename Stream, typename First, typename... Rest>
         struct stream_put_line_impl<ToAnsi, Stream, First, Rest...>
         {
-            static constexpr Stream& apply(Stream& s, First&& f, Rest&&... rs)
+            static constexpr Stream& apply(Stream& s, const separator& sep, First&& f, Rest&&... rs)
             {
                 stream_put<ToAnsi>(s, std::forward<First>(f));
-                s << " ";
-                stream_put_line_impl<ToAnsi, Stream, Rest...>::apply(s, std::forward<Rest>(rs)...);
+                s << sep.str;
+                stream_put_line_impl<ToAnsi, Stream, Rest...>::apply(s, sep, std::forward<Rest>(rs)...);
                 return s;
             }
         };
 
         template <bool ToAnsi = false, typename Stream, typename... Args>
-        Stream& stream_put_line(Stream& s, Args&&... args)
+        Stream& stream_put_line(Stream& s, const separator& sep, Args&&... args)
         {
-            return stream_put_line_impl<ToAnsi, Stream, Args...>::apply(s, std::forward<Args>(args)...);
+            return stream_put_line_impl<ToAnsi, Stream, Args...>::apply(s, sep, std::forward<Args>(args)...);
         }
 
+        inline static const separator DefaultSeparator { " " };
         inline static std::filesystem::path m_directory;
 
         std::filesystem::path m_log_path = m_directory / "asst.log";