Core: Add a Maker field for GameModDescriptors.

dolphin-emu · Jan 2, 2022 · 29068898046316d79b9ba521360060f8f3175360 · 2906889
1 parent 85d2ea0
commit 29068898046316d79b9ba521360060f8f3175360
Showing with 12 additions and 0 deletions.

+6 −0 Source/Core/DiscIO/GameModDescriptor.cpp

+1 −0 Source/Core/DiscIO/GameModDescriptor.h

+2 −0 Source/Core/UICommon/GameFile.cpp

+3 −0 docs/game-mod-descriptor.json
diff --git a/Source/Core/DiscIO/GameModDescriptor.cpp b/Source/Core/DiscIO/GameModDescriptor.cpp
@@ -135,6 +135,10 @@ std::optional<GameModDescriptor> ParseGameModDescriptorString(std::string_view j
     {
       descriptor.display_name = value.get<std::string>();
     }
+    else if (key == "maker" && value.is<std::string>())
+    {
+      descriptor.maker = value.get<std::string>();
+    }
     else if (key == "banner" && value.is<std::string>())
     {
       descriptor.banner = MakeAbsolute(json_directory, value.get<std::string>());
@@ -195,6 +199,8 @@ std::string WriteGameModDescriptorString(const GameModDescriptor& descriptor, bo
     json_root["base-file"] = picojson::value(descriptor.base_file);
   if (!descriptor.display_name.empty())
     json_root["display-name"] = picojson::value(descriptor.display_name);
+  if (!descriptor.maker.empty())
+    json_root["maker"] = picojson::value(descriptor.maker);
   if (!descriptor.banner.empty())
     json_root["banner"] = picojson::value(descriptor.banner);
   if (descriptor.riivolution)

diff --git a/Source/Core/DiscIO/GameModDescriptor.h b/Source/Core/DiscIO/GameModDescriptor.h
@@ -36,6 +36,7 @@ struct GameModDescriptor
 {
   std::string base_file;
   std::string display_name;
+  std::string maker;
   std::string banner;
   std::optional<GameModDescriptorRiivolution> riivolution = std::nullopt;
 };

diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
@@ -177,6 +177,8 @@ GameFile::GameFile(std::string path) : m_file_path(std::move(path))
         m_valid = true;
         m_file_size = File::GetSize(m_file_path);
         m_long_names.emplace(DiscIO::Language::English, std::move(descriptor->display_name));
+        if (!descriptor->maker.empty())
+          m_long_makers.emplace(DiscIO::Language::English, std::move(descriptor->maker));
         m_internal_name = proxy.GetInternalName();
         m_game_id = proxy.GetGameID();
         m_gametdb_id = proxy.GetGameTDBID();

diff --git a/docs/game-mod-descriptor.json b/docs/game-mod-descriptor.json
@@ -17,6 +17,9 @@
 		"display-name": {
 			"type": "string"
 		},
+		"maker": {
+			"type": "string"
+		},
 		"banner": {
 			"type": "string"
 		},