Fix bug when a file can't be opened, fix references issue with player data

Author: francis-page

Analyzer/AnalyzerTool.cs

@@ -42,11 +42,11 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
                 {
                     // It wasn't an AssetBundle, try to open the file as a SerializedFile.
 
-                    var serializedFileName = Path.GetRelativePath(path, file);
+                    var relativePath = Path.GetRelativePath(path, file);
 
                     Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");
 
-                    writer.WriteSerializedFile(serializedFileName, path);
+                    writer.WriteSerializedFile(relativePath, file, Path.GetDirectoryName(file));
                 }
 
                 if (archive != null)
@@ -65,7 +65,15 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
                         {
                             if (node.Flags.HasFlag(ArchiveNodeFlags.SerializedFile))
                             {
-                                writer.WriteSerializedFile(node.Path, "archive:" + Path.DirectorySeparatorChar);
+                                try
+                                {
+                                    writer.WriteSerializedFile(node.Path, "archive:/" + node.Path, Path.GetDirectoryName(file));
+                                }
+                                catch (Exception e)
+                                {
+                                    Console.Error.WriteLine();
+                                    Console.Error.WriteLine($"Error processing {node.Path} in archive {file}");
+                                }
                             }
                         }
                     }

Analyzer/IWriter.cs

@@ -10,6 +10,6 @@ public interface IWriter : IDisposable
     void Begin();
     void BeginAssetBundle(string name, long size);
     void EndAssetBundle();
-    void WriteSerializedFile(string filename, string fullPath);
+    void WriteSerializedFile(string relativePath, string fullPath, string containingFolder);
     void End();
 }

Analyzer/PPtrAndCrcProcessor.cs

@@ -39,7 +39,7 @@ public void Dispose()
     {
         foreach (var r in m_resourceReaders.Values)
         {
-            r.Dispose();
+            r?.Dispose();
         }
 
         m_resourceReaders.Clear();
@@ -55,7 +55,24 @@ private UnityFileReader GetResourceReader(string filename)
 
         if (!m_resourceReaders.TryGetValue(filename, out var reader))
         {
-            reader = new UnityFileReader(Path.Join(m_Folder, filename), 4 * 1024 * 1024);
+            try
+            {
+                reader = new UnityFileReader("archive:/" + filename, 4 * 1024 * 1024);
+            }
+            catch (Exception)
+            {
+                try
+                {
+                    reader = new UnityFileReader(Path.Join(m_Folder, filename), 4 * 1024 * 1024);
+                }
+                catch (Exception e)
+                {
+                    Console.Error.WriteLine();
+                    Console.Error.WriteLine($"Error opening resource file {filename}");
+                    reader = null;
+                }
+            }
+
             m_resourceReaders[filename] = reader;
         }
 
@@ -121,7 +138,10 @@ private void ProcessNode(TypeTreeNode node)
             {
                 var resourceFile = GetResourceReader(filename);
 
-                m_Crc32 = resourceFile.ComputeCRC(offset, size, m_Crc32);
+                if (resourceFile != null)
+                {
+                    m_Crc32 = resourceFile.ComputeCRC(offset, size, m_Crc32);
+                }
             }
         }
         else if (node.Type == "StreamedResource")
@@ -144,7 +164,10 @@ private void ProcessNode(TypeTreeNode node)
             {
                 var resourceFile = GetResourceReader(filename);
 
-                m_Crc32 = resourceFile.ComputeCRC(offset, size, m_Crc32);
+                if (resourceFile != null)
+                {
+                    m_Crc32 = resourceFile.ComputeCRC(offset, size, m_Crc32);
+                }
             }
         }
         else if (node.CSharpType == typeof(string))

Analyzer/SQLite/SQLiteWriter.cs

@@ -163,16 +163,15 @@ public void EndAssetBundle()
         m_CurrentAssetBundleId = -1;
     }
 
-    public void WriteSerializedFile(string filename, string folder)
+    public void WriteSerializedFile(string relativePath, string fullPath, string containingFolder)
     {
-        var fullPath = Path.Join(folder, filename);
         using var sf = UnityFileSystem.OpenSerializedFile(fullPath);
         using var reader = new UnityFileReader(fullPath, 64 * 1024 * 1024);
-        using var pptrReader = new PPtrAndCrcProcessor(sf, reader, Path.GetDirectoryName(fullPath), AddReference);
-        int serializedFileId = m_SerializedFileIdProvider.GetId(filename.ToLower());
+        using var pptrReader = new PPtrAndCrcProcessor(sf, reader, containingFolder, AddReference);
+        int serializedFileId = m_SerializedFileIdProvider.GetId(Path.GetFileName(fullPath).ToLower());
         int sceneId = -1;
 
-        var match = m_RegexSceneFile.Match(filename);
+        var match = m_RegexSceneFile.Match(relativePath);
 
         if (match.Success)
         {
@@ -185,7 +184,7 @@ public void WriteSerializedFile(string filename, string folder)
 
             // There are 2 SerializedFiles per Scene, one ends with .sharedAssets. This is a
             // dirty trick to avoid inserting the scene object a second time.
-            if (filename.EndsWith(".sharedAssets"))
+            if (relativePath.EndsWith(".sharedAssets"))
             {
                 m_AddObjectCommand.Parameters["@id"].Value = sceneId;
                 m_AddObjectCommand.Parameters["@object_id"].Value = 0;
@@ -218,7 +217,7 @@ public void WriteSerializedFile(string filename, string folder)
         {
             m_AddSerializedFileCommand.Parameters["@id"].Value = serializedFileId;
             m_AddSerializedFileCommand.Parameters["@asset_bundle"].Value = m_CurrentAssetBundleId == -1 ? null : m_CurrentAssetBundleId;
-            m_AddSerializedFileCommand.Parameters["@name"].Value = filename;
+            m_AddSerializedFileCommand.Parameters["@name"].Value = relativePath;
             m_AddSerializedFileCommand.ExecuteNonQuery();
 
             int localId = 0;

TextDumper/TextDumperTool.cs

@@ -38,7 +38,7 @@ public int Dump(string path, string outputPath, bool skipLargeArrays)
             catch (NotSupportedException)
             {
                 // Try as SerializedFile
-                using (m_Writer = new StreamWriter(Path.GetFileName(path) + ".txt", false))
+                using (m_Writer = new StreamWriter(Path.Combine(outputPath, Path.GetFileName(path) + ".txt"), false))
                 {
                     OutputSerializedFile(path);
                 }