Re-enable color output on Windows.

fix msvc being stupid

.gitignore

@@ -0,0 +1,2 @@
+/cmake-build-debug
+/.idea

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18..27)
+cmake_minimum_required(VERSION 3.18..3.27)
 PROJECT(jlog
     VERSION 1.0
     LANGUAGES CXX
@@ -14,18 +14,22 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(cmake/CPM.cmake)
 
-
 file(GLOB_RECURSE jlog_HEADERS "include/jlog/*.h" "include/jlog/*.hpp")
-file(GLOB_RECURSE jlog_SRC     "src/jlog/*.c" "src/jlog/*.cpp")
+
+file(GLOB_RECURSE jlog_SRC "src/jlog/*.cpp")
+
 
 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-12.zip
 )
 
-include_directories(${Event_SOURCE_DIR}/include)
+CPMAddPackage(
+        NAME mcolor
+        URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip
+)
 
 if (UNIX)
     add_library(jlog SHARED ${jlog_SRC})
@@ -33,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})
@@ -42,7 +49,7 @@ install(FILES ${jlog_HEADERS} DESTINATION include/${PROJECT_NAME})
 
 #add_subdirectory(tests)
 
-target_link_libraries(jlog PUBLIC Event)
+target_link_libraries(jlog PUBLIC Event mcolor)
 
 add_executable(LoggerDemo main.cpp)
-target_link_libraries(LoggerDemo PUBLIC ${PROJECT_NAME})
+target_link_libraries(LoggerDemo PUBLIC jlog)

README.md

@@ -8,19 +8,20 @@ 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
 
 Include this repository as a CPM dependency, and link against the library.
-(TODO: Show the relevant CMake script lines.)
 
 ```cmake
 CPMAddPackage(
         NAME jlog
-        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-2.zip
+        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-7.zip
 )
 # ...
 include_directories(${jlog_SOURCE_DIR}/include)
@@ -30,19 +31,20 @@ target_link_libraries(YourProgram ... jlog)
 
 ```
 
