From 5d3d3a905e55c6163f70b759817d6566583d334e Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Thu, 28 Dec 2023 09:59:43 +0100 Subject: [PATCH] Remove httpfileserver until we actually use it --- ScreenPlayUtil/CMakeLists.txt | 5 --- .../public/ScreenPlayUtil/httpfileserver.h | 30 ------------------ ScreenPlayUtil/src/httpfileserver.cpp | 31 ------------------- Tools/defines.py | 1 - 4 files changed, 67 deletions(-) delete mode 100644 ScreenPlayUtil/inc/public/ScreenPlayUtil/httpfileserver.h delete mode 100644 ScreenPlayUtil/src/httpfileserver.cpp diff --git a/ScreenPlayUtil/CMakeLists.txt b/ScreenPlayUtil/CMakeLists.txt index 418a4c5d..1f3448e9 100644 --- a/ScreenPlayUtil/CMakeLists.txt +++ b/ScreenPlayUtil/CMakeLists.txt @@ -48,7 +48,6 @@ set(SOURCES src/archive.cpp src/contenttypes.cpp src/exitcodes.cpp - src/httpfileserver.cpp src/logginghandler.cpp src/projectfile.cpp src/steamenumsgenerated.cpp @@ -61,7 +60,6 @@ set(HEADER inc/public/ScreenPlayUtil/contenttypes.h inc/public/ScreenPlayUtil/exitcodes.h inc/public/ScreenPlayUtil/HelpersCommon.h - inc/public/ScreenPlayUtil/httpfileserver.h inc/public/ScreenPlayUtil/ListPropertyHelper.h inc/public/ScreenPlayUtil/logginghandler.h inc/public/ScreenPlayUtil/projectfile.h @@ -98,9 +96,6 @@ qt_add_qml_module( RESOURCES ${RESOURCES}) -find_path(CPP_HTTPLIB_INCLUDE_DIRS "httplib.h") -target_include_directories(${PROJECT_NAME} PUBLIC ${CPP_HTTPLIB_INCLUDE_DIRS}) - target_include_directories( ${PROJECT_NAME} PUBLIC inc/public/ diff --git a/ScreenPlayUtil/inc/public/ScreenPlayUtil/httpfileserver.h b/ScreenPlayUtil/inc/public/ScreenPlayUtil/httpfileserver.h deleted file mode 100644 index a025f221..00000000 --- a/ScreenPlayUtil/inc/public/ScreenPlayUtil/httpfileserver.h +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only -#pragma once - -#include -#include - -#include -#include - -namespace httplib { -class Server; -} - -namespace ScreenPlay { - -class HttpFileServer : public QObject { - Q_OBJECT -public: - explicit HttpFileServer(QObject* parent = nullptr); - - void startServer(); - void stopServer(); - -private: - using Deleter = std::function; - std::unique_ptr m_server; - - std::thread m_thread; -}; -} diff --git a/ScreenPlayUtil/src/httpfileserver.cpp b/ScreenPlayUtil/src/httpfileserver.cpp deleted file mode 100644 index 48ffa4ab..00000000 --- a/ScreenPlayUtil/src/httpfileserver.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only -#include "httpfileserver.h" -#include "httplib.h" - -namespace ScreenPlay { -HttpFileServer::HttpFileServer(QObject* parent) - : QObject { parent } -{ -} - -void HttpFileServer::startServer() -{ - const auto deleter = [](auto* ptr) { delete ptr; }; - m_server = std::unique_ptr(new httplib::Server(), deleter); - m_thread = std::thread([&]() { - qInfo() << " set_mount_point" << m_server->set_mount_point("/", "C:/Users/Eli/Desktop/web"); - - qInfo() << "listen"; - m_server->listen("0.0.0.0", 8081); - qInfo() << "end"; - }); -} - -void HttpFileServer::stopServer() -{ - if (m_thread.joinable()) - m_thread.join(); -} -} - -#include "moc_httpfileserver.cpp" diff --git a/Tools/defines.py b/Tools/defines.py index c5989311..410d44d2 100644 --- a/Tools/defines.py +++ b/Tools/defines.py @@ -30,7 +30,6 @@ VCPKG_VERSION = "2a6371b01420d8820d158b4707e79931feba27aa" VCPKG_BASE_PACKAGES = [ "curl", "openssl", - "cpp-httplib", "libarchive", "fmt", "catch2"