Add NanaBox::FromGuestType and NanaBox::ToGuestType.

M2Team · Nov 19, 2024 · 882f6cc · 882f6cc
1 parent 8fadd5c
commit 882f6cc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/NanaBox/ConfigurationManager.cpp b/NanaBox/ConfigurationManager.cpp
@@ -14,6 +14,8 @@
 
 #include <Mile.Helpers.Base.h>
 
+#include <NanaBox.Configuration.Parser.h>
+
 namespace NanaBox
 {
     namespace ResolutionType
@@ -30,12 +32,6 @@ namespace NanaBox
 
 namespace NanaBox
 {
-    NLOHMANN_JSON_SERIALIZE_ENUM(NanaBox::GuestType, {
-        { NanaBox::GuestType::Unknown, "Unknown" },
-        { NanaBox::GuestType::Windows, "Windows" },
-        { NanaBox::GuestType::Linux, "Linux" }
-    })
-
     NLOHMANN_JSON_SERIALIZE_ENUM(NanaBox::UefiConsoleMode, {
         { NanaBox::UefiConsoleMode::Disabled, "Disabled" },
         { NanaBox::UefiConsoleMode::Default, "Default" },
@@ -1320,15 +1316,8 @@ NanaBox::VirtualMachineConfiguration NanaBox::DeserializeConfiguration(
         throw std::exception("Invalid Version");
     }
 
-    try
-    {
-        Result.GuestType =
-            RootJson.at("GuestType").get<NanaBox::GuestType>();
-    }
-    catch (...)
-    {
-
-    }
+    Result.GuestType = NanaBox::ToGuestType(
+        Mile::Json::GetSubKey(RootJson, "GuestType"));
 
     Result.Name = Mile::Json::ToString(
         Mile::Json::GetSubKey(RootJson, "Name"),
@@ -1513,7 +1502,7 @@ std::string NanaBox::SerializeConfiguration(
     nlohmann::json RootJson;
     RootJson["Type"] = "VirtualMachine";
     RootJson["Version"] = Configuration.Version;
-    RootJson["GuestType"] = Configuration.GuestType;
+    RootJson["GuestType"] = NanaBox::FromGuestType(Configuration.GuestType);
     RootJson["Name"] = Configuration.Name;
     RootJson["ProcessorCount"] = Configuration.ProcessorCount;
     RootJson["MemorySize"] = Configuration.MemorySize;

diff --git a/NanaBox/NanaBox.Configuration.Parser.cpp b/NanaBox/NanaBox.Configuration.Parser.cpp
@@ -9,3 +9,35 @@
  */
 
 #include "NanaBox.Configuration.Parser.h"
+
+nlohmann::json NanaBox::FromGuestType(
+    NanaBox::GuestType const& Value)
+{
+    if (NanaBox::GuestType::Windows == Value)
+    {
+        return "Windows";
+    }
+    else if (NanaBox::GuestType::Linux == Value)
+    {
+        return "Linux";
+    }
+
+    return "Unknown";
+}
+
+NanaBox::GuestType NanaBox::ToGuestType(
+    nlohmann::json const& Value)
+{
+    std::string RawValue = Mile::Json::ToString(Value);
+
+    if (0 == std::strcmp(RawValue.c_str(), "Windows"))
+    {
+        return NanaBox::GuestType::Windows;
+    }
+    else if (0 == std::strcmp(RawValue.c_str(), "Linux"))
+    {
+        return NanaBox::GuestType::Linux;
+    }
+
+    return NanaBox::GuestType::Unknown;
+}
diff --git a/NanaBox/NanaBox.Configuration.Parser.h b/NanaBox/NanaBox.Configuration.Parser.h
@@ -13,9 +13,15 @@
 
 #include <NanaBox.Configuration.Specification.h>
 
+#include <Mile.Json.h>
+
 namespace NanaBox
 {
+    nlohmann::json FromGuestType(
+        GuestType const& Value);
 
+    GuestType ToGuestType(
+        nlohmann::json const& Value);
 }
 
 #endif // !NANABOX_CONFIGURATION_PARSER