rename writer and load schemas on demand

Author: timt-unity3d

Analyzer/SQLite/Parsers/AddressablesBuildLayoutParser.cs

@@ -3,8 +3,8 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.IO;
-using UnityDataTools.Analyzer.SQLite.Parsers.Models;
 using UnityDataTools.Analyzer.SQLite.Handlers;
+using UnityDataTools.Analyzer.SQLite.Parsers.Models;
 using UnityDataTools.Analyzer.SQLite.Writers;
 
 namespace UnityDataTools.Analyzer.SQLite.Parsers
@@ -23,7 +23,6 @@ public void Dispose()
         public void Init(SqliteConnection db)
         {
             m_Writer = new AddressablesBuildLayoutSQLWriter(db);
-            m_Writer.Init();
             m_Writer.Verbose = Verbose;
         }
 
@@ -74,6 +73,8 @@ public bool CanParse(string filename)
 
         public void Parse(string filename)
         {
+            // only init our writer if we are actually parsing a file
+            m_Writer.Init();
             using (StreamReader reader = File.OpenText(filename))
             {
                 JsonSerializer serializer = new JsonSerializer();

Analyzer/SQLite/Parsers/SerializedFileParser.cs

@@ -1,19 +1,16 @@
-using UnityDataTools.Analyzer.SQLite.Writers;
-using Microsoft.Data.Sqlite;
+using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityDataTools.Analyzer.SQLite.Handlers;
+using UnityDataTools.Analyzer.SQLite.Writers;
 using UnityDataTools.FileSystem;
 
 namespace UnityDataTools.Analyzer.SQLite.Parsers
 {
     public class SerializedFileParser : ISQLiteFileParser
     {
-        private AssetBundleSQLiteWriter m_Writer;
+        private SerializedFileSQLiteWriter m_Writer;
 
         public bool Verbose { get; set; }
         public bool SkipReferences { get; set; }
@@ -31,12 +28,13 @@ public void Dispose()
 
         public void Init(SqliteConnection db)
         {
-            m_Writer = new AssetBundleSQLiteWriter(db, SkipReferences);
-            m_Writer.Init();
+            m_Writer = new SerializedFileSQLiteWriter(db, SkipReferences);
         }
 
         public void Parse(string filename)
         {
+            // only init our writer if we are actually parsing a file
+            m_Writer.Init();
             ProcessFile(filename, Path.GetDirectoryName(filename));
         }
 

Analyzer/SQLite/Writers/AddressablesBuildLayoutSQLWriter.cs

@@ -2,8 +2,8 @@
 using Newtonsoft.Json;
 using System;
 using System.IO;
-using UnityDataTools.Analyzer.SQLite.Parsers.Models;
 using UnityDataTools.Analyzer.SQLite.Commands.AddressablesBuildReport;
+using UnityDataTools.Analyzer.SQLite.Parsers.Models;
 
 namespace UnityDataTools.Analyzer.SQLite.Writers
 {
@@ -45,16 +45,22 @@ internal class AddressablesBuildLayoutSQLWriter : IDisposable
 
         private SqliteCommand m_LastId = new SqliteCommand();
 
+        private bool m_Initialized;
         private SqliteConnection m_Database;
         public bool Verbose { get; set; }
 
         public AddressablesBuildLayoutSQLWriter(SqliteConnection database)
         {
+            m_Initialized = false;
             m_Database = database;
         }
 
         public void Init()
         {
+            if (m_Initialized)
+                return;
+
+            m_Initialized = true;
             // build addressables file commands
             m_AddressablesBuild.CreateCommand(m_Database);
             // Build Bundle Tables

…QLite/Writers/AssetBundleSQLiteWriter.cs …te/Writers/SerializedFileSQLiteWriter.csAnalyzer/SQLite/Writers/AssetBundleSQLiteWriter.cs renamed to Analyzer/SQLite/Writers/SerializedFileSQLiteWriter.cs Analyzer/SQLite/Writers/AssetBundleSQLiteWriter.cs renamed to Analyzer/SQLite/Writers/SerializedFileSQLiteWriter.cs

@@ -1,18 +1,17 @@
+using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
 using System.IO;
 using System.Text.RegularExpressions;
+using UnityDataTools.Analyzer.SQLite.Commands.SerializedFile;
 using UnityDataTools.Analyzer.SQLite.Handlers;
+using UnityDataTools.Analyzer.Util;
 using UnityDataTools.FileSystem;
 using UnityDataTools.FileSystem.TypeTreeReaders;
-using UnityDataTools.Analyzer.SQLite.Commands.SerializedFile;
-using UnityDataTools.Analyzer;
-using UnityDataTools.Analyzer.Util;
 
 namespace UnityDataTools.Analyzer.SQLite.Writers;
 
-public class AssetBundleSQLiteWriter : IDisposable
+public class SerializedFileSQLiteWriter : IDisposable
 {
     private HashSet<int> m_TypeSet = new();
 
@@ -27,7 +26,7 @@ public class AssetBundleSQLiteWriter : IDisposable
     private Regex m_RegexSceneFile = new(@"BuildPlayer-([^\.]+)(?:\.sharedAssets)?");
 
     // Used to map PPtr fileId to its corresponding serialized file id in the database.
-    Dictionary<int, int> m_LocalToDbFileId = new ();
+    Dictionary<int, int> m_LocalToDbFileId = new();
 
     private Dictionary<string, ISQLiteHandler> m_Handlers = new()
     {
@@ -47,17 +46,23 @@ public class AssetBundleSQLiteWriter : IDisposable
     private AddType m_AddTypeCommand = new AddType();
     private AddAssetDependency m_InsertDepCommand = new AddAssetDependency();
 
+    private bool m_Initialized;
     private SqliteConnection m_Database;
     private SqliteCommand m_LastId = new SqliteCommand();
     private SqliteTransaction m_CurrentTransaction = null;
-    public AssetBundleSQLiteWriter(SqliteConnection database, bool skipReferences)
+    public SerializedFileSQLiteWriter(SqliteConnection database, bool skipReferences)
     {
+        m_Initialized = false;
         m_Database = database;
         m_SkipReferences = skipReferences;
     }
 
     public void Init()
-    {        
+    {
+        if (m_Initialized)
+            return;
+
+        m_Initialized = true;
         foreach (var handler in m_Handlers.Values)
         {
             handler.Init(m_Database);