Refactor the project

Author: Pixels67

CMakeLists.txt

@@ -8,19 +8,21 @@ include_directories(src include)
 
 set(
     LIBRARY_SOURCES
-    src/Logger.cpp
     include/Logger.hpp
+    src/Logger.cpp
+    include/String.hpp
+    src/String.cpp
+    include/Convert.hpp
+    src/Convert.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
+    include/Console.hpp
+    src/Console.cpp
 )
 
-add_library(logger STATIC ${LIBRARY_SOURCES})
-add_executable(example ${LIBRARY_SOURCES} src/example/example.cpp)
+add_library(ssbl STATIC ${LIBRARY_SOURCES})
+add_executable(example src/Examples/Example.cpp)
+
+target_link_libraries(example ssbl)

README.md

@@ -21,22 +21,20 @@ using namespace SSBL;
 
 Logger logger;
 
-// Configuration (color and timestamp)
-logger.SetConfig(Config::All);
-
-// Timestamp formatting
-logger.SetTimestampFormat("%h:%m:%s");
+// Configuration
+logger
+    .UseColor(true)
+    .ShowTimestamp(true)
+    .SetTimeFormat("%Y-%m-%d %H:%M:%S")
+    .SetOutputFile("Example.log");
 
 // Log levels
-logger.Log()      << "Hello, Info!\n";
-logger.LogWarn()  << "Hello, Warning!\n";
-logger.LogError() << "Hello, Error!\n";
-logger.LogFatal() << "Hello, Fatal!\n";
+logger.Log()      << "Hello, Info!";
+logger.LogWarn()  << "Hello, Warning!";
+logger.LogError() << "Hello, Error!";
+logger.LogFatal() << "Hello, Fatal!";
 
 // Formatted output