+# Usage 
 Using jlog is straightforward:
 
 ```cpp
 
-#include <jlog.h>
+#include <jlog/jlog.hpp>
 
 int main() {
-    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;
 }
@@ -55,14 +57,10 @@ int main() {
 
 ## TODO
 
-* Custom Contexts: Allow users to specify custom logging contexts for better organization.
-  * Disable & sort by context (other categories?)
-* Custom Formats: Add support for custom log message formats.
 * Documentation
 * Thread Safety
 * Memory Safety
 * Stream Support
-* Identify File, Line, Function name via macros (I hate macros!!!)
 
 ## License
 

include/jlog/Logger.hpp

@@ -0,0 +1,223 @@
+#pragma once
+#include <fstream>
+#include <iostream>
+#include <source_location>
+#include <jlog/Token.hpp>
+#include <jlog/Timestamp.hpp>
+#include <Event.h>
+
+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;
+
+            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:
+        Event<std::string, Color4> OnLog;
+        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()) {
+            OnLog.Invoke(message, messageColor);
+            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;
+
+    class LibraryLogger {
+    public:
+        LibraryLogger(const std::string libname) :
+                Info {libname + "::" + "info", GlobalLogFile, Colors::Green, Colors::Gray, Colors::Gray, Colors::Green, Colors::White},
+                Warning {libname + "::" + "warning", GlobalLogFile, Colors::Yellow, Colors::Gray, Colors::Gray, Colors::Yellow, Colors::White},
+                Error {libname + "::" + "error", GlobalLogFile, Colors::Red, Colors::Gray, Colors::Gray, Colors::Red, Colors::White},
+                Fatal {libname + "::" + "fatal", GlobalLogFile, Colors::Reds::Crimson, Colors::Gray, Colors::Gray, Colors::Reds::Crimson, Colors::White},
+                Verbose {libname + "::" + "verbose", GlobalLogFile, Colors::Blue, Colors::Gray, Colors::Gray, Colors::Blue, Colors::White},
+                Debug {libname + "::" + "debug", GlobalLogFile, Colors::Purples::Purple, Colors::Gray, Colors::Gray, Colors::Purples::Purple, Colors::White}
+        {}
+    public:
+        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};
+    public:
+        void EnableAll(bool b) {
+            Info.EnableConsole(b);
+            Info.EnableFile(b);
+            Warning.EnableConsole(b);
+            Warning.EnableFile(b);
+            Error.EnableConsole(b);
+            Error.EnableFile(b);
+            Fatal.EnableConsole(b);
+            Fatal.EnableFile(b);
+            Verbose.EnableConsole(b);
+            Verbose.EnableFile(b);
+            Debug.EnableConsole(b);
+            Debug.EnableFile(b);
+        }
+    };
+}

include/jlog/Timestamp.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <chrono>
+
+namespace jlog {
+    class Timestamp {
+    public:
+        Timestamp();
+    public:
+        [[nodiscard]] std::chrono::year Year() const {return y;};
+        [[nodiscard]] std::chrono::month Month() const {return m;};
+        [[nodiscard]] std::chrono::day Day() const {return d;}
+        [[nodiscard]] std::chrono::duration<long, std::ratio<3600>> Hour() const {return h;};
+        [[nodiscard]] std::chrono::duration<long, std::ratio<60>> Minute() const {return M;};
+        [[nodiscard]] std::chrono::duration<long> Second() const {return s;};
+        [[nodiscard]] std::chrono::duration<long, std::ratio<1, 1000>> Millisecond() const {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,30 @@
+#pragma once
+
+#include <functional>
+#include <string>
+#include <ostream>
+#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,109 +0,0 @@
-#pragma once
-
-#include <string>
-#include <cstdint>
-#include <format>
-
-#define ESC "\033["
-
-namespace jlog::ansi_escape_codes
-{
-    static const std::string CURSOR_HOME = "\033[H";
-
-    static const std::string ERASE_SCREEN_AFTER_CURSOR = "\033[0J";
-    static const std::string ERASE_SCREEN_BEFORE_CURSOR = "\033[1J";
-    static const std::string ERASE_SCREEN_ALL = "\033[2J";
-    static const std::string ERASE_LINE_AFTER_CURSOR = "\033[0K";
-    static const std::string ERASE_LINE_BEFORE_CURSOR = "\033[1K";
-    static const std::string ERASE_LINE_ALL = "\033[2K";
-
-    static const std::string RESET = "\033[0m";
-    static const std::string BOLD  = "\033[1m";
-    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.
-
-    static const std::string CURSOR_INVISIBLE = "\033[?25l";
-    static const std::string CURSOR_VISIBLE   = "\033[?25h";
-    static const std::string RESTORE_SCREEN   = "\033[?47l";
-    static const std::string SAVE_SCREEN      = "\033[?47h";
-
-
-    static const std::string FG_BLACK = "\033[30m";
-    static const std::string FG_RED = "\033[31m";
-    static const std::string FG_GREEN = "\033[32m";
-    static const std::string FG_YELLOW = "\033[33m";
-    static const std::string FG_BLUE = "\033[34m";
-    static const std::string FG_MAGENTA = "\033[35m";
-    static const std::string FG_CYAN = "\033[36m";
-    static const std::string FG_WHITE = "\033[37m";
-    static const std::string FG_DEFAULT = "\033[39m";
-
-
-    static const std::string FG_BRIGHT_BLACK = "\033[90m";
-    static const std::string FG_BRIGHT_RED = "\033[91m";
-    static const std::string FG_BRIGHT_GREEN = "\033[92m";
-    static const std::string FG_BRIGHT_YELLOW = "\033[93m";
-    static const std::string FG_BRIGHT_BLUE = "\033[94m";
-    static const std::string FG_BRIGHT_MAGENTA = "\033[95m";
-    static const std::string FG_BRIGHT_CYAN = "\033[96m";
-    static const std::string FG_BRIGHT_WHITE = "\033[97m";
-
-
-    static const std::string BG_BLACK = "\033[40m";
-    static const std::string BG_RED   = "\033[41m";
-    static const std::string BG_GREEN = "\033[42m";
-    static const std::string BG_YELLOW = "\033[43m";
-    static const std::string BG_BLUE = "\033[44m";
-    static const std::string BG_MAGENTA = "\033[45m";
-    static const std::string BG_CYAN = "\033[46m";
-    static const std::string BG_WHITE = "\033[47m";
-    static const std::string BG_DEFAULT = "\033[49m";
-
-    static const std::string BG_BRIGHT_BLACK = "\033[100m";
-    static const std::string BG_BRIGHT_RED = "\033[101m";
-    static const std::string BG_BRIGHT_GREEN = "\033[102m";
-    static const std::string BG_BRIGHT_YELLOW = "\033[103m";
-    static const std::string BG_BRIGHT_BLUE = "\033[104m";
-    static const std::string BG_BRIGHT_MAGENTA = "\033[105m";
-    static const std::string BG_BRIGHT_CYAN = "\033[106m";
-    static const std::string BG_BRIGHT_WHITE = "\033[107m";
-
-    std::string true_color(uint8_t r, uint8_t g, uint8_t b)
-    {
-        return std::format("\033[38;2;{};{};{}m", r, g, b);
-    }
-
-    std::string cursor_to(int line, int col)
-    {
-
-    }
-
-    std::string cursor_up(int lines)
-    {
-
-    }
-
-    std::string cursor_down(int lines)
-    {
-
-    }
-
-    std::string cursor_left(int cols)
-    {
-
-    }
-
-    std::string cursor_right(int cols)
-    {
-
-    }
-
-    std::string cursor_to_col(int col)
-    {
-
-    }
-}

include/jlog/jlog.hpp

@@ -1,139 +0,0 @@
-/// Josh's Logger
-/// A Redacted Software Product
-/// Developed & Maintained by Josh O'Leary
-/// This work is dedicated to the public domain.
-
-
-#pragma once
-
-#include <format>
-#include <string>
-#include <iostream>
-#include <chrono>
-#include <Event.h>
-#include <fstream>
-
-namespace jlog
-{
-    enum class severity
-    {
-        none,
-        verbose,
-        debug,
-        warning,
-        error,
-        fatal
-    };
-
-    struct LogEntry
-    {
-        severity level;
-        std::string content;
-        std::string timestamp;
-    };
-
-
-
-    static Event<LogEntry> on_log = Event<LogEntry>();
-
-    std::vector<LogEntry> log_history;
-
-    struct token
-    {
-        std::string colorCode = "";
-        std::string content = "";
-        std::string delimiter = "[]";
-    };
-
-    void log(std::vector<token> tokens);
-
-    void info   (const std::string& message);
-    void sinfo   (const std::string& message);
-    void usinfo   (const std::string& message);
-
-
-    void verbose(const std::string& message);
-    void sverbose(const std::string& message);
-    void usverbose(const std::string& message);
-
-
-    void debug  (const std::string& message);
-    void sdebug  (const std::string& message);
-    void usdebug  (const std::string& message);
-
-
-    void warning(const std::string& message);
-    void swarning(const std::string& message);
-    void uswarning(const std::string& message);
-
-
-    void error  (const std::string& message);
-    void serror  (const std::string& message);
-    void userror  (const std::string& message);
-
-
-    void fatal  (const std::string& message);
-    void sfatal  (const std::string& message);
-    void usfatal  (const std::string& message);
-
-
-    void info_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void sinfo_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void usinfo_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-    void verbose_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void sverbose_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void usverbose_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-    void debug_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void sdebug_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void usdebug_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-    void warning_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void swarning_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void uswarning_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-    void error_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void serror_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void userror_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-    void fatal_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void sfatal_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-    void usfatal_spec(const std::string& message, const std::string& func, const std::string& file, int line);
-
-
-}
-
-#define INFO(i)    jlog::info_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SINFO(i)   jlog::sinfo_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USINFO(i)   jlog::usinfo_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-
-
-#define VERBOSE(i) jlog::verbose_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SVERBOSE(i) jlog::sverbose_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USVERBOSE(i) jlog::usverbose_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-
-
-#define DEBUG(i)   jlog::debug_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SDEBUG(i)   jlog::sdebug_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USDEBUG(i)   jlog::usdebug_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-
-
-#define WARNING(i) jlog::warning_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SWARNING(i) jlog::swarning_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USWARNING(i) jlog::uswarning_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-
-
-#define ERROR(i)   jlog::error_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SERROR(i)   jlog::serror_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USERROR(i)   jlog::userror_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-
-
-#define FATAL(i)   jlog::fatal_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define SFATAL(i)   jlog::sfatal_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);
-#define USFATAL(i)   jlog::usfatal_spec(i, __PRETTY_FUNCTION__, __FILE__, __LINE__);

main.cpp

@@ -1,28 +1,45 @@
-#include <jlog/jlog.hpp>
+// Josh's Logger
+// Minimal, robust, Modern (C++20) Logging Framework
+// Created by Joshua O'Leary @ Redacted Software, June 2024
+// Contact: josh@redacted.cc
+// Contributors: william@redacted.cc maxi@redacted.cc
+// This work is dedicated to the public domain.
+#include "jlog/Logger.hpp"
 
 int main()
 {
-    INFO("This is barely useful information.");
-    DEBUG("Debugging Information");
-    VERBOSE("Yadda Yadda Yadda");
-    WARNING("Slight miscalculation!");
-    ERROR("Oops, something went wrong.");
-    FATAL("Unrecoverable Error!!!");
-
-    SINFO("This is even less useful information.");
-    SDEBUG("Shorter Debugging Information");
-    SVERBOSE("Yadda Yadda");
-    SWARNING("Minute miscalculation!");
-    SERROR("Oops, something went wrong, but the programmer used the short error logger so you're fucked!");
-    SFATAL("Unrecoverable Error, but the programmer used the short fatal logger so you're even more fucked!!!");
-
-    USINFO("This is EVEN less useful information.");
-    USDEBUG("Ultra compact debugging information.");
-    USVERBOSE("Isn't this an oxymoron?");
-    USWARNING("Captain Quark grade miscalculation!");
-    USERROR("You're fucked!");
-    USFATAL("You're super fucked!!!");
+    mcolor::windowsSaneify();
+    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");
+    jlog::LibraryLogger libtest("JLog");
+    libtest.Info("A");
+    libtest.Warning("B");
+    libtest.Debug("C");
+    libtest.Error("D");
+    libtest.Fatal("E");
+    libtest.Verbose("G");
+    libtest.EnableAll(false);
+    libtest.Info("A2");
+    libtest.Warning("B2");
+    libtest.Debug("C2");
+    libtest.Error("D2");
+    libtest.Fatal("E2");
+    libtest.Verbose("G2");
 
     return 0;
-    ///
-}
+}
+
+//Windows :(
+#ifdef _WIN32
+extern "C" {
+    int wmain(int argc, wchar_t* argv[]) {
+        return main();
+    }
+}
+#endif

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,37 @@
+#include <jlog/Token.hpp>
+#include <ostream>
+
+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/jlog.cpp

@@ -1,365 +0,0 @@
-#include <source_location>
-#include <jlog/ansi_escape_codes.hpp>
-#include <jlog/jlog.hpp>
-#include <string>
-
-namespace jlog {
-    static std::string get_timestamp();
-    static void log_to_console(const std::string& message);
-    static void log_to_file(const std::string& message);
-
-    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("latest.log", std::ios_base::app);
-        latest_log << message;
-        latest_log.close();
-
-    }
-
-    void log(std::vector<token> tokens) {
-        for (token t : tokens) {
-            if (t.delimiter != "") {
-                log_to_console(std::format("{}{}{}{}{} ", t.colorCode, t.delimiter[0], t.content, t.delimiter[1], ansi_escape_codes::RESET));
-                log_to_file(std::format("{}{}{} ", t.delimiter[0], t.content, t.delimiter[1]));
-            } else {
-                log_to_console(std::format("{}{}{} ", t.colorCode, t.content, ansi_escape_codes::RESET));
-                log_to_file(t.content + " ");
-            }
-        }
-        log_to_console("\n");
-        log_to_file("\n");
-    }
-
-    void direct(const std::string &message) { log({{.content = message, .delimiter=""}});}
-
-    void info(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({timestamp, severity, content});
-    }
-
-    void sinfo(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-    }
-    void usinfo(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_WHITE, .content = "INFO"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-    }
-
-    void verbose(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({timestamp, severity, content});
-        //log(ansi_escape_codes::FG_CYAN, "VERBOSE", message);
-    }
-
-    void sverbose(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-        //log(ansi_escape_codes::FG_CYAN, "VERBOSE", message);
-    }
-
-    void usverbose(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_CYAN, .content = "VERBOSE"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-        //log(ansi_escape_codes::FG_CYAN, "VERBOSE", message);
-    }
-
-    void debug(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({timestamp, severity, content});
-
-    }
-
-    void sdebug(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-    }
-
-    void usdebug(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_GREEN, .content = "DEBUG"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-    }
-
-    void warning(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_YELLOW, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({timestamp, severity, content});
-        //log(ansi_escape_codes::FG_YELLOW, "WARNING", message);
-    }
-
-    void uswarning(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_YELLOW, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-        //log(ansi_escape_codes::FG_YELLOW, "WARNING", message);
-    }
-
-    void error(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_RED, .content = "ERROR"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({timestamp, severity, content});
-        //log(ansi_escape_codes::FG_RED, "ERROR", message);
-    }
-
-    void userror(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_RED, .content = "ERROR"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = };
-        log({severity, content});
-        //log(ansi_escape_codes::FG_RED, "ERROR", message);
-    }
-
-    void fatal(const std::string &message) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_BRIGHT_RED, .content = "FATAL"};
-        auto content = token{.content = message, .delimiter = ""};
-
-        log({timestamp, severity, content});
-    }
-
-    void usfatal(const std::string &message) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_BRIGHT_RED, .content = "FATAL"};
-        auto content = token{.content = message, .delimiter = ""};
-
-        log({severity, content});
-    }
-
-    void info_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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});
-        //log({severity, content});
-    }
-
-    void usinfo_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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});
-        log({severity, content});
-    }
-
-    void verbose_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({severity, content});
-    }
-
-    void debug_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({severity, content});
-    }
-
-    void warning_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_YELLOW, .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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_YELLOW, .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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_codes::FG_YELLOW, .content = "WARNING"};
-        auto content = token{.content = message, .delimiter = ""};
-        //auto trace = token{.content = func};
-        //auto filedata = token{.content = std::format("{}:{}", file, line)};
-        log({severity, content});
-    }
-
-    void error_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({timestamp, trace, filedata, severity, content});
-    }
-
-    void serror_spec(const std::string &message, const std::string &func, const std::string &file,
-            int line) {
-        //auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({severity, content});
-    }
-
-    void fatal_spec(const std::string &message, const std::string &func, const std::string &file,
-        int line) {
-        auto timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({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 = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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 timestamp = token{.content = get_timestamp()};
-        auto severity = token{.colorCode = ansi_escape_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({severity, content});
-    }
-}