Merge pull request #471 from Laupetin/fix/show-json-errors

fix: show asset that failed when not being able to parse jsons

src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp

@@ -23,21 +23,21 @@ namespace
 
         bool Load(LeaderboardDef& leaderboardDef) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "leaderboard" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
-                return false;
-            }
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "leaderboard" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
+                    return false;
+                }
+
                 const auto jLeaderboard = jRoot.get<JsonLeaderboardDef>();
                 return CreateLeaderboardFromJson(jLeaderboard, leaderboardDef);
             }

src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp

@@ -23,21 +23,21 @@ namespace
 
         bool Load(LeaderboardDef& leaderboardDef) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "leaderboard" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
-                return false;
-            }
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "leaderboard" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
+                    return false;
+                }
+
                 const auto jLeaderboard = jRoot.get<JsonLeaderboardDef>();
                 return CreateLeaderboardFromJson(jLeaderboard, leaderboardDef);
             }

src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp

@@ -26,21 +26,21 @@ namespace
 
         bool Load(WeaponAttachment& attachment) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "attachment" || version != 1u)
-            {
-                std::cerr << "Tried to load attachment \"" << attachment.szInternalName << "\" but did not find expected type attachment of version 1\n";
-                return false;
-            }
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "attachment" || version != 1u)
+                {
+                    std::cerr << "Tried to load attachment \"" << attachment.szInternalName << "\" but did not find expected type attachment of version 1\n";
+                    return false;
+                }
+
                 const auto jAttachment = jRoot.get<JsonWeaponAttachment>();
                 return CreateWeaponAttachmentFromJson(jAttachment, attachment);
             }

src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp

@@ -23,21 +23,21 @@ namespace
 
         bool Load(LeaderboardDef& leaderboardDef) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "leaderboard" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
-                return false;
-            }
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "leaderboard" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name);
+                    return false;
+                }
+
                 const auto jLeaderboard = jRoot.get<JsonLeaderboardDef>();
                 return CreateLeaderboardFromJson(jLeaderboard, leaderboardDef);
             }

src/ObjLoading/Game/T6/Weapon/JsonWeaponCamoLoaderT6.cpp

@@ -26,21 +26,21 @@ namespace
 
         bool Load(WeaponCamo& weaponCamo) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "weaponCamo" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load weapon camo \"{}\" but did not find expected type weaponCamo of version {}\n", weaponCamo.name, 1u);
-                return false;
-            }
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "weaponCamo" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load weapon camo \"{}\" but did not find expected type weaponCamo of version {}\n", weaponCamo.name, 1u);
+                    return false;
+                }
+
                 const auto jWeaponCamo = jRoot.get<JsonWeaponCamo>();
                 return CreateWeaponCamoFromJson(jWeaponCamo, weaponCamo);
             }

src/ObjLoading/Material/JsonMaterialLoader.cpp.template

@@ -61,31 +61,31 @@ namespace
 
         bool Load(Material& material) const
         {
-            const auto jRoot = json::parse(m_stream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "material" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load material \"{}\" but did not find expected type material of version 1\n", material.info.name);
-                return false;
-            }
-            
-#ifndef FEATURE_T6 // T6 did not have this check in version 1, so to stay backwards compatible, let it stay that way
-            std::string game;
-            jRoot.at("_game").get_to(game);
-            if (game != GAME_LOWER)
-            {
-                std::cerr << std::format("Tried to load material \"{}\" but \"_game\" did not find expected type value {}\n", material.info.name, GAME_LOWER);
-                return false;
-            }
-#endif
-
             try
             {
+                const auto jRoot = json::parse(m_stream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "material" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load material \"{}\" but did not find expected type material of version 1\n", material.info.name);
+                    return false;
+                }
+            
+#ifndef FEATURE_T6 // T6 did not have this check in version 1, so to stay backwards compatible, let it stay that way
+                std::string game;
+                jRoot.at("_game").get_to(game);
+                if (game != GAME_LOWER)
+                {
+                    std::cerr << std::format("Tried to load material \"{}\" but \"_game\" did not find expected type value {}\n", material.info.name, GAME_LOWER);
+                    return false;
+                }
+#endif
+
                 const auto jMaterial = jRoot.get<JsonMaterial>();
                 return CreateMaterialFromJson(jMaterial, material);
             }

src/ObjLoading/XModel/LoaderXModel.cpp.template

@@ -81,21 +81,21 @@ namespace
     private:
         bool LoadFromFile(std::istream& jsonStream, XModel& xmodel, AssetCreationContext& context, AssetRegistration<AssetXModel>& registration)
         {
-            const auto jRoot = nlohmann::json::parse(jsonStream);
-            std::string type;
-            unsigned version;
-
-            jRoot.at("_type").get_to(type);
-            jRoot.at("_version").get_to(version);
-
-            if (type != "xmodel" || version != 1u)
-            {
-                std::cerr << std::format("Tried to load xmodel \"{}\" but did not find expected type material of version 1\n", xmodel.name);
-                return false;
-            }
-
             try
             {
+                const auto jRoot = nlohmann::json::parse(jsonStream);
+                std::string type;
+                unsigned version;
+
+                jRoot.at("_type").get_to(type);
+                jRoot.at("_version").get_to(version);
+
+                if (type != "xmodel" || version != 1u)
+                {
+                    std::cerr << std::format("Tried to load xmodel \"{}\" but did not find expected type material of version 1\n", xmodel.name);
+                    return false;
+                }
+
                 const auto jXModel = jRoot.get<JsonXModel>();
                 return CreateXModelFromJson(jXModel, xmodel, context, registration);
             }