asset parsing error handling

Author: moritz-h

libsave/src/Pak/AssetFile.cpp

@@ -68,7 +68,21 @@ std::shared_ptr<SatisfactorySave::AssetExport> SatisfactorySave::AssetFile::getE
 
     seekCookedSerialOffset(exportEntry.CookedSerialOffset);
     auto read_limit_stack_pusher = pushReadLimit(exportEntry.CookedSerialSize);
-    *this << *exp->Object;
+    try {
+        *this << *exp->Object;
+    } catch (const std::exception& ex1) {
+        // Try a second time as UObject only.
+        spdlog::error("Error parsing '{}': {} (try again as UObject only!)", class_name, ex1.what());
+        try {
+            exp->Object = std::make_shared<UObject>();
+            seekCookedSerialOffset(exportEntry.CookedSerialOffset);
+            *this << *exp->Object;
+        } catch (const std::exception& ex2) {
+            spdlog::error("Error parsing '{}' as UObject: {}", class_name, ex2.what());
+            exp->Object = nullptr;
+            seekCookedSerialOffset(exportEntry.CookedSerialOffset);
+        }
+    }
 
     // Read unknown class data as binary buffer
     const auto data_read_size = tellCookedSerialOffset() - exportEntry.CookedSerialOffset;

map/src/MapWindow/Pak/AssetWindow.cpp

@@ -168,12 +168,16 @@ void Satisfactory3DMap::AssetWindow::showExport(int idx) {
     if (asset_ == nullptr) {
         return;
     }
-    const auto exportEntry = asset_->exportMap().at(idx);
-    auto assetExport = asset_->getExportObjectByIdx(idx);
+    try {
+        const auto exportEntry = asset_->exportMap().at(idx);
+        auto assetExport = asset_->getExportObjectByIdx(idx);
 
-    exportWindows_.emplace_back(std::make_shared<AssetObjectWindow>(shared_from_this(), std::move(assetExport),
-        asset_->getNameString(exportEntry.ObjectName) + " [" + SatisfactorySave::splitPathName(assetFilename_).back() +
-            "]"));
+        exportWindows_.emplace_back(std::make_shared<AssetObjectWindow>(shared_from_this(), std::move(assetExport),
+            asset_->getNameString(exportEntry.ObjectName) + " [" +
+                SatisfactorySave::splitPathName(assetFilename_).back() + "]"));
+    } catch (const std::exception& ex) {
+        spdlog::error("Error getting asset export: {}", ex.what());
+    }
 }
 
 void Satisfactory3DMap::AssetWindow::exportExport(int idx) {