-logger.Log() << "My name is {}, and I am {} years old." << "John" << 35 << '\n';
-logger.Log() << "{2}, {1}!" << "World" << "Hello" << '\n';
-
-// File output
-logger.LogToFile("Example.log") << "Hello, File!\n";
+logger.Log() << "My name is {}, and I am {} years old." << "John" << 35;
+logger.Log() << "{2}, {1}!" << "World" << "Hello";
 ```

include/Console.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "String.hpp"
+#include <ostream>
+
+#if defined _WIN32
+
+#include <windows.h>
+
+#endif
+
+namespace SSBL {
+class Logger;
+
+#if defined _WIN32
+
+enum class Color {
+    DEFAULT = 15,
+    RED     = 12,
+    YELLOW  = 14,
+    BLUE    = 9
+};
+
+#else
+
+enum class Color {
+    DEFAULT = 0,
+    RED     = 31,
+    YELLOW  = 33,
+    BLUE    = 34
+};
+
+#endif
+
+String ColorToAnsiEscapeCode(Color color, bool bold = false);
+void SetColor(Color color, std::ostream &output, bool bold = false);
+void ResetColor(std::ostream &output);
+}

include/Convert.hpp

@@ -1,16 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <sstream>
-#include <string>
 
 namespace SSBL {
-template<typename T>
-std::string GenericToString(const T &generic) {
-    std::stringstream ss;
-    ss << generic;
-    return ss.str();
-}
-
 std::optional<size_t> CharToSize(char character);
 } // namespace SSBL

include/Format.hpp

@@ -1,32 +1,8 @@
 #pragma once
 
-#include "Convert.hpp"
-#include "StringOps.hpp"
-#include <sstream>
-#include <string>
+#include "String.hpp"
 
 namespace SSBL {
-
-std::string WithPadding(const std::string &string);
-
-bool ContainsPlaceholder(const std::string &string);
-std::string IndexPlaceholders(const std::string &string);
-
-template<typename T>
-std::string Format(const std::string &string, const T &value, const size_t insertNumber) {
-    if (!ContainsPlaceholder(string))
-        return string + GenericToString(value);
-
-    std::string out = IndexPlaceholders(string);
-    const std::string placeholder = "{" + std::to_string(insertNumber) + "}";
-
-    out = ReplaceAll(out, placeholder, GenericToString(value));
-    out = ReplaceAll(out, "\n", "");
-
-    if (const size_t pos = out.find('\n'); pos != std::string::npos)
-        out.replace(pos, 1, "");
-
-    return out;
-}
-
+String IndexEmptyPlaceholders(const String &string);
+String Format(const String &string, const String& insertString, size_t index = 1);
 } // namespace SSBL

include/Log.hpp

@@ -1,67 +1,70 @@
 #pragma once
 
-#include "Format.hpp"
-#include "Log.hpp"
+#include "Console.hpp"
+#include "String.hpp"
 #include <fstream>
-#include <iostream>
+#include <optional>
 #include <sstream>
 
 namespace SSBL {
-class Logger {
-public:
-    Logger &Log(Level level = Level::Info);
-    Logger &LogWarn();
-    Logger &LogError();
-    Logger &LogFatal();
-
-    Logger &LogToFile(const std::string &filePath, Level level = Level::Info);
+enum class LogLevel {
+    NON = 0b0000,
+    INF = 0b0001,
+    WRN = 0b0010,
+    ERR = 0b0100,
+    FTL = 0b1000,
+    ALL = 0b1111,
+};
 
-    template<typename T>
-    Logger &operator<<(const T &stream) {
-        if (!IsLevelIncluded(m_level))
-            return *this;
+String LogLevelToString(LogLevel level);
+Color LogLevelToColor(LogLevel level);
 
-        m_stream.str(Format(m_stream.str(), GenericToString(stream), insertCount));
-        insertCount++;
+struct LoggerSettings {
+    bool useColor          = false;
+    bool showTimestamp     = true;
+    String timeFormat = "%y-%m-%d %D %H:%M:%S";
+};
 
-        if (Contains(GenericToString(stream), "\n")) {
-            Send(m_stream.str());
-            Flush();
-        }
+class Logger;
 
-        return *this;
-    }
+class LoggerStream {
+public:
+    explicit LoggerStream(Logger &logger);
+    ~LoggerStream();
 
-    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;
+    LoggerStream &operator<<(const String &string);
 
 private:
-    std::ostream *m_msgOutStream = &std::cout;
-    std::ostream *m_errOutStream = &std::cerr;
-    std::optional<std::ofstream> m_fileOutStream;
+    Logger &m_logger;
+};
 
-    std::ostringstream m_stream;
-    size_t insertCount = 0;
+class Logger {
+public:
+    explicit Logger(const LoggerSettings &settings = LoggerSettings(), const String &outputFile = String::Empty());
+    explicit Logger(const String &outputFile);
+    ~Logger();
 
-    Config m_config = Config::Timestamp;
-    Level m_levelMask = Level::All;
-    Level m_level = Level::Info;
+    LoggerStream Log(LogLevel level = LogLevel::INF);
 
-    std::string m_timestampFormat = DEFAULT_FORMAT;
+    LoggerStream LogWarn();
+    LoggerStream LogError();
+    LoggerStream LogFatal();
 
-    void Send(const std::string &string);
+    Logger &UseColor(bool useColor);
+    Logger &ShowTimestamp(bool showTimestamp);
+    Logger &SetOutputFile(const String &fileName);
+    Logger &SetTimeFormat(const String &timeFormat);
+
+    void operator<<(const String &string);
     void Flush();
 
-    void SetColor();
-    void ResetColor() const;
+private:
+    void ProcessStream();
 
-#if _WIN32
-    int GetColor() const;
-#else
-    std::string GetColor() const;
-#endif
+    LoggerSettings m_settings;
+    String m_stream;
+    LogLevel m_currentLevel = LogLevel::INF;
+    size_t m_insertCount = 0;
+    std::ofstream m_file;
 };
 } // namespace SSBL