From 4aef8c0c1a60472e8d286d910113b048e4da12be Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Wed, 27 May 2026 04:04:39 -0500 Subject: [PATCH] Overhaul cmake configuration, add console api, fix http code that caused issues with cgi-bin --- include/TessesFramework/Http/HttpClient.hpp | 2 ++ include/TessesFramework/Platform/Environment.hpp | 2 ++ src/Filesystem/LocalFS.cpp | 5 +++-- src/Http/HttpServer.cpp | 11 +++++++---- src/Platform/Environment.cpp | 7 +++++-- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/TessesFramework/Http/HttpClient.hpp b/include/TessesFramework/Http/HttpClient.hpp index efa726b..55c3ba4 100644 --- a/include/TessesFramework/Http/HttpClient.hpp +++ b/include/TessesFramework/Http/HttpClient.hpp @@ -19,8 +19,10 @@ #pragma once #include "../Streams/Stream.hpp" #include "HttpUtils.hpp" +// clang-format off #include "TessesFramework/Filesystem/LocalFS.hpp" #include "TessesFramework/Filesystem/VFSFix.hpp" +// clang-format on #include "WebSocket.hpp" namespace Tesses::Framework::Http { diff --git a/include/TessesFramework/Platform/Environment.hpp b/include/TessesFramework/Platform/Environment.hpp index 1692d6b..6858808 100644 --- a/include/TessesFramework/Platform/Environment.hpp +++ b/include/TessesFramework/Platform/Environment.hpp @@ -17,8 +17,10 @@ */ #pragma once +// clang-format off #include "TessesFramework/Filesystem/LocalFS.hpp" #include "TessesFramework/Filesystem/VFSFix.hpp" +// clang-format on #include namespace Tesses::Framework::Platform::Environment { extern const char EnvPathSeperator; diff --git a/src/Filesystem/LocalFS.cpp b/src/Filesystem/LocalFS.cpp index cc2a123..159aff8 100644 --- a/src/Filesystem/LocalFS.cpp +++ b/src/Filesystem/LocalFS.cpp @@ -24,9 +24,10 @@ #include #include #if defined(_WIN32) - -#include "TessesFramework/Filesystem/VFSFix.hpp" +// clang-format off #include +#include "TessesFramework/Filesystem/VFSFix.hpp" +// clang format on #undef min #else #include diff --git a/src/Http/HttpServer.cpp b/src/Http/HttpServer.cpp index c90dd47..c6d9ff9 100644 --- a/src/Http/HttpServer.cpp +++ b/src/Http/HttpServer.cpp @@ -19,8 +19,7 @@ #include "TessesFramework/Http/HttpServer.hpp" #include "TessesFramework/Common.hpp" #include "TessesFramework/Crypto/Crypto.hpp" -#include "TessesFramework/Filesystem/VFS.hpp" -#include "TessesFramework/Filesystem/VFSFix.hpp" + #include "TessesFramework/Http/ContentDisposition.hpp" #include "TessesFramework/Http/HttpStream.hpp" #include "TessesFramework/Streams/BufferedStream.hpp" @@ -33,6 +32,10 @@ #include #include +// clang-format off +#include "TessesFramework/Filesystem/VFS.hpp" +#include "TessesFramework/Filesystem/VFSFix.hpp" +// clang-format on using FileStream = Tesses::Framework::Streams::FileStream; using Stream = Tesses::Framework::Streams::Stream; using SeekOrigin = Tesses::Framework::Streams::SeekOrigin; @@ -711,8 +714,8 @@ void HttpServer::StartAccepting() { } if (this->showARTL) { if (!svr->IsValid()) - StdOut() - << "\x1B[31mError, we failed to bind or something\x1B[39m" << NewLine(); + StdOut() << "\x1B[31mError, we failed to bind or something\x1B[39m" + << NewLine(); StdOut() << "\x1B[31mAlmost Ready to Listen\x1B[39m" << NewLine(); } diff --git a/src/Platform/Environment.cpp b/src/Platform/Environment.cpp index cfc6ccb..b8e6574 100644 --- a/src/Platform/Environment.cpp +++ b/src/Platform/Environment.cpp @@ -22,9 +22,12 @@ #include "sago/platform_folders.h" #endif #if defined(_WIN32) -#include "TessesFramework/Filesystem/VFSFix.hpp" -#include "TessesFramework/Text/StringConverter.hpp" + +// clang-format off #include +#include "TessesFramework/Text/StringConverter.hpp" +#include "TessesFramework/Filesystem/VFSFix.hpp" +// clang-format on using namespace Tesses::Framework::Text::StringConverter; #endif