Merge pull request #768 from diamante0018/develop

[Download]: Add maprotation to info endpoint

src/Components/Modules/AssetInterfaces/IFont_s.cpp

@@ -4,8 +4,6 @@
 #define STB_TRUETYPE_IMPLEMENTATION
 #include <stb_truetype.hpp>
 
-#include <json.hpp>
-
 namespace Assets
 {
 	namespace

src/Components/Modules/AssetInterfaces/IGameWorldMp.cpp

@@ -1,8 +1,6 @@
 #include <STDInclude.hpp>
 #include "IGameWorldMp.hpp"
 
-#include <json.hpp>
-
 #define IW4X_GAMEWORLD_VERSION 1
 
 namespace Assets

src/Components/Modules/AssetInterfaces/ILocalizeEntry.cpp

@@ -1,8 +1,6 @@
 #include <STDInclude.hpp>
 #include "ILocalizeEntry.hpp"
 
-#include <json.hpp>
-
 namespace Assets
 {
 	void ILocalizeEntry::load(Game::XAssetHeader* header, const std::string& name, Components::ZoneBuilder::Zone* builder)

src/Components/Modules/Bans.cpp

@@ -1,8 +1,6 @@
 #include <STDInclude.hpp>
 #include "Bans.hpp"
 
-#include <json.hpp>
-
 namespace Components
 {
 	const char* Bans::BanListFile = "userraw/bans.json";

src/Components/Modules/Chat.cpp

@@ -5,8 +5,6 @@
 
 #include "GSC/Script.hpp"
 
-#include <json.hpp>
-
 namespace Components
 {
 	Dvar::Var Chat::cg_chatWidth;

src/Components/Modules/Download.cpp

@@ -3,6 +3,7 @@
 #include <Utils/WebIO.hpp>
 
 #include "Download.hpp"
+#include "MapRotation.hpp"
 #include "Party.hpp"
 #include "ServerInfo.hpp"
 
@@ -348,10 +349,6 @@ namespace Components
 		}
 	}
 
-#pragma endregion
-
-#pragma region Server
-	
 	void Download::DownloadProgress(FileDownload* fDownload, std::size_t bytes)
 	{
 		fDownload->receivedBytes += bytes;
@@ -415,6 +412,10 @@ namespace Components
 		}
 	}
 
+#pragma endregion
+
+#pragma region Server
+
 	static std::string InfoHandler()
 	{
 		const auto status = ServerInfo::GetInfo();
@@ -423,6 +424,7 @@ namespace Components
 		std::unordered_map<std::string, nlohmann::json> info;
 		info["status"] = status.to_json();
 		info["host"] = host.to_json();
+		info["map_rotation"] = MapRotation::to_json();
 
 		std::vector<nlohmann::json> players;
 

src/Components/Modules/GSC/ScriptStorage.cpp

@@ -1,7 +1,5 @@
 #include <STDInclude.hpp>
 
-#include <json.hpp>
-
 #include "ScriptStorage.hpp"
 #include "Script.hpp"
 

src/Components/Modules/MapRotation.cpp

@@ -78,6 +78,32 @@ namespace Components
 		});
 	}
 
+	nlohmann::json MapRotation::RotationData::to_json() const
+	{
+		std::vector<std::string> mapVector;
+		std::vector<std::string> gametypeVector;
+
+		for (const auto& [key, val] : this->rotationEntries_)
+		{
+			if (key == "map"s)
+			{
+				mapVector.emplace_back(val);
+			}
+			else if (key == "gametype"s)
+			{
+				gametypeVector.emplace_back(val);
+			}
+		}
+
+		auto mapRotationJson = nlohmann::json
+		{
+			{"maps", mapVector},
+			{"gametypes", gametypeVector},
+		};
+
+		return mapRotationJson;
+	}
+
 	void MapRotation::LoadRotation(const std::string& data)
 	{
 		try
@@ -142,6 +168,12 @@ namespace Components
 		return DedicatedRotation.contains(key, value);
 	}
 
+	nlohmann::json MapRotation::to_json()
+	{
+		assert(!DedicatedRotation.empty());
+		return DedicatedRotation.to_json();
+	}
+
 	bool MapRotation::ShouldRotate()
 	{
 		if (!Dedicated::IsEnabled() && SVDontRotate.get<bool>())

src/Components/Modules/MapRotation.hpp

@@ -9,6 +9,8 @@ namespace Components
 
 		static bool Contains(const std::string& key, const std::string& value);
 
+		static nlohmann::json to_json();
+
 		bool unitTest() override;
 
 	private:
@@ -39,6 +41,8 @@ namespace Components
 			[[nodiscard]] bool empty() const noexcept;
 			[[nodiscard]] bool contains(const std::string& key, const std::string& value) const;
 
+			[[nodiscard]] nlohmann::json to_json() const;
+
 		private:
 			std::vector<rotationEntry> rotationEntries_;
 

src/Components/Modules/Maps.cpp

@@ -1,7 +1,5 @@
 #include <STDInclude.hpp>
 
-#include <json.hpp>
-
 #include "FastFiles.hpp"
 #include "RawFiles.hpp"
 #include "StartupMessages.hpp"

src/Components/Modules/StructuredData.cpp

@@ -1,8 +1,6 @@
 #include <STDInclude.hpp>
 #include "StructuredData.hpp"
 
-#include <json.hpp>
-
 namespace Components
 {
 	Utils::Memory::Allocator StructuredData::MemAllocator;

src/Components/Modules/Theatre.cpp

@@ -1,7 +1,5 @@
 #include <STDInclude.hpp>
 
-#include <json.hpp>
-
 #include "Theatre.hpp"
 #include "UIFeeder.hpp"
 

src/Components/Modules/ZoneBuilder.cpp

@@ -4,8 +4,6 @@
 #include "Console.hpp"
 #include "FastFiles.hpp"
 
-#include <json.hpp>
-
 #include <version.hpp>
 
 #include "AssetInterfaces/ILocalizeEntry.hpp"

src/STDInclude.hpp

@@ -109,6 +109,7 @@ using namespace std::literals;
 #define AssertUnreachable assert(0 && "unreachable")
 
 #include <gsl/gsl>
+#include <json.hpp>
 #include <tomcrypt.h>
 
 #pragma warning(pop)

src/Utils/InfoString.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include <json.hpp>
 
 namespace Utils
 {

src/Utils/Json.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include <json.hpp>
 
 namespace Utils::Json
 {