From bd667dddad441c44637a8ec8d6af0bde4437289a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Fri, 27 Jan 2023 18:09:56 +0100 Subject: [PATCH] Group request manager files into their own directory --- src/PowderToy.cpp | 2 +- src/client/http/Request.cpp | 2 +- src/client/http/meson.build | 8 +------- .../Common.cpp} | 2 +- .../http/{ => requestmanager}/CurlError.h | 0 .../Libcurl.cpp} | 18 +++++++++--------- .../Null.cpp} | 2 +- .../http/{ => requestmanager}/RequestManager.h | 0 src/client/http/requestmanager/meson.build | 10 ++++++++++ src/lua/LuaSocketTCPHttp.cpp | 4 ++-- 10 files changed, 26 insertions(+), 22 deletions(-) rename src/client/http/{RequestManager.cpp => requestmanager/Common.cpp} (98%) rename src/client/http/{ => requestmanager}/CurlError.h (100%) rename src/client/http/{RequestManagerHttp.cpp => requestmanager/Libcurl.cpp} (96%) rename src/client/http/{RequestManagerNoHttp.cpp => requestmanager/Null.cpp} (96%) rename src/client/http/{ => requestmanager}/RequestManager.h (100%) create mode 100644 src/client/http/requestmanager/meson.build diff --git a/src/PowderToy.cpp b/src/PowderToy.cpp index 3b1634f51..e595e7129 100644 --- a/src/PowderToy.cpp +++ b/src/PowderToy.cpp @@ -6,7 +6,7 @@ #include "client/GameSave.h" #include "client/SaveFile.h" #include "client/SaveInfo.h" -#include "client/http/RequestManager.h" +#include "client/http/requestmanager/RequestManager.h" #include "common/platform/Platform.h" #include "graphics/Graphics.h" #include "simulation/SaveRenderer.h" diff --git a/src/client/http/Request.cpp b/src/client/http/Request.cpp index dac7993f5..85266c132 100644 --- a/src/client/http/Request.cpp +++ b/src/client/http/Request.cpp @@ -1,5 +1,5 @@ #include "Request.h" -#include "RequestManager.h" +#include "requestmanager/RequestManager.h" #include namespace http diff --git a/src/client/http/meson.build b/src/client/http/meson.build index 90af28efb..6a6bcb688 100644 --- a/src/client/http/meson.build +++ b/src/client/http/meson.build @@ -5,12 +5,6 @@ client_files += files( 'Request.cpp', 'SaveUserInfoRequest.cpp', 'ThumbnailRequest.cpp', - 'RequestManager.cpp', ) -if enable_http - client_files += files('RequestManagerHttp.cpp') -else - client_files += files('RequestManagerNoHttp.cpp') -endif -conf_data.set('NOHTTP', not enable_http ? 'true' : 'false') +subdir('requestmanager') diff --git a/src/client/http/RequestManager.cpp b/src/client/http/requestmanager/Common.cpp similarity index 98% rename from src/client/http/RequestManager.cpp rename to src/client/http/requestmanager/Common.cpp index bd8f48d57..5fa48939c 100644 --- a/src/client/http/RequestManager.cpp +++ b/src/client/http/requestmanager/Common.cpp @@ -1,5 +1,5 @@ #include "RequestManager.h" -#include "Request.h" +#include "client/http/Request.h" #include "Config.h" #include diff --git a/src/client/http/CurlError.h b/src/client/http/requestmanager/CurlError.h similarity index 100% rename from src/client/http/CurlError.h rename to src/client/http/requestmanager/CurlError.h diff --git a/src/client/http/RequestManagerHttp.cpp b/src/client/http/requestmanager/Libcurl.cpp similarity index 96% rename from src/client/http/RequestManagerHttp.cpp rename to src/client/http/requestmanager/Libcurl.cpp index 03a6be74e..121c5a747 100644 --- a/src/client/http/RequestManagerHttp.cpp +++ b/src/client/http/requestmanager/Libcurl.cpp @@ -1,6 +1,6 @@ #include // Has to come first because windows(tm). #include "RequestManager.h" -#include "Request.h" +#include "client/http/Request.h" #include "CurlError.h" #include "Config.h" @@ -92,7 +92,7 @@ namespace http return std::make_shared(); } - struct RequestManagerHttp : public RequestManager + struct RequestManagerImpl : public RequestManager { using RequestManager::RequestManager; @@ -102,7 +102,7 @@ namespace http void RequestManager::InitWorker() { - auto manager = static_cast(this); + auto manager = static_cast(this); if (!curl_global_init(CURL_GLOBAL_DEFAULT)) { manager->curlGlobalInit = true; @@ -119,7 +119,7 @@ namespace http void RequestManager::ExitWorker() { - auto manager = static_cast(this); + auto manager = static_cast(this); curl_multi_cleanup(manager->curlMulti); manager->curlMulti = NULL; curl_global_cleanup(); @@ -127,7 +127,7 @@ namespace http void RequestManager::RegisterRequestHandle(std::shared_ptr requestHandle) { - auto manager = static_cast(this); + auto manager = static_cast(this); auto handle = static_cast(requestHandle.get()); auto failEarly = [&requestHandle](int statusCode, ByteString error) { requestHandle->statusCode = statusCode; @@ -288,7 +288,7 @@ namespace http void RequestManager::UnregisterRequestHandle(std::shared_ptr requestHandle) { - auto manager = static_cast(this); + auto manager = static_cast(this); auto handle = static_cast(requestHandle.get()); if (handle->curlAddedToMulti) { @@ -311,7 +311,7 @@ namespace http std::this_thread::sleep_for(std::chrono::milliseconds(TickMs)); return; } - auto manager = static_cast(this); + auto manager = static_cast(this); int dontcare; HandleCURLMcode(curl_multi_wait(manager->curlMulti, NULL, 0, TickMs, &dontcare)); HandleCURLMcode(curl_multi_perform(manager->curlMulti, &dontcare)); @@ -391,12 +391,12 @@ namespace http RequestManagerPtr RequestManager::Create(ByteString newProxy, ByteString newCafile, ByteString newCapath, bool newDisableNetwork) { - return RequestManagerPtr(new RequestManagerHttp(newProxy, newCafile, newCapath, newDisableNetwork)); + return RequestManagerPtr(new RequestManagerImpl(newProxy, newCafile, newCapath, newDisableNetwork)); } void RequestManagerDeleter::operator ()(RequestManager *ptr) const { - delete static_cast(ptr); + delete static_cast(ptr); } void SetupCurlEasyCiphers(CURL *easy) diff --git a/src/client/http/RequestManagerNoHttp.cpp b/src/client/http/requestmanager/Null.cpp similarity index 96% rename from src/client/http/RequestManagerNoHttp.cpp rename to src/client/http/requestmanager/Null.cpp index 4fbff0777..2e6678d38 100644 --- a/src/client/http/RequestManagerNoHttp.cpp +++ b/src/client/http/requestmanager/Null.cpp @@ -1,5 +1,5 @@ #include "RequestManager.h" -#include "Request.h" +#include "client/http/Request.h" namespace http { diff --git a/src/client/http/RequestManager.h b/src/client/http/requestmanager/RequestManager.h similarity index 100% rename from src/client/http/RequestManager.h rename to src/client/http/requestmanager/RequestManager.h diff --git a/src/client/http/requestmanager/meson.build b/src/client/http/requestmanager/meson.build new file mode 100644 index 000000000..8ee8603e7 --- /dev/null +++ b/src/client/http/requestmanager/meson.build @@ -0,0 +1,10 @@ +client_files += files( + 'Common.cpp', +) + +if enable_http + client_files += files('Libcurl.cpp') +else + client_files += files('Null.cpp') +endif +conf_data.set('NOHTTP', not enable_http ? 'true' : 'false') diff --git a/src/lua/LuaSocketTCPHttp.cpp b/src/lua/LuaSocketTCPHttp.cpp index baec28f93..3c58c0de1 100644 --- a/src/lua/LuaSocketTCPHttp.cpp +++ b/src/lua/LuaSocketTCPHttp.cpp @@ -9,8 +9,8 @@ #include #include "LuaScriptInterface.h" -#include "client/http/RequestManager.h" -#include "client/http/CurlError.h" +#include "client/http/requestmanager/RequestManager.h" +#include "client/http/requestmanager/CurlError.h" #include "Misc.h" namespace LuaSocket