Fix path issues and duplicate support in player data

Author: francis-page

Analyzer/AnalyzerTool.cs

@@ -46,7 +46,7 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
 
                     Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");
 
-                    writer.WriteSerializedFile(serializedFileName, path.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
+                    writer.WriteSerializedFile(serializedFileName, path);
                 }
 
                 if (archive != null)

Analyzer/PPtrAndCrcProcessor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using UnityDataTools.FileSystem;
 using Force.Crc32;
@@ -54,7 +55,7 @@ private UnityFileReader GetResourceReader(string filename)
 
         if (!m_resourceReaders.TryGetValue(filename, out var reader))
         {
-            reader = new UnityFileReader(m_Folder + filename, 4 * 1024 * 1024);
+            reader = new UnityFileReader(Path.Join(m_Folder, filename), 4 * 1024 * 1024);
             m_resourceReaders[filename] = reader;
         }
 

Analyzer/Resources/Init.sql

@@ -80,7 +80,7 @@ END AS pretty_total_size,
 sum(size) AS total_size,
 size,
 pretty_size,
-REPLACE(GROUP_CONCAT(DISTINCT asset_bundle), ',', ',' || CHAR(13)) AS in_bundles
+REPLACE(GROUP_CONCAT(DISTINCT IIF(asset_bundle IS NULL, serialized_file, asset_bundle)), ',', ',' || CHAR(13)) AS in_files
 FROM object_view
 GROUP BY name, type, size, crc32
 HAVING instances > 1

Analyzer/SQLite/SQLiteWriter.cs

@@ -165,10 +165,10 @@ public void EndAssetBundle()
 
     public void WriteSerializedFile(string filename, string folder)
     {
-        var fullPath = folder + filename;
+        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, folder, AddReference);
+        using var pptrReader = new PPtrAndCrcProcessor(sf, reader, Path.GetDirectoryName(fullPath), AddReference);
         int serializedFileId = m_SerializedFileIdProvider.GetId(filename.ToLower());
         int sceneId = -1;