Give real file name when an error occurs reading a p3d file

GameRealisticMap.Arma3.Test/GameEngine/GameFileSystemMock.cs

@@ -107,5 +107,10 @@ internal void AssertFiles<TestClass>(string testcase)
                 return new StreamReader(stream).ReadToEnd();
             }
         }
+
+        public string? GetLocationInfoForError(string path)
+        {
+            return path;
+        }
     }
 }

GameRealisticMap.Arma3.Test/TerrainBuilder/ModelInfoLibraryTest.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GameRealisticMap.Arma3.TerrainBuilder;
+using GameRealisticMap.Arma3.Test.GameEngine;
+
+namespace GameRealisticMap.Arma3.Test.TerrainBuilder
+{
+    public class ModelInfoLibraryTest
+    {
+        [Fact]
+        public void ReadModelInfoOnly_CorruptedFile()
+        {
+            var fs = new GameFileSystemMock();
+            fs.BinaryFiles.Add("bad.p3d", new MemoryStream());
+            var lib = new ModelInfoLibrary(fs);
+            var ex = Assert.Throws<ApplicationException>(() => lib.ReadModelInfoOnly("bad.p3d"));
+            Assert.Equal("Unable to read file 'bad.p3d': Unable to read beyond the end of the stream.", ex.Message);
+        }
+    }
+}

GameRealisticMap.Arma3/IO/IGameFileSystem.cs

@@ -3,8 +3,11 @@
     public interface IGameFileSystem
     {
         IEnumerable<string> FindAll(string pattern);
+
         Stream? OpenFileIfExists(string path);
 
-        DateTime? GetLastWriteTimeUtc(string path);
+        DateTime? GetLastWriteTimeUtc(string path); 
+
+        string? GetLocationInfoForError(string path);
     }
 }

GameRealisticMap.Arma3/IO/PboFileSystem.cs

@@ -212,5 +212,15 @@ private void FindAll(Regex regex, List<string> result, string pboPath)
             }
             return null;
         }
+
+        public string? GetLocationInfoForError(string path)
+        {
+            var pbo = GetPboFile(path);
+            if (pbo != null)
+            {
+                return pbo + "#" + path;
+            }
+            return null;
+        }
     }
 }

GameRealisticMap.Arma3/IO/ProjectDrive.cs

@@ -165,5 +165,15 @@ public IEnumerable<string> FindAll(string pattern)
             }
             return secondarySource?.GetLastWriteTimeUtc(path);
         }
+
+        public string? GetLocationInfoForError(string path)
+        {
+            var fullPath = GetFullPath(path);
+            if (File.Exists(fullPath))
+            {
+                return fullPath;
+            }
+            return secondarySource?.GetLocationInfoForError(path);
+        }
     }
 }

GameRealisticMap.Arma3/TerrainBuilder/ModelInfoLibrary.cs

@@ -85,13 +85,26 @@ private string UniqueName(string initialName)
             return name;
         }
 
+        private T Read<T>(Stream stream, string path) where T : IReadObject, new()
+        {
+            try
+            {
+                return StreamHelper.Read<T>(stream);
+            }
+            catch (Exception ex)
+            {
+                var physicalPath = fileSystem.GetLocationInfoForError(path) ?? path;
+                throw new ApplicationException($"Unable to read file '{physicalPath}': {ex.Message}", ex);
+            }
+        }
+
         public BIS.P3D.ODOL.ModelInfo? ReadModelInfoOnly(string path)
         {
             using (var stream = fileSystem.OpenFileIfExists(path))
             {
                 if (stream != null)
                 {
-                    var result = StreamHelper.Read<P3DInfosOnly>(stream).ModelInfo as BIS.P3D.ODOL.ModelInfo;
+                    var result = Read<P3DInfosOnly>(stream, path).ModelInfo as BIS.P3D.ODOL.ModelInfo;
                     if (result != null)
                     {
                         return result;
@@ -101,7 +114,7 @@ private string UniqueName(string initialName)
                     {
                         if (streamTemp != null)
                         {
-                            return StreamHelper.Read<P3DInfosOnly>(streamTemp).ModelInfo as BIS.P3D.ODOL.ModelInfo;
+                            return Read<P3DInfosOnly>(streamTemp, "temp\\" + path).ModelInfo as BIS.P3D.ODOL.ModelInfo;
                         }
                     }
                     // TODO: Binarize on the fly
@@ -118,14 +131,14 @@ private string UniqueName(string initialName)
                 {
                     if (P3D.IsODOL(stream))
                     {
-                        return StreamHelper.Read<ODOL>(stream);
+                        return Read<ODOL>(stream, path);
                     }
                     // Mikero Tools binarize into project drive temp, binarized file might be there
                     using (var streamTemp = fileSystem.OpenFileIfExists("temp\\" + path))
                     {
                         if (streamTemp != null && P3D.IsODOL(streamTemp))
                         {
-                            return StreamHelper.Read<ODOL>(streamTemp);
+                            return Read<ODOL>(streamTemp, "temp\\" + path);
                         }
                     }
                     // TODO: Binarize on the fly

GameRealisticMap.Studio/Modules/Arma3WorldEditor/Services/Arma3BackupFileSystem.cs

@@ -36,6 +36,11 @@ public IEnumerable<string> FindAll(string pattern)
             return null;
         }
 
+        public string? GetLocationInfoForError(string path)
+        {
+            return path;
+        }
+
         public Stream? OpenFileIfExists(string path)
         {
             if (files.Contains(path))