Add timestamp formatting

Author: Pixels67

CMakeLists.txt

@@ -6,8 +6,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/out/lib/${CMAKE_SYSTEM_
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/out/bin/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE})
 include_directories(src include)
 
-add_library(
-    logger STATIC
+set(
+    LIBRARY_SOURCES
     src/Logger.cpp
     include/Logger.hpp
     include/Time.hpp
@@ -22,19 +22,5 @@ add_library(
     src/StringOps.cpp
 )
 
-add_executable(
-    example
-    src/Logger.cpp
-    include/Logger.hpp
-    src/example/example.cpp
-    include/Time.hpp
-    src/Time.cpp
-    include/Format.hpp
-    src/Format.cpp
-    include/Log.hpp
-    src/Log.cpp
-    include/Convert.hpp
-    src/Convert.cpp
-    include/StringOps.hpp
-    src/StringOps.cpp
-)
+add_library(logger STATIC ${LIBRARY_SOURCES})
+add_executable(example ${LIBRARY_SOURCES} src/example/example.cpp)

README.md

@@ -20,8 +20,13 @@ cmake --build ./build
 using namespace SSBL;
 
 Logger logger;
+
+// Configuration (color and timestamp)
 logger.SetConfig(Config::All);
 
+// Timestamp formatting
+logger.SetTimestampFormat("%h:%m:%s");
+
 // Log levels
 logger.Log()      << "Hello, Info!\n";
 logger.LogWarn()  << "Hello, Warning!\n";

include/Log.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Time.hpp"
 #include <string>
 
 namespace SSBL {
@@ -43,6 +44,6 @@ constexpr Config operator~(Config level) {
     return static_cast<Config>(~static_cast<char>(level));
 }
 
-std::string ToLog(const std::string &string, Level level, Config config);
+std::string ToLog(const std::string &string, Level level, Config config, const std::string &timestampFormat = DEFAULT_FORMAT);
 std::string LogLevelToString(Level level);
 } // namespace SSBL

include/Logger.hpp

@@ -35,6 +35,7 @@ class Logger {
     void SetOutStream(std::ostream *messageOutStream, std::ostream *errorOutStream);
     void SetConfig(const Config &config);
     void SetLevelMask(Level level);
+    void SetTimestampFormat(const std::string &format);
     bool IsLevelIncluded(Level level) const;
 
 private:
@@ -49,6 +50,8 @@ class Logger {
     Level m_levelMask = Level::All;
     Level m_level = Level::Info;
 
+    std::string m_timestampFormat = DEFAULT_FORMAT;
+
     void Send(const std::string &string);
     void Flush();
 

include/Time.hpp

@@ -3,5 +3,20 @@
 #include <string>
 
 namespace SSBL {
-std::string GetTimestamp();
+
+constexpr std::string DEFAULT_FORMAT = "%Y %M %D %h:%m:%s";
+
+struct Time {
+    size_t year;
+    std::string month;
+    size_t day;
+    size_t hour;
+    size_t minute;
+    size_t second;
+
+    explicit Time(time_t time);
+
+    [[nodiscard]] std::string AsString(const std::string &format = DEFAULT_FORMAT) const;
+    [[nodiscard]] static std::string GetCurrentTime(const std::string &format  = DEFAULT_FORMAT);
+};
 } // namespace SSBL

src/Log.cpp

@@ -5,11 +5,11 @@
 
 namespace SSBL {
 
-std::string ToLog(const std::string &string, const Level level, const Config config) {
+std::string ToLog(const std::string &string, const Level level, const Config config, const std::string &timestampFormat) {
     std::string log;
 
     if (static_cast<bool>(config & Config::Timestamp))
-        log += WithPadding(GetTimestamp());
+        log += WithPadding(Time::GetCurrentTime(timestampFormat));
 
     log += WithPadding(LogLevelToString(level));
     log += string;

src/Logger.cpp

@@ -45,6 +45,10 @@ void Logger::SetLevelMask(const Level level) {
     m_levelMask = level;
 }
 
+void Logger::SetTimestampFormat(const std::string &format) {
+    m_timestampFormat = format;
+}
+
 bool Logger::IsLevelIncluded(const Level level) const {
     return (static_cast<int>(level) & static_cast<int>(m_levelMask)) != 0;
 }
@@ -62,14 +66,14 @@ void Logger::Send(const std::string &string) {
 
     switch (m_level) {
     case Level::Fatal:
-        *m_errOutStream << ToLog(string, m_level, m_config);
+        *m_errOutStream << ToLog(string, m_level, m_config, m_timestampFormat);
         std::exit(EXIT_FAILURE);
         break;
     case Level::Error:
-        *m_errOutStream << ToLog(string, m_level, m_config);
+        *m_errOutStream << ToLog(string, m_level, m_config, m_timestampFormat);
         break;
     default:
-        *m_msgOutStream << ToLog(string, m_level, m_config);
+        *m_msgOutStream << ToLog(string, m_level, m_config, m_timestampFormat);
         break;
     }
 }

src/Time.cpp

@@ -1,17 +1,40 @@
 #include "Time.hpp"
 
+#include "StringOps.hpp"
 #include <chrono>
 #include <ctime>
 
 namespace SSBL {
-std::string GetTimestamp() {
-    using std::chrono::system_clock;
+Time::Time(const time_t time) {
+    const std::string timeString = std::ctime(&time);
 
-    const auto currentTime = system_clock::to_time_t(system_clock::now());
+    year   = std::stoi(timeString.substr(20, 4));
+    month  = timeString.substr(4, 3);
+    day    = std::stoi(timeString.substr(8, 2));
+
+    hour   = std::stoi(timeString.substr(11, 2));
+    minute = std::stoi(timeString.substr(14, 2));
+    second = std::stoi(timeString.substr(17, 2));
+}
+
+std::string Time::AsString(const std::string &format) const {
+    std::string result = format;
+
+    result = ReplaceAll(result, "%Y", std::to_string(year));
+    result = ReplaceAll(result, "%M", month);
+    result = ReplaceAll(result, "%D", std::to_string(day));
 
-    std::string currentTimeString = ctime(&currentTime);
-    currentTimeString.pop_back();
+    result = ReplaceAll(result, "%h", std::to_string(hour));
+    result = ReplaceAll(result, "%m", std::to_string(minute));
+    result = ReplaceAll(result, "%s", std::to_string(second));
 
-    return currentTimeString;
+    return result;
+}
+
+std::string Time::GetCurrentTime(const std::string &format) {
+    using std::chrono::system_clock;
+
+    const auto currentTime = system_clock::to_time_t(system_clock::now());
+    return Time(currentTime).AsString(format);
 }
 } // namespace SSBL

src/example/example.cpp

@@ -4,8 +4,13 @@ int main() {
     using namespace SSBL;
 
     Logger logger;
+
+    // Configuration (color and timestamp)
     logger.SetConfig(Config::All);
 
+    // Timestamp formatting
+    logger.SetTimestampFormat("%h:%m:%s");
+
     // Log levels
     logger.Log()      << "Hello, Info!\n";
     logger.LogWarn()  << "Hello, Warning!\n";