From 07a7592cac4216a784e03f412bca3530da79bc0c Mon Sep 17 00:00:00 2001 From: Kenix3 Date: Mon, 22 May 2023 23:46:27 -0400 Subject: [PATCH] Removes ConsoleSink. (#286) --- src/CMakeLists.txt | 5 ---- src/Context.cpp | 5 ---- src/log/spd/ConsoleSink.h | 62 --------------------------------------- 3 files changed, 72 deletions(-) delete mode 100644 src/log/spd/ConsoleSink.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4bcb39c..c3367ca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,11 +126,6 @@ set(Source_Files__Log source_group("Log" FILES ${Source_Files__Log}) -set(Source_Files__Log__SPDLog - ${CMAKE_CURRENT_SOURCE_DIR}/log/spd/ConsoleSink.h -) - -source_group("log/spdLog" FILES ${Source_Files__Log__SPDLog}) target_sources(libultraship PRIVATE ${Source_Files__Log} ${Source_Files__Log__SPDLog}) #=================== Window =================== diff --git a/src/Context.cpp b/src/Context.cpp index 225a3f3..b2902ce 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -3,7 +3,6 @@ #include #include #include -#include "log/spd/ConsoleSink.h" #ifdef __APPLE__ #include "utils/OSXFolderManager.h" @@ -98,10 +97,6 @@ void Context::InitLogging() { spdlog::init_thread_pool(8192, 1); std::vector sinks; - auto consoleSink = std::make_shared(); - // consoleSink->set_level(spdlog::level::trace); - sinks.push_back(consoleSink); - #if (!defined(_WIN32) && !defined(__WIIU__)) || defined(_DEBUG) #if defined(_DEBUG) && defined(_WIN32) // LLVM on Windows allocs a hidden console in its entrypoint function. diff --git a/src/log/spd/ConsoleSink.h b/src/log/spd/ConsoleSink.h deleted file mode 100644 index 6e026e3..0000000 --- a/src/log/spd/ConsoleSink.h +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#pragma once - -#include -#include -#include -#include -#include -#include "Context.h" -#include "window/gui/Gui.h" -#include "window/gui/ConsoleWindow.h" -#include -#include -#include -#include -#include "public/bridge/consolevariablebridge.h" - -namespace spdlog { -namespace sinks { - -template class ConsoleSink final : public base_sink { - public: - explicit ConsoleSink(std::string tag = "spdlog", bool use_raw_msg = false) - : tag_(std::move(tag)), use_raw_msg_(use_raw_msg) { - } - - protected: - void sink_it_(const details::log_msg& msg) override { - if (LUS::Context::GetInstance() == nullptr) { - return; - } - - memory_buf_t formatted; - if (use_raw_msg_) { - details::fmt_helper::append_string_view(msg.payload, formatted); - } else { - base_sink::formatter_->format(msg, formatted); - } - formatted.push_back('\0'); - const char* msg_output = formatted.data(); - if (CVarGetInteger("gSinkEnabled", 0) && - LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console")->IsVisible()) { - std::reinterpret_pointer_cast( - LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console")) - ->Append("Logs", msg.level, "%s", msg_output); - } - } - - void flush_() override { - } - - private: - std::string tag_; - bool use_raw_msg_; -}; - -using lus_sink_mt = ConsoleSink; -using lus_sink_st = ConsoleSink; -} // namespace sinks -} // namespace spdlog