Update CMakeLists.txt

Update components

CMakeLists.txt

@@ -16,22 +16,20 @@ include(cmake/CPM.cmake)
 
 file(GLOB_RECURSE jlog_HEADERS "include/jlog/*.h" "include/jlog/*.hpp")
 
-if(UNIX AND NOT APPLE)
-    file(GLOB_RECURSE jlog_SRC     "src/jlog/linux/*.c" "src/jlog/linux/*.cpp" "src/jlog/shared/*.c" "src/jlog/shared/*.cpp")
-endif()
+file(GLOB_RECURSE jlog_SRC "src/jlog/*.cpp")
 
-if(WIN32)
-    file(GLOB_RECURSE jlog_SRC     "src/jlog/windows/*.c" "src/jlog/windows/*.cpp" "src/jlog/shared/*.c" "src/jlog/shared/*.cpp")
-endif()
 
 include_directories("include")
 
 CPMAddPackage(
         NAME Event
-        URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
+        URL https://git.redacted.cc/josh/Event/archive/Release-10.zip
 )
 
-include_directories(${Event_SOURCE_DIR}/include)
+CPMAddPackage(
+        NAME mcolor
+        URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-4.zip
+)
 
 if (UNIX)
     add_library(jlog SHARED ${jlog_SRC})
@@ -39,8 +37,11 @@ endif()
 
 if (WIN32)
     add_library(jlog STATIC ${jlog_SRC})
+    target_compile_options(jlog PRIVATE /wd4005)
 endif()
 
+target_include_directories(jlog PUBLIC ${Event_SOURCE_DIR}/include ${mcolor_SOURCE_DIR}/include)
+
 set_target_properties(jlog PROPERTIES LINKER_LANGUAGE CXX)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})
@@ -48,7 +49,7 @@ install(FILES ${jlog_HEADERS} DESTINATION include/${PROJECT_NAME})
 
 #add_subdirectory(tests)
 
-target_link_libraries(jlog PRIVATE Event)
+target_link_libraries(jlog PUBLIC Event mcolor)
 
 add_executable(LoggerDemo main.cpp)
 target_link_libraries(LoggerDemo PUBLIC jlog)

README.md

@@ -8,10 +8,11 @@ jlog is a C++ library for logging to file, console, and event callbacks.
 
 * Modern (C++20)
 * Static Library
-* Color Output
+* Color Output (Now in RGB!)
 * Logs to file AND console!
 * Idiomatic Event callback for hooking into your game engine gui!
 * GCC and MSVC support
+* No more macros for traceback!
 
 ## Installation
 
@@ -35,17 +36,15 @@ Using jlog is straightforward:
 
 ```cpp
 
-#include <jlog.h>
+#include <jlog/jlog.hpp>
 
 int main() {
-    LOGLEVEL(jlog::severity::debug); // <- see jlog::severity for full list of log levels
-
-    INFO("This is barely useful information.");
-    DEBUG("Debugging Information");
-    VERBOSE("Yadda Yadda Yadda");
-    WARNING("Slight miscalculation!");
-    ERROR("Oops, something went wrong.");
-    FATAL("Unrecoverable Error!!!");
+    jlog::info("This is barely useful information.");
+    jlog::debug("Debugging Information");
+    jlog::verbose("Yadda Yadda Yadda");
+    jlog::warning("Slight miscalculation!");
+    jlog::error("Oops, something went wrong.");
+    jlog::fatal("Unrecoverable Error!!!");
 
     return 0;
 }
@@ -58,8 +57,6 @@ int main() {
 
 ## TODO
 
-* Custom Contexts: Allow users to specify custom logging contexts for better organization.
-  * Disable & sort by context (other categories?)
 * Documentation
 * Thread Safety
 * Memory Safety

include/jlog/Logger.hpp

@@ -0,0 +1,190 @@
+#pragma once
+#include "fstream"
+#include "iostream"
+#include "source_location"
+#include "Token.hpp"
+#include "Timestamp.hpp"
+
+
+namespace jlog {
+    class Logger {
+    public:
+        Logger(std::ostream &stream = std::cout) : os{stream} {};
+    public:
+        void
+        operator()(const std::string &message, const std::source_location &location = std::source_location::current(),
+                   const Timestamp &ts = Timestamp()) {
+            if (Enable)
+                Log(message, location, ts);
+        };
+    protected:
+        virtual void
+        Log(const std::string &message, const std::source_location &location = std::source_location::current(),
+            const Timestamp &ts = Timestamp()) = 0;
+
+    public:
+        bool Enable = true;
+        bool IncludeLocation = true;
+        bool IncludeTimestamp = true;
+    protected:
+        std::ostream &os = std::cout;
+    };
+
+    class ColorLogger : public Logger {
+    public:
+        ColorLogger(std::ostream &stream = std::cout) : Logger(stream) {};
+    public:
+        bool IncludeColor = true;
+    };
+
+    class ConsoleLogger : public ColorLogger {
+    public:
+        //explicit ConsoleLogger();
+        explicit ConsoleLogger(const std::string &context) : ColorLogger() { this->context = context; };
+    protected:
+        virtual void
+        Log(const std::string &message, const std::source_location &location = std::source_location::current(),
+            const Timestamp &ts = Timestamp()) {
+            if (!Enable)
+                return;
+            // Disable color on Windows. I've been trying my best to keep this macro hidden from the user. - maxine
+#ifdef WIN32
+            IncludeColor = false;
+#endif
+            if (IncludeTimestamp) {
+                Timestamp ts;
+                os << token{std::format(
+                        "{}-{}-{} {}:{}:{}.{}",
+                        ts.Year(),
+                        ts.Month(),
+                        ts.Day(),
+                        ts.Hour().count(),
+                        ts.Minute().count(),
+                        ts.Second().count(),
+                        ts.Millisecond().count()), "[]", timestampColor}.Stringer(IncludeColor);
+            }
+
+            os << token(context, "[]", contextColor).Stringer(IncludeColor);
+
+            if (IncludeLocation) {
+                os << token{location.function_name(), "[]", locationColor}.Stringer(IncludeColor);
+                os << token{std::format("{}:{}", location.file_name(), location.line()), "[]", locationColor}.Stringer(
+                        IncludeColor);
+            }
+
+            os << token{">>", "", pointerColor}.Stringer(IncludeColor)
+               << token(message, "", messageColor).Stringer(IncludeColor) << "\n";
+        }
+
+    protected:
+        std::string context = "CONSOLE";
+    protected:
+        Color4 timestampColor = Colors::Purples::Fuchsia;
+        Color4 contextColor = Colors::White;
+        Color4 locationColor = Colors::Pinks::Pink;
+        Color4 pointerColor = Colors::Pinks::LightPink;
+        Color4 messageColor = Colors::Greens::LightGreen;
+    };
+
+    class FileLogger : public Logger {
+    public:
+        //explicit FileLogger();
+        explicit FileLogger(const std::string &context, std::ofstream &file) : Logger(
+                file) { this->context = context; };
+    protected:
+        virtual void
+        Log(const std::string &message, const std::source_location &location = std::source_location::current(),
+            const Timestamp &ts = Timestamp()) {
+            if (!Enable)
+                return;
+
+            if (IncludeTimestamp) {
+                Timestamp ts;
+                os << token{std::format(
+                        "{}-{}-{} {}:{}:{}.{}",
+                        ts.Year(),
+                        ts.Month(),
+                        ts.Day(),
+                        ts.Hour().count(),
+                        ts.Minute().count(),
+                        ts.Second().count(),
+                        ts.Millisecond().count()), "[]"}.Stringer(false);
+            }
+
+            os << token(context, "[]").Stringer(false);
+
+            if (IncludeLocation) {
+                os << token{location.function_name(), "[]"}.Stringer(false);
+                os << token{std::format("{}:{}", location.file_name(), location.line()), "[]"}.Stringer(false);
+            }
+
+            os << token{">>", ""}.Stringer(false) << token(message, "").Stringer(false) << "\n";
+        }
+
+    protected:
+        std::string context = "FILE";
+    };
+
+    class CompoundLogger : protected ConsoleLogger, protected FileLogger {
+    public:
+        explicit CompoundLogger(const std::string &context, std::ofstream &file) : ConsoleLogger(context),
+                                                                                   FileLogger(context, file) {};
+    public:
+        void
+        operator()(const std::string &message, const std::source_location &location = std::source_location::current(),
+                   const Timestamp &ts = Timestamp()) { Log(message, location, ts); };
+
+        virtual void
+        Log(const std::string &message, const std::source_location &location = std::source_location::current(),
+            const Timestamp &ts = Timestamp()) {
+            ConsoleLogger::Log(message, location, ts);
+            FileLogger::Log(message, location, ts);
+        }
+
+    public:
+        void EnableConsole(bool b) { ConsoleLogger::Enable = b; };
+
+        void EnableFile(bool b) { FileLogger::Enable = b; };
+
+        void IncludeTimestamp(bool b) {
+            ConsoleLogger::IncludeTimestamp = b;
+            FileLogger::IncludeTimestamp = b;
+        };
+
+        void IncludeLocation(bool b) {
+            ConsoleLogger::IncludeLocation = b;
+            FileLogger::IncludeLocation = b;
+        };
+
+        void IncludeColor(bool b) { ConsoleLogger::IncludeColor = b; };
+
+
+    };
+
+    class GenericLogger : public CompoundLogger {
+    public:
+        GenericLogger(const std::string &context,
+                      std::ofstream &file,
+                      Color4 contextColor = Colors::White,
+                      Color4 timestampColor = Colors::Purples::Fuchsia,
+                      Color4 locationColor = Colors::Pinks::Pink,
+                      Color4 pointerColor = Colors::Pinks::LightPink,
+                      Color4 messageColor = Colors::Greens::LightGreen)
+                : CompoundLogger(context, file) {
+            this->contextColor = contextColor;
+            this->timestampColor = timestampColor;
+            this->locationColor = locationColor;
+            this->pointerColor = pointerColor;
+            this->messageColor = messageColor;
+        }
+    };
+
+    extern std::ofstream GlobalLogFile;
+
+    extern GenericLogger Info;
+    extern GenericLogger Warning;
+    extern GenericLogger Error;
+    extern GenericLogger Fatal;
+    extern GenericLogger Verbose;
+    extern GenericLogger Debug;
+}

include/jlog/Timestamp.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <chrono>
+
+namespace jlog {
+    class Timestamp {
+    public:
+        Timestamp();
+    public:
+        std::chrono::year Year() {return y;};
+        std::chrono::month Month() {return m;};
+        std::chrono::day Day() {return d;}
+        std::chrono::duration<long, std::ratio<3600>> Hour() {return h;};
+        std::chrono::duration<long, std::ratio<60>> Minute() {return M;};
+        std::chrono::duration<long> Second() {return s;};
+        std::chrono::duration<long, std::ratio<1, 1000>> Millisecond() {return ms;};
+    private:
+        std::chrono::year y;
+        std::chrono::month m;
+        std::chrono::day d;
+        std::chrono::duration<long, std::ratio<3600>> h;
+        std::chrono::duration<long, std::ratio<60>> M;
+        std::chrono::duration<long> s;
+        std::chrono::duration<long, std::ratio<1, 1000>> ms;
+    };
+}

include/jlog/Token.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <functional>
+#include <mcolor.h>
+#include "Colors.hpp"
+
+namespace jlog {
+    using namespace mcolor;
+
+    class token {
+    public:
+        token(std::string content = "", std::string delimiter = "[]", Color4 colorCode = Colors::White) {
+            this->colorCode = colorCode;
+            this->content = content;
+            this->delimiter = delimiter;
+        }
+    public:
+        std::string Stringer(bool includeColor = true);
+        std::string StringerWithColor();
+        std::string StringerWithoutColor();
+    public:
+        Color4 colorCode = Colors::White;
+        std::string content = "";
+        std::string delimiter = "[]";
+    };
+
+    std::ostream& operator<<(std::ostream& os, token t);
+}

include/jlog/ansi_escape_codes.hpp

@@ -1,108 +0,0 @@
-#pragma once
-
-#include <string>
-#include <cstdint>
-#include <format>
-
-namespace jlog::ansi_escape_codes
-{
-    inline static const std::string CURSOR_HOME = "\033[H";
-
-    inline static const std::string ERASE_SCREEN_AFTER_CURSOR = "\033[0J";
-    inline static const std::string ERASE_SCREEN_BEFORE_CURSOR = "\033[1J";
-    inline static const std::string ERASE_SCREEN_ALL = "\033[2J";
-    inline static const std::string ERASE_LINE_AFTER_CURSOR = "\033[0K";
-    inline static const std::string ERASE_LINE_BEFORE_CURSOR = "\033[1K";
-    inline static const std::string ERASE_LINE_ALL = "\033[2K";
-
-    inline static const std::string RESET = "\033[0m";
-    inline static const std::string BOLD  = "\033[1m";
-    inline static const std::string DIM   = "\033[2m";
-
-    /// These are some examples of private modes, which are not defined by the spec, but are implemented in most terminals.
-    /// @see xterm control sequences for a more in-depth list.
-    /// https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
-    /// @note While these modes may be supported by most terminals, some may not work in multiplexers like tmux.
-
-    inline static const std::string CURSOR_INVISIBLE = "\033[?25l";
-    inline static const std::string CURSOR_VISIBLE   = "\033[?25h";
-    inline static const std::string RESTORE_SCREEN   = "\033[?47l";
-    inline static const std::string SAVE_SCREEN      = "\033[?47h";
-
-
-    inline static const std::string FG_BLACK = "\033[30m";
-    inline static const std::string FG_RED = "\033[31m";
-    inline static const std::string FG_GREEN = "\033[32m";
-    inline static const std::string FG_YELLOW = "\033[33m";
-    inline static const std::string FG_BLUE = "\033[34m";
-    inline static const std::string FG_MAGENTA = "\033[35m";
-    inline static const std::string FG_CYAN = "\033[36m";
-    inline static const std::string FG_WHITE = "\033[37m";
-    inline static const std::string FG_DEFAULT = "\033[39m";
-
-
-    inline static const std::string FG_BRIGHT_BLACK = "\033[90m";
-    inline static const std::string FG_BRIGHT_RED = "\033[91m";
-    inline static const std::string FG_BRIGHT_GREEN = "\033[92m";
-    inline static const std::string FG_BRIGHT_YELLOW = "\033[93m";
-    inline static const std::string FG_BRIGHT_BLUE = "\033[94m";
-    inline static const std::string FG_BRIGHT_MAGENTA = "\033[95m";
-    inline static const std::string FG_BRIGHT_CYAN = "\033[96m";
-    inline static const std::string FG_BRIGHT_WHITE = "\033[97m";
-
-
-    inline static const std::string BG_BLACK = "\033[40m";
-    inline static const std::string BG_RED   = "\033[41m";
-    inline static const std::string BG_GREEN = "\033[42m";
-    inline static const std::string BG_YELLOW = "\033[43m";
-    inline static const std::string BG_BLUE = "\033[44m";
-    inline static const std::string BG_MAGENTA = "\033[45m";
-    inline static const std::string BG_CYAN = "\033[46m";
-    inline static const std::string BG_WHITE = "\033[47m";
-    inline static const std::string BG_DEFAULT = "\033[49m";
-
-    inline static const std::string BG_BRIGHT_BLACK = "\033[100m";
-    inline static const std::string BG_BRIGHT_RED = "\033[101m";
-    inline static const std::string BG_BRIGHT_GREEN = "\033[102m";
-    inline static const std::string BG_BRIGHT_YELLOW = "\033[103m";
-    inline static const std::string BG_BRIGHT_BLUE = "\033[104m";
-    inline static const std::string BG_BRIGHT_MAGENTA = "\033[105m";
-    inline static const std::string BG_BRIGHT_CYAN = "\033[106m";
-    inline static const std::string BG_BRIGHT_WHITE = "\033[107m";
-
-    inline std::string true_color(uint8_t r, uint8_t g, uint8_t b)
-    {
-        return std::format("\033[38;2;{};{};{}m", r, g, b);
-    }
-
-    inline std::string cursor_to(int line, int col)
-    {
-        return "";
-    }
-
-    inline std::string cursor_up(int lines)
-    {
-        return "";
-    }
-
-    inline std::string cursor_down(int lines)
-    {
-        return "";
-    }
-
-    inline std::string cursor_left(int cols)
-    {
-        return "";
-    }
-
-    inline std::string cursor_right(int cols)
-    {
-        return "";
-    }
-
-    inline std::string cursor_to_col(int col)
-    {
-        return "";
-    }
-}
-

include/jlog/color_codes.hpp

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <jlog/ansi_escape_codes.hpp>
-#include <jlog/nt_color_codes.hpp>
-
-// Platform independent color code mapping
-struct colorcode
-{
-    std::string ansi_code;
-    WORD nt_code;
-};
-
-namespace jlog::color_codes
-{
-    static const colorcode FG_BLACK     {ansi_escape_codes::FG_BLACK,   nt_color_codes::FG_BLACK    };
-    static const colorcode FG_RED       {ansi_escape_codes::FG_RED,     nt_color_codes::FG_RED      };
-    static const colorcode FG_GREEN     {ansi_escape_codes::FG_GREEN,   nt_color_codes::FG_GREEN    };
-    static const colorcode FG_YELLOW    {ansi_escape_codes::FG_YELLOW,  nt_color_codes::FG_YELLOW   };
-    static const colorcode FG_BLUE      {ansi_escape_codes::FG_BLUE,    nt_color_codes::FG_BLUE     };
-    static const colorcode FG_MAGENTA   {ansi_escape_codes::FG_MAGENTA, nt_color_codes::FG_MAGENTA  };
-    static const colorcode FG_CYAN      {ansi_escape_codes::FG_CYAN,    nt_color_codes::FG_CYAN     };
-    static const colorcode FG_WHITE     {ansi_escape_codes::FG_WHITE,   nt_color_codes::FG_WHITE    };
-    static const colorcode FG_DEFAULT   {ansi_escape_codes::FG_DEFAULT, nt_color_codes::FG_DEFAULT  };
-
-    static const colorcode FG_BRIGHT_BLACK {ansi_escape_codes::FG_BRIGHT_BLACK, nt_color_codes::FG_BRIGHT_BLACK};
-    static const colorcode FG_BRIGHT_RED {ansi_escape_codes::FG_BRIGHT_RED, nt_color_codes::FG_BRIGHT_RED};
-    static const colorcode FG_BRIGHT_GREEN {ansi_escape_codes::FG_BRIGHT_GREEN, nt_color_codes::FG_BRIGHT_GREEN};
-    static const colorcode FG_BRIGHT_YELLOW {ansi_escape_codes::FG_BRIGHT_YELLOW, nt_color_codes::FG_BRIGHT_YELLOW};
-    static const colorcode FG_BRIGHT_BLUE {ansi_escape_codes::FG_BRIGHT_MAGENTA, nt_color_codes::FG_BRIGHT_MAGENTA};
-    static const colorcode FG_BRIGHT_MAGENTA {ansi_escape_codes::FG_BRIGHT_MAGENTA, nt_color_codes::FG_BRIGHT_MAGENTA};
-    static const colorcode FG_BRIGHT_CYAN {ansi_escape_codes::FG_BRIGHT_CYAN, nt_color_codes::FG_BRIGHT_CYAN};
-    static const colorcode FG_BRIGHT_WHITE {ansi_escape_codes::FG_BRIGHT_WHITE, nt_color_codes::FG_BRIGHT_WHITE};
-
-    static const colorcode BG_BLACK {ansi_escape_codes::BG_BLACK, nt_color_codes::BG_BLACK};
-    static const colorcode BG_RED {ansi_escape_codes::BG_RED, nt_color_codes::BG_RED};
-    static const colorcode BG_GREEN {ansi_escape_codes::BG_GREEN, nt_color_codes::BG_GREEN};
-    static const colorcode BG_YELLOW {ansi_escape_codes::BG_YELLOW, nt_color_codes::BG_YELLOW};
-    static const colorcode BG_BLUE {ansi_escape_codes::BG_BLUE, nt_color_codes::BG_BLUE};
-    static const colorcode BG_MAGENTA {ansi_escape_codes::BG_MAGENTA, nt_color_codes::BG_MAGENTA};
-    static const colorcode BG_CYAN {ansi_escape_codes::BG_CYAN, nt_color_codes::BG_CYAN};
-    static const colorcode BG_WHITE {ansi_escape_codes::BG_WHITE, nt_color_codes::BG_WHITE};
-    static const colorcode BG_DEFAULT {ansi_escape_codes::BG_DEFAULT, nt_color_codes::BG_DEFAULT};
-
-    static const colorcode BG_BRIGHT_BLACK {ansi_escape_codes::BG_BRIGHT_BLACK, nt_color_codes::BG_BRIGHT_BLACK};
-    static const colorcode BG_BRIGHT_RED {ansi_escape_codes::BG_BRIGHT_RED, nt_color_codes::BG_BRIGHT_RED};
-    static const colorcode BG_BRIGHT_GREEN {ansi_escape_codes::BG_BRIGHT_GREEN, nt_color_codes::BG_BRIGHT_GREEN};
-    static const colorcode BG_BRIGHT_YELLOW {ansi_escape_codes::BG_BRIGHT_YELLOW, nt_color_codes::BG_BRIGHT_YELLOW};
-    static const colorcode BG_BRIGHT_BLUE {ansi_escape_codes::BG_BRIGHT_BLUE, nt_color_codes::BG_BRIGHT_BLUE};
-    static const colorcode BG_BRIGHT_MAGENTA {ansi_escape_codes::BG_BRIGHT_MAGENTA, nt_color_codes::BG_BRIGHT_MAGENTA};
-    static const colorcode BG_BRIGHT_CYAN {ansi_escape_codes::BG_BRIGHT_CYAN, nt_color_codes::BG_BRIGHT_CYAN};
-    static const colorcode BG_BRIGHT_WHITE {ansi_escape_codes::BG_BRIGHT_WHITE, nt_color_codes::BG_BRIGHT_WHITE};
-}

include/jlog/jlog.hpp

@@ -1,239 +0,0 @@
-/// Josh's Logger
-/// A Redacted Software Product
-/// Developed & Maintained by Josh O'Leary
-/// This work is dedicated to the public domain.
-
-/// Special thanks: Maxine Hayes, William J Tomasine II
-
-#pragma once
-
-#include <string>
-#include <Event.h>
-#include <jlog/color_codes.hpp>
-
-#ifdef __linux__
-    #define FUNCTION __PRETTY_FUNCTION__
-#endif
-
-#ifdef _WIN32
-    #define FUNCTION __FUNCSIG__
-#endif
-
-namespace jlog
-{
-    /// Severity levels for logging. Higher numbers filter less messages out.
-    /// @see LOG_LEVEL macro
-    enum class severity : uint8_t
-    {
-        none,       // Show no output
-        fatal,      // Show only fatal errors
-        error,      // Show fatal and not-necessarily-fatal errors
-        warning,    // Show warnings additionally
-        verbose,    // Show errors, warnings, and 'verbose' output (i.e. extra information)
-        debug,      // Show debugging messages (Basically everything).
-    };
-
-    inline severity loglevel = severity::debug; // Default log level always debug
-
-    struct LogEntry
-    {
-        severity level;
-        std::string content;
-        std::string timestamp;
-    };
-
-    // TODO: Fully implement logging callback.
-    static Event<LogEntry> on_log = Event<LogEntry>();
-
-    inline std::vector<LogEntry> log_history;
-
-    /// A single piece of a logging message, with color code, content, and delimiter
-    /// These are strung together to build full logger messages in a flexible manner.
-    struct token
-    {
-        colorcode colorCode = color_codes::FG_DEFAULT;
-        std::string content = "";
-        std::string delimiter = "[]";
-    };
-
-    void set_default_logfile(const std::string& filename);
-
-    /// Returns a string timestamp in the format of 'YYYY-MM-DD hh:mm:ss.ms'
-    std::string get_timestamp();
-
-    /// Writes an input string directly to standard output
-    /// @note Does not append a newline to the message.
-    void log_to_console(const std::string& message);
-    /// Writes an input string directly to the default destination logfile
-    /// @note Does not append a newline to the message.
-    /// @see set_default_logfile()
-    void log_to_file(const std::string& message);
-    /// Writes an input string directly to the specified destination logfile
-    /// @note Does not append a newline to the message.
-    void log_to_file(const std::string& filename, const std::string& message);
-    /// Writes an input string directly to the specified output stream
-    /// @note Does not append a newline to the message.
-    void log_to_stream(std::ostream stream, const std::string& message);
-
-    /// These are helper functions designed to be wrapped around for easier custom logger building.
-    /// @note This file is implemented differently per-platform to handle differences in console color handling.
-    /// @see windows/jlog.cpp linux/jlog.cpp
-    std::string toks2msg(std::vector<token> tokens, std::function<std::string(token)> formatter);
-    std::string consoleMsgFormatter(token t);
-    std::string logfileMsgFormatter(token t);
-    std::string toks2consoleMsg(std::vector<token> tokens);
-    std::string toks2logfileMsg(std::vector<token> tokens);
-
-    /// Parses a sequence of tokens into a printable message, and logs to the following destinations:
-    /// standard output (console)
-    /// output file (default)
-    /// logging callback (Event)
-    /// @note This file is implemented differently per-platform to handle differences in console color handling.
-    /// @see windows/jlog.cpp linux/jlog.cpp
-    void log(std::vector<token> tokens, const std::string& filename);
-    void log(std::vector<token> tokens);
-    void ltlog(std::vector<token> tokens); // Just for debug purposes
-
-#pragma region Generic Formatters
-
-    /// Returns a pseudo-"stacktrace" formatted sequence of tokens.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> trace_format(
-        const std::string& func,
-        const std::string& file,
-        int line);
-
-    /// Returns a formatted sequence of tokens given a severity and message.
-    /// @param severity_name The severity tag to prefix to the message. Could theoretically also be a context.
-    /// @param message The actual message to include
-    /// @param severity_cc The colorcode to assign to the severity. See color_codes.hpp
-    std::vector<token> log_format(
-        const std::string& severity_name,
-        const std::string& message,
-        const colorcode& severity_cc = color_codes::FG_WHITE);
-
-    /// Returns a more detailed formatted sequence of tokens.
-    /// @param severity_name The severity tag to prefix to the message. Could theoretically also be a context.
-    /// @param message The actual message to include
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    /// @param severity_cc The colorcode to assign to the severity. See color_codes.hpp
-    std::vector<token> log_detailed_format(
-    const std::string& severity_name,
-    const std::string& message,
-    const std::string& func,
-    const std::string& file,
-    int line,
-    const colorcode& severity_cc = color_codes::FG_WHITE);
-
-    /// Returns a token sequence pre-formatted for the INFO log level.
-    /// @param message The message to send out.
-    std::vector<token> info_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the INFO log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> info_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-
-    /// Returns a token sequence pre-formatted for the WARNING log level.
-    /// @param message The message to send out.
-    std::vector<token> warning_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the WARNING log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> warning_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-
-    /// Returns a token sequence pre-formatted for the ERROR log level.
-    /// @param message The message to send out.
-    std::vector<token> error_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the ERROR log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> error_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-
-    /// Returns a token sequence pre-formatted for the FATAL log level.
-    /// @param message The message to send out.
-    std::vector<token> fatal_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the FATAL log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> fatal_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-
-    /// Returns a token sequence pre-formatted for the VERBOSE log level.
-    /// @param message The message to send out.
-    std::vector<token> verbose_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the VERBOSE log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> verbose_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-
-    /// Returns a token sequence pre-formatted for the DEBUG log level.
-    /// @param message The message to send out.
-    std::vector<token> debug_format(const std::string& message);
-
-    /// Returns a token sequence pre-formatted for the DEBUG log level.
-    /// @param message The message to send out.
-    /// @param func The function name/signature to trace back to. Should be provided by a __FUNCTION__ macro variant.
-    /// @param file The file name to trace back to. Should be provided by a __FILE__ macro variant.
-    /// @param line The source-code line to trace back to. Should be provided by a __LINE__ macro variant.
-    std::vector<token> debug_detailed_format(
-        const std::string &message,
-        const std::string &func,
-        const std::string &file,
-        int line);
-#pragma endregion
-}
-
-#define INFO(i)    if (jlog::loglevel >= jlog::severity::none) { jlog::log(jlog::info_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define VERBOSE(i) if (jlog::loglevel >= jlog::severity::verbose) { jlog::log(jlog::verbose_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define DEBUG(i)   if (jlog::loglevel >= jlog::severity::debug) { jlog::log(jlog::debug_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define WARNING(i) if (jlog::loglevel >= jlog::severity::warning) { jlog::log(jlog::warning_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define ERROR(i)   if (jlog::loglevel >= jlog::severity::error) { jlog::log(jlog::error_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define FATAL(i)   if (jlog::loglevel >= jlog::severity::fatal) { jlog::log(jlog::fatal_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-
-#define LOGLEVEL(i) jlog::loglevel = i;
-
-#define LOGTEST(i) if (jlog::loglevel >= jlog::severity::none) { jlog::ltlog(jlog::info_detailed_format(i, FUNCTION, __FILE__, __LINE__)); }
-

include/jlog/nt_color_codes.hpp

@@ -1,55 +0,0 @@
-#pragma once
-
-// NT color codes taken from windows.h / consoleapi2.h
-
-#ifdef WIN32
-    #include <windows.h>
-#endif
-
-#ifndef WORD
-    #define WORD short
-#endif
-
-namespace jlog::nt_color_codes
-{
-    const WORD FG_BLACK = 0x0000;
-    const WORD FG_BLUE  = 0x0001;
-    const WORD FG_GREEN = 0x0002;
-    const WORD FG_RED   = 0x0004;
-
-    const WORD FG_YELLOW = FG_RED | FG_GREEN;
-
-    const WORD FG_MAGENTA   = FG_RED | FG_BLUE;
-    const WORD FG_CYAN      = FG_GREEN | FG_BLUE;
-    const WORD FG_WHITE     = FG_RED | FG_GREEN | FG_BLUE;
-    const WORD FG_DEFAULT   = FG_WHITE;
-
-    const WORD FG_BRIGHT_BLACK = 0 | 0x0008;
-    const WORD FG_BRIGHT_RED = FG_RED | 0x0008;
-    const WORD FG_BRIGHT_GREEN = FG_GREEN | 0x0008;
-    const WORD FG_BRIGHT_YELLOW = FG_RED | FG_GREEN | 0x0008;
-    const WORD FG_BRIGHT_BLUE = FG_BLUE | 0x0008;
-    const WORD FG_BRIGHT_MAGENTA = FG_RED | FG_BLUE | 0x0008;
-    const WORD FG_BRIGHT_CYAN = FG_GREEN | FG_BLUE | 0x0008;
-    const WORD FG_BRIGHT_WHITE = FG_RED | FG_GREEN | FG_BLUE | 0x0008;
-
-
-    const WORD BG_BLACK = 0x0000;
-    const WORD BG_BLUE  = 0x0010;
-    const WORD BG_GREEN = 0x0020;
-    const WORD BG_RED   = 0x0040;
-    const WORD BG_YELLOW = BG_RED | BG_GREEN;
-    const WORD BG_MAGENTA = BG_RED | BG_BLUE;
-    const WORD BG_CYAN = BG_GREEN | BG_BLUE;
-    const WORD BG_WHITE = BG_RED | BG_GREEN | BG_BLUE;
-    const WORD BG_BRIGHT_BLACK = 0 | 0x0080;
-    const WORD BG_BRIGHT_RED = BG_RED | 0x0080;
-    const WORD BG_BRIGHT_GREEN = BG_GREEN | 0x0080;
-    const WORD BG_BRIGHT_YELLOW = BG_YELLOW | 0x0080;
-    const WORD BG_BRIGHT_BLUE = BG_BLUE | 0x0080;
-    const WORD BG_BRIGHT_MAGENTA = BG_RED | BG_BLUE | 0x0080;
-    const WORD BG_BRIGHT_CYAN = BG_GREEN | BG_BLUE | 0x0080;
-    const WORD BG_BRIGHT_WHITE = BG_RED | BG_GREEN | BG_BLUE | 0x0080;
-
-    const WORD BG_DEFAULT = BG_WHITE;
-}

main.cpp

@@ -4,39 +4,20 @@
 // Contact: josh@redacted.cc
 // Contributors: william@redacted.cc maxi@redacted.cc
 // This work is dedicated to the public domain.
+#include "jlog/Logger.hpp"
 
-#include <jlog/jlog.hpp>
 
-// Writing custom wrappers for jlog is super easy!
-/*void coollog(std::vector<jlog::token> tokens) {
-    std::vector<jlog::token> wtokens;
-    auto group = jlog::token{.content = "COOLLOGGER"};
-    wtokens.push_back(group);
-    wtokens.insert(wtokens.end(), tokens.begin(), tokens.end());
-    jlog::log(wtokens);
-}*/
-
-// We can either define custom logging macros or redefine jlog's builtin macros.
-//#define COOLINFO(i) coollog(jlog::info_format(i));
-//#define COOLINFOTRACE(i) coollog(jlog::info_detailed_format(i, FUNCTION, __FILE__, __LINE__));
 
 int main()
 {
-    LOGLEVEL(jlog::severity::debug); // <- see jlog::severity for full list of log levels
-
-    INFO("This is barely useful information.");
-    DEBUG("Debugging Information");
-    VERBOSE("Yadda Yadda Yadda");
-    WARNING("Slight miscalculation!");
-    ERROR("Oops, something went wrong.");
-    FATAL("Unrecoverable Error!!!");
-
-    //COOLINFO("This is really cool!!!");
-    //COOLINFOTRACE("THIS IS EVEN COOLER!!!");
-
-    LOGTEST("This is a really cool test man :3");
-    LOGTEST("Go check cmake-build-debug/logtest.log and cmake-build-debug/latest.log");
-
+    jlog::GenericLogger Demo("demo", jlog::GlobalLogFile);
+    Demo("No new demo yet");
+    jlog::Info("dsadsd");
+    jlog::Warning("dsadsd");
+    jlog::Error("dsadsd");
+    jlog::Fatal("dsadsd");
+    jlog::Verbose("dsadsd");
+    jlog::Debug("dsadsd");
     return 0;
 }
 

src/jlog/Logger.cpp

@@ -0,0 +1,13 @@
+#include "jlog/Logger.hpp"
+#include <fstream>
+
+namespace jlog {
+    std::ofstream GlobalLogFile("latest.log", std::ios_base::app);
+
+    GenericLogger Info {"info", GlobalLogFile, Colors::Green, Colors::Gray, Colors::Gray, Colors::Green, Colors::White};
+    GenericLogger Warning {"warning", GlobalLogFile, Colors::Yellow, Colors::Gray, Colors::Gray, Colors::Yellow, Colors::White};
+    GenericLogger Error {"error", GlobalLogFile, Colors::Red, Colors::Gray, Colors::Gray, Colors::Red, Colors::White};
+    GenericLogger Fatal {"fatal", GlobalLogFile, Colors::Reds::Crimson, Colors::Gray, Colors::Gray, Colors::Reds::Crimson, Colors::White};
+    GenericLogger Verbose {"verbose", GlobalLogFile, Colors::Blue, Colors::Gray, Colors::Gray, Colors::Blue, Colors::White};
+    GenericLogger Debug {"debug", GlobalLogFile, Colors::Purples::Purple, Colors::Gray, Colors::Gray, Colors::Purples::Purple, Colors::White};
+}

src/jlog/Timestamp.cpp

@@ -0,0 +1,17 @@
+#include "jlog/Timestamp.hpp"
+
+namespace jlog {
+    Timestamp::Timestamp() {
+        auto const timestamp = std::chrono::current_zone()->to_local(std::chrono::system_clock::now());
+        auto dp = floor<std::chrono::days>(timestamp);
+        std::chrono::year_month_day ymd{floor<std::chrono::days>(timestamp)};
+        std::chrono::hh_mm_ss time{floor<std::chrono::milliseconds>(timestamp - dp)};
+        y = ymd.year();
+        m = ymd.month();
+        d = ymd.day();
+        h = time.hours();
+        M = time.minutes();
+        s = time.seconds();
+        ms = time.subseconds();
+    }
+}

src/jlog/Token.cpp

@@ -0,0 +1,36 @@
+#include "jlog/Token.hpp"
+
+namespace jlog {
+    std::string token::Stringer(bool includeColor) {
+        std::string msg;
+        if (!includeColor)
+            return StringerWithoutColor();
+        return StringerWithColor();
+    }
+
+    std::string token::StringerWithColor() {
+        std::string msg;
+        if (!delimiter.empty()) {
+            return std::format("{}{}{}{}{} ",
+                               mcolor::toEscapeCode(colorCode),
+                               delimiter[0], content,
+                               delimiter[1],
+                               mcolor::toEscapeCode(AnsiColor::RESET));
+        }
+        return std::format("{}{}{} ",
+                           mcolor::toEscapeCode(colorCode),
+                           content,
+                           mcolor::toEscapeCode(AnsiColor::RESET));
+    }
+    std::string token::StringerWithoutColor() {
+        if (!delimiter.empty())
+            return std::format("{}{}{} ", delimiter[0], content, delimiter[1]);
+
+        return content + " ";
+    }
+
+    std::ostream& operator<<(std::ostream& os, token t) {
+        os << t.Stringer();
+        return os;
+    }
+}

src/jlog/linux/jlog.cpp

@@ -1,31 +0,0 @@
-#include <jlog/jlog.hpp>
-
-namespace jlog {
-    std::string consoleMsgFormatter(token t)
-    {
-        if (!t.delimiter.empty())
-        {
-            return std::format("{}{}{}{}{} ", t.colorCode.ansi_code, t.delimiter[0], t.content, t.delimiter[1], ansi_escape_codes::RESET);
-        }
-
-        return std::format("{}{}{} ", t.colorCode.ansi_code, t.content, ansi_escape_codes::RESET);
-    }
-
-    std::string logfileMsgFormatter(token t)
-    {
-        if (!t.delimiter.empty())
-        {
-            return std::format("{}{}{} ", t.delimiter[0], t.content, t.delimiter[1]);
-        }
-
-        return t.content + " ";
-    }
-
-    void log(std::vector<token> tokens, const std::string& filename)
-    {
-        log_to_console(toks2consoleMsg(tokens));
-        log_to_console("\n");
-        log_to_file(filename, toks2logfileMsg(tokens));
-        log_to_file(filename, "\n");
-    }
-}

src/jlog/shared/jlog.cpp

@@ -1,368 +0,0 @@
-#include <jlog/jlog.hpp>
-#include <fstream>
-#include <iostream>
-#include <chrono>
-
-namespace jlog
-{
-
-    static std::string default_logfile = "latest.log";
-
-    void set_default_logfile(const std::string& filename)
-    {
-        default_logfile = filename;
-    }
-
-
-    std::string get_timestamp()
-    {
-        using namespace std::chrono;
-        auto const timestamp = current_zone()->to_local(system_clock::now());
-        auto dp = floor<days>(timestamp);
-        year_month_day ymd{floor<days>(timestamp)};
-        hh_mm_ss time{floor<milliseconds>(timestamp - dp)};
-        auto y = ymd.year();
-        auto m = ymd.month();
-        auto d = ymd.day();
-        auto h = time.hours();
-        auto M = time.minutes();
-        auto s = time.seconds();
-        auto ms = time.subseconds();
-        return std::format("{}-{}-{} {}:{}:{}.{}", y, m, d, h.count(), M.count(), s.count(), ms.count());
-    }
-
-    void log_to_console(const std::string& message)
-    {
-        std::cout << message;
-    }
-
-    void log_to_file(const std::string& message)
-    {
-        std::ofstream latest_log(default_logfile, std::ios_base::app);
-        latest_log << message;
-        latest_log.close();
-    }
-
-    void log_to_file(const std::string& filename, const std::string& message)
-    {
-        std::ofstream latest_log(filename, std::ios_base::app);
-        latest_log << message;
-        latest_log.close();
-    }
-
-    void log_to_stream(std::ostream stream, const std::string& message)
-    {
-        stream << message;
-    }
-
-    std::string toks2msg(std::vector<token> tokens, std::function<std::string(token)> formatter)
-    {
-        std::string msg;
-        for (const token& t: tokens)
-        {
-            msg += formatter(t);
-        }
-        return msg;
-    }
-
-    std::string toks2consoleMsg(std::vector<token> tokens)
-    {
-        return toks2msg(tokens, consoleMsgFormatter);
-    }
-
-    std::string toks2logfileMsg(std::vector<token> tokens)
-    {
-        return toks2msg(tokens, logfileMsgFormatter);
-    }
-
-    void log(std::vector<token> tokens)
-    {
-        log(tokens, default_logfile);
-    }
-
-    // Mainly for debug purposes
-    void ltlog(std::vector<token> tokens)
-    {
-        log(tokens);
-        log_to_file("logtest.log", toks2logfileMsg(tokens) + "\n");
-    }
-
-    std::vector<token> trace_format(
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        return {trace, filedata};
-    }
-
-    std::vector<token> info_format(const std::string& message)
-    {
-        return log_format("INFO", message);
-    }
-
-    std::vector<token> warning_format(const std::string& message)
-    {
-        return log_format("INFO", message, color_codes::FG_YELLOW);
-    }
-
-    std::vector<token> error_format(const std::string& message)
-    {
-        return log_format("ERROR", message, color_codes::FG_RED);
-    }
-
-    std::vector<token> verbose_format(const std::string& message)
-    {
-        return log_format("VERBOSE", message, color_codes::FG_CYAN);
-    }
-
-    std::vector<token> debug_format(const std::string& message)
-    {
-        return log_format("DEBUG", message, color_codes::FG_GREEN);
-    }
-
-    std::vector<token> debug_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("DEBUG", message, func, file, line, color_codes::FG_GREEN);
-    }
-
-    std::vector<token> info_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("INFO", message, func, file, line);
-    }
-
-    std::vector<token> warning_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("WARNING", message, func, file, line, color_codes::FG_YELLOW);
-    }
-
-    std::vector<token> error_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("ERROR", message, func, file, line, color_codes::FG_RED);
-    }
-
-    std::vector<token> fatal_format(const std::string& message)
-    {
-        return log_format("FATAL", message, color_codes::FG_BRIGHT_RED);
-    }
-
-    std::vector<token> verbose_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("VERBOSE", message, func, file, line, color_codes::FG_CYAN);
-    }
-
-    std::vector<token> fatal_detailed_format(
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line)
-    {
-        return log_detailed_format("FATAL", message, func, file, line, color_codes::FG_BRIGHT_RED);
-    }
-
-    std::vector<token> log_format(
-        const std::string& severity_name,
-        const std::string& message,
-        const colorcode& severity_cc)
-    {
-        auto severity = token{.colorCode = severity_cc, .content = severity_name};
-        auto content = token{.content = message, .delimiter = ""};
-        return {severity, content};
-    }
-
-    std::vector<token> log_detailed_format(
-        const std::string& severity_name,
-        const std::string& message,
-        const std::string& func,
-        const std::string& file,
-        int line,
-        const colorcode& severity_cc)
-    {
-        std::vector<token> tokens;
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto tf_tokens = jlog::trace_format(func, file, line);
-        auto lf_tokens = jlog::log_format(severity_name, message, severity_cc);
-        tokens.push_back(timestamp);
-        tokens.insert(tokens.end(), tf_tokens.begin(), tf_tokens.end());
-        tokens.insert(tokens.end(), lf_tokens.begin(), lf_tokens.end());
-        return tokens;
-    }
-
-    void info_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void sinfo_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void usinfo_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-
-    void verbose_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void sverbose_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void usverbose_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-
-    void debug_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void sdebug_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void usdebug_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-
-    void warning_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void swarning_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void uswarning_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-
-    void error_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_GREEN, .content = "ERROR"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void serror_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_RED, .content = "ERROR"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void userror_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_RED, .content = "ERROR"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-
-    void fatal_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_RED, .content = "FATAL"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({timestamp, trace, filedata, severity, content});
-    }
-
-    void sfatal_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto timestamp = token{.content = jlog::get_timestamp()};
-        auto severity = token{.colorCode = color_codes::FG_BRIGHT_RED, .content = "FATAL"};
-        auto content = token{.content = message, .delimiter = ""};
-        auto trace = token{.content = func};
-        auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({trace, filedata, severity, content});
-    }
-
-    void usfatal_spec(const std::string& message, const std::string& func, const std::string& file, int line)
-    {
-        auto severity = token{.colorCode = color_codes::FG_BRIGHT_RED, .content = "FATAL"};
-        auto content = token{.content = message, .delimiter = ""};
-        log({severity, content});
-    }
-}

src/jlog/windows/jlog.cpp

@@ -1,28 +0,0 @@
-
-
-#include <jlog/jlog.hpp>
-#include <string>
-
-inline void SetConsoleTextColor(WORD color) {
-        SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), color);
-}
-
-namespace jlog
-{
-    void log(const std::vector<token> tokens) {
-        for (const token& t : tokens) {
-            if (!t.delimiter.empty()) {
-                SetConsoleTextColor(t.colorCode.nt_code);
-                log_to_console(std::string(1, t.delimiter[0]) + t.content + std::string(1, t.delimiter[1]) + " ");
-                log_to_file(std::string(1, t.delimiter[0]) + t.content + std::string(1, t.delimiter[1]) + " ");
-            } else {
-                SetConsoleTextColor(t.colorCode.nt_code);
-                log_to_console(t.content + " ");
-                log_to_file(t.content + " ");
-            }
-        }
-        SetConsoleTextColor(color_codes::FG_DEFAULT.nt_code);
-        log_to_console("\n");
-        log_to_file("\n");
-    }
-}