add RollingDateFileAppender.h

CMakeLists.txt

@@ -11,8 +11,12 @@ endif()
 
 # options
 option(PLOG_BUILD_SAMPLES "Build ${PROJECT_NAME} samples" ${IS_TOPLEVEL_PROJECT})
+option(PLOG_DISABLE_WCHAR_T "disable wchar_t ." OFF)
 option(PLOG_INSTALL "Generate ${PROJECT_NAME} install target" ${IS_TOPLEVEL_PROJECT})
 
+if(PLOG_DISABLE_WCHAR_T)
+    add_definitions(-DPLOG_DISABLE_WCHAR_T)
+endif()
 # make sure install paths work on all platforms
 include(GNUInstallDirs)
 

include/plog/Appenders/ConsoleAppender.h

@@ -48,7 +48,7 @@ namespace plog
     protected:
         void writestr(const util::nstring& str)
         {
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
             if (m_isatty)
             {
                 WriteConsoleW(m_outputHandle, str.c_str(), static_cast<DWORD>(str.size()), NULL, NULL);

include/plog/Appenders/DebugOutputAppender.h

@@ -10,7 +10,14 @@ namespace plog
     public:
         virtual void write(const Record& record) PLOG_OVERRIDE
         {
+#if defined(PLOG_DISABLE_WCHAR_T)
+            std::wostringstream _str ;
+            _str << Formatter::format(record).c_str();
+            std::wstring str = _str.str();
+            OutputDebugStringW(str.c_str());
+#else
             OutputDebugStringW(Formatter::format(record).c_str());
+#endif
         }
     };
 }

include/plog/Appenders/EventLogAppender.h

@@ -19,7 +19,13 @@ namespace plog
 
         virtual void write(const Record& record) PLOG_OVERRIDE
         {
+#if  defined(PLOG_DISABLE_WCHAR_T)
+            std::wostringstream _str ;
+            _str << Formatter::format(record).c_str();
+            std::wstring str = _str.str();
+#else
             std::wstring str = Formatter::format(record);
+#endif
             const wchar_t* logMessagePtr[] = { str.c_str() };
 
             ReportEventW(m_eventSource, logSeverityToType(record.getSeverity()), static_cast<WORD>(record.getSeverity()), 0, NULL, 1, 0, logMessagePtr, NULL);

include/plog/Appenders/RollingDateFileAppender.h

@@ -0,0 +1,102 @@
+//
+// Created by caesar kekxv on 2022/2/26.
+//
+
+#ifndef TERMINALSERVICE_ROLLINGDATEFILEAPPENDER_H
+#define TERMINALSERVICE_ROLLINGDATEFILEAPPENDER_H
+
+#include <plog/Appenders/RollingFileAppender.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+namespace plog {
+
+    template<class Formatter, class Converter = NativeEOLConverter <UTF8Converter> >
+    class PLOG_LINKAGE_HIDDEN RollingDateFileAppender : public RollingFileAppender<Formatter, Converter> {
+    private:
+        time_t last_date;
+        size_t m_fileSize;
+        util::nstring m_fileName;
+
+    public:
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
+        /**
+         *
+         * @param fileName "%Y-%m-%d-%H-%M-%S"
+         * @param maxFileSize
+         * @param maxFiles
+         */
+        inline explicit RollingDateFileAppender(const char* fileName,int maxFiles = 0)
+                : RollingFileAppender<Formatter, Converter>(
+                util::get_file_name(fileName).c_str())
+        {
+            m_fileSize = maxFiles;
+            m_fileName = util::toWide(fileName).c_str();
+            last_date = util::get_zero_time();
+        }
+#endif
+
+        inline void setFileName(const util::nchar *fileName) {
+            m_fileName = fileName;
+            RollingFileAppender<Formatter, Converter>::setFileName(util::get_file_name(fileName).c_str());
+            if (!(util::exists(util::get_file_name(fileName).c_str()))) {
+                RollingFileAppender<Formatter, Converter>::rollLogFiles();
+            }
+        }
+
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
+        void setFileName(const char* fileName)
+        {
+            setFileName(util::toWide(fileName).c_str());
+        }
+#endif
+
+
+        /**
+         *
+         * @param fileName "%Y-%m-%d-%H-%M-%S"
+         * @param maxFileSize
+         * @param maxFiles
+         */
+        inline explicit RollingDateFileAppender(const util::nchar *fileName, size_t maxFiles = 0)
+                : RollingFileAppender<Formatter, Converter>(
+                util::get_file_name(fileName).c_str()) {
+            m_fileSize = maxFiles;
+            m_fileName = fileName;
+            last_date = 0;
+        }
+
+        inline void setMaxFiles(size_t maxFiles) {
+            m_fileSize = maxFiles;
+        }
+
+        inline void write(const Record &record)  PLOG_OVERRIDE {
+            if (record.getTime().time >= last_date) {
+                std::string path = util::get_file_name(m_fileName.c_str());
+                RollingFileAppender<Formatter, Converter>::setFileName(path.c_str());
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
+                if (path != util::toNarrow(m_fileName.c_str(),CP_UTF8) && m_fileSize > 0) {
+#else
+                if (path != m_fileName && m_fileSize > 0) {
+#endif
+                    int size = (int) m_fileSize;
+                    std::string lastFileName = util::get_file_name(m_fileName.c_str(), -size);
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
+                    util::File::unlink(util::toWide(lastFileName.c_str()).c_str());
+#else
+                    util::File::unlink(lastFileName.c_str());
+#endif
+                }
+                if (!(util::exists(path.c_str()))) {
+                    RollingFileAppender<Formatter, Converter>::rollLogFiles();
+                }
+                last_date = util::get_zero_time();
+            }
+            RollingFileAppender<Formatter, Converter>::write(record);
+        }
+    };
+}
+
+
+#endif //TERMINALSERVICE_ROLLINGDATEFILEAPPENDER_H

include/plog/Appenders/RollingFileAppender.h

@@ -12,16 +12,16 @@ namespace plog
     {
     public:
         RollingFileAppender(const util::nchar* fileName, size_t maxFileSize = 0, int maxFiles = 0)
-            : m_fileSize()
-            , m_maxFileSize()
-            , m_maxFiles(maxFiles)
-            , m_firstWrite(true)
+                : m_fileSize()
+                , m_maxFileSize()
+                , m_maxFiles(maxFiles)
+                , m_firstWrite(true)
         {
             setFileName(fileName);
             setMaxFileSize(maxFileSize);
         }
 
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
         RollingFileAppender(const char* fileName, size_t maxFileSize = 0, int maxFiles = 0)
             : m_fileSize()
             , m_maxFileSize()
@@ -65,7 +65,7 @@ namespace plog
             m_firstWrite = true;
         }
 
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
         void setFileName(const char* fileName)
         {
             setFileName(util::toWide(fileName).c_str());

include/plog/Converters/NativeEOLConverter.h

@@ -8,7 +8,7 @@ namespace plog
     class NativeEOLConverter : public NextConverter
     {
 #ifdef _WIN32
-    public:
+        public:
         static std::string header(const util::nstring& str)
         {
             return NextConverter::header(fixLineEndings(str));
@@ -20,18 +20,18 @@ namespace plog
         }
 
     private:
-        static std::wstring fixLineEndings(const std::wstring& str)
+        static util::nstring fixLineEndings(const util::nstring& str)
         {
-            std::wstring output;
+            util::nstring output;
             output.reserve(str.length() * 2);
 
             for (size_t i = 0; i < str.size(); ++i)
             {
-                wchar_t ch = str[i];
+                util::nchar ch = str[i];
 
-                if (ch == L'\n')
+                if (ch == PLOG_NSTR('\n'))
                 {
-                    output.push_back(L'\r');
+                    output.push_back(PLOG_NSTR('\r'));
                 }
 
                 output.push_back(ch);

include/plog/Converters/UTF8Converter.h

@@ -13,7 +13,7 @@ namespace plog
             return std::string(kBOM) + convert(str);
         }
 
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
         static std::string convert(const util::nstring& str)
         {
             return util::toNarrow(str, codePage::kUTF8);

include/plog/Init.h

@@ -1,17 +1,15 @@
 #pragma once
+
 #include <plog/Logger.h>
 
-namespace plog
-{
+namespace plog {
     template<int instanceId>
-    PLOG_LINKAGE_HIDDEN inline Logger<instanceId>& init(Severity maxSeverity = none, IAppender* appender = NULL)
-    {
+    PLOG_LINKAGE_HIDDEN inline Logger <instanceId> &init(Severity maxSeverity = none, IAppender *appender = NULL) {
         static Logger<instanceId> logger(maxSeverity);
         return appender ? logger.addAppender(appender) : logger;
     }
 
-    inline Logger<PLOG_DEFAULT_INSTANCE_ID>& init(Severity maxSeverity = none, IAppender* appender = NULL)
-    {
+    inline Logger<PLOG_DEFAULT_INSTANCE_ID> &init(Severity maxSeverity = none, IAppender *appender = NULL) {
         return init<PLOG_DEFAULT_INSTANCE_ID>(maxSeverity, appender);
     }
 }

include/plog/Record.h

@@ -86,7 +86,7 @@ namespace plog
         //////////////////////////////////////////////////////////////////////////
         // Stream output operators as free functions
 
-#if PLOG_ENABLE_WCHAR_INPUT
+#if !defined(PLOG_DISABLE_WCHAR_T) && PLOG_ENABLE_WCHAR_INPUT
         inline void operator<<(util::nostringstream& stream, const wchar_t* data)
         {
             data = data ? data : L"(null)";
@@ -113,9 +113,9 @@ namespace plog
         {
             data = data ? data : "(null)";
 
-#if defined(_WIN32) && defined(__BORLANDC__)
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32) && defined(__BORLANDC__)
             stream << util::toWide(data);
-#elif defined(_WIN32)
+#elif !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
             std::operator<<(stream, util::toWide(data));
 #else
             std::operator<<(stream, data);
@@ -246,15 +246,15 @@ namespace plog
             return *this << str;
         }
 
-#if PLOG_ENABLE_WCHAR_INPUT
+#if !defined(PLOG_DISABLE_WCHAR_T) && PLOG_ENABLE_WCHAR_INPUT
         Record& operator<<(wchar_t data)
         {
             wchar_t str[] = { data, 0 };
             return *this << str;
         }
 #endif
 
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
         Record& operator<<(std::wostream& (PLOG_CDECL *data)(std::wostream&))
 #else
         Record& operator<<(std::ostream& (*data)(std::ostream&))
@@ -317,7 +317,7 @@ namespace plog
             return *this;
         }
 
-#ifdef _WIN32
+#if !defined(PLOG_DISABLE_WCHAR_T) && defined(_WIN32)
         Record& printf(const wchar_t* format, ...)
         {
             using namespace util;