Perf/memory pack studio cs

AnimeStudio.CLI/AnimeStudio.CLI.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
+	  <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
+	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.9"/>
   </ItemGroup>
 
   <ItemGroup>

AnimeStudio.GUI/AnimeStudio.GUI.csproj

@@ -127,7 +127,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageReference Include="OpenTK" Version="4.9.4" />
 		<PackageReference Include="OpenTK.GLControl" Version="4.0.2" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
+        <PackageReference Include="System.Drawing.Common" Version="10.0.9"/>
 	</ItemGroup>
 
 	<ItemGroup>

AnimeStudio.GUI/AssetBrowser.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
@@ -16,17 +15,17 @@ namespace AnimeStudio.GUI
 {
     partial class AssetBrowser : Form
     {
-        private readonly MainForm _parent;
-        private readonly List<AssetEntry> _assetEntries;
-        private readonly List<AssetEntry> _backupAssetEntries;
-        private readonly List<AssetEntry> _firstAssetEntries;
-        private readonly List<AssetEntry> _secondAssetEntries;
+        private readonly List<AssetEntry>          _assetEntries;
+        private readonly List<AssetEntry>          _backupAssetEntries;
         private readonly Dictionary<string, Regex> _filters;
+        private readonly List<AssetEntry>          _firstAssetEntries;
+        private readonly MainForm                  _parent;
+        private readonly List<AssetEntry>          _secondAssetEntries;
+        private          DataGridViewColumn        _sortedColumn;
 
-        private SortOrder _sortOrder;
-        private DataGridViewColumn _sortedColumn;
-        private List<String> types = new();
+        private SortOrder    _sortOrder;
         private List<String> selectedTypes = new();
+        private List<string> types         = new List<string>();
 
         public AssetBrowser(MainForm form)
         {
@@ -44,7 +43,11 @@ private async void loadAssetMap_Click(object sender, EventArgs e)
         {
             loadAssetMap.Enabled = false;
 
-            var openFileDialog = new OpenFileDialog() { Multiselect = false, Filter = "MessagePack AssetMap File|*.map|JSON AssetMap File|*.json" };
+            var openFileDialog = new OpenFileDialog
+            {
+                    Multiselect = false, Filter = "MessagePack AssetMap File|*" +
+                                                  ".map|JSON AssetMap File|*.json|MemoryPack AssetMap File|*.memory"
+            };
             if (openFileDialog.ShowDialog(this) == DialogResult.OK)
             {
                 try
@@ -61,6 +64,8 @@ private async void loadAssetMap_Click(object sender, EventArgs e)
                     _sortedColumn = null;
 
                     _firstAssetEntries.Clear();
+                    _secondAssetEntries.Clear();
+                    _backupAssetEntries.Clear();
                     _firstAssetEntries.AddRange(ResourceMap.GetEntries());
 
                     updateDisplay();
@@ -172,12 +177,14 @@ private void bringMainToFront()
             _parent.TopMost = false;
             _parent.Focus();
         }
+
         private void clear_Click(object sender, EventArgs e)
         {
             Clear();
             updateButtons();
             Logger.Info($"Cleared !!");
         }
+
         private void loadSelected_Click(object sender, EventArgs e)
         {
             var files = assetDataGridView.SelectedRows.Cast<DataGridViewRow>()
@@ -210,6 +217,7 @@ private void loadSelected_Click(object sender, EventArgs e)
                 _parent.Invoke(() => _parent.LoadPaths(files, filePaths.ToArray()));
             }
         }
+
         private async void exportSelected_Click(object sender, EventArgs e)
         {
             var saveFolderDialog = new OpenFolderDialog();
@@ -245,6 +253,7 @@ await Task.Run(async () =>
                 StatusStripUpdate = statusStripUpdate;
             }
         }
+
         private void BuildAssetData(List<AssetItem> exportableAssets, AssetEntry[] entries)
         {
             var objectAssetItemDic = new Dictionary<Object, AssetItem>();
@@ -284,6 +293,7 @@ private void BuildAssetData(List<AssetItem> exportableAssets, AssetEntry[] entri
             exportableAssets.Clear();
             exportableAssets.AddRange(matches);
         }
+
         private void ProcessAssetData(Object asset, List<AssetItem> exportableAssets, Dictionary<Object, AssetItem> objectAssetItemDic, List<(PPtr<Object>, string)> mihoyoBinDataNames, List<(PPtr<Object>, string)> containers)
         {
             var assetItem = new AssetItem(asset);
@@ -388,6 +398,7 @@ private void FilterAssetDataGrid()
             assetDataGridView.RowCount = _assetEntries.Count;
             assetDataGridView.Refresh();
         }
+
         private void TryAddFilter(string name, string value)
         {
             Regex regex;
@@ -410,41 +421,47 @@ private void TryAddFilter(string name, string value)
                 _filters[name] = regex;
             }
         }
+
         private void NameTextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (sender is TextBox textBox && e.KeyChar == (char)Keys.Enter)
             {
                 FilterAssetDataGrid();
             }
         }
+
         private void ContainerTextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (sender is TextBox textBox && e.KeyChar == (char)Keys.Enter)
             {
                 FilterAssetDataGrid();
             }
         }
+
         private void SourceTextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (sender is TextBox textBox && e.KeyChar == (char)Keys.Enter)
             {
                 FilterAssetDataGrid();
             }
         }
+
         private void PathTextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (sender is TextBox textBox && e.KeyChar == (char)Keys.Enter)
             {
                 FilterAssetDataGrid();
             }
         }
+
         private void HashTextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (sender is TextBox textBox && e.KeyChar == (char)Keys.Enter)
             {
                 FilterAssetDataGrid();
             }
         }
+
         private void AssetDataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
         {
             if (_assetEntries.Count != 0 && e.RowIndex <= _assetEntries.Count)
@@ -462,6 +479,7 @@ private void AssetDataGridView_CellValueNeeded(object sender, DataGridViewCellVa
                 };
             }
         }
+
         private void AssetListView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
         {
             if (e.ColumnIndex <= assetDataGridView.Columns.Count)
@@ -511,15 +529,22 @@ private void AssetListView_ColumnHeaderMouseClick(object sender, DataGridViewCel
                 assetDataGridView.Refresh();
             }
         }
+
         private void AssetBrowser_FormClosing(object sender, FormClosingEventArgs e)
         {
             Clear();
             base.OnClosing(e);
         }
+
         public void Clear()
         {
             ResourceMap.Clear();
             _assetEntries.Clear();
+            _backupAssetEntries.Clear();
+            _firstAssetEntries.Clear();
+            _secondAssetEntries.Clear();
+            selectedTypes.Clear();
+            types.Clear();
             assetDataGridView.Rows.Clear();
         }
 
@@ -699,7 +724,5 @@ private void filterSelectTypesBtn_Click(object sender, EventArgs e)
 
             popup.ShowDialog(this);
         }
-
-
     }
 }

AnimeStudio.GUI/Components/AssetItem.cs

@@ -11,10 +11,13 @@ public class AssetItem : ListViewItem
         public long m_PathID;
         public long FullSize;
         public ClassIDType Type;
-        public string Hash;
         public string InfoText;
         public string UniqueID;
         public GameObjectTreeNode TreeNode;
+        private string hash;
+        private bool subItemsInitialized;
+
+        public string Hash => hash ??= Asset.GetHash();
 
         public AssetItem(Object asset)
         {
@@ -25,11 +28,15 @@ public AssetItem(Object asset)
             TypeString = Type.ToString();
             m_PathID = asset.m_PathID;
             FullSize = asset.byteSize;
-            Hash = asset.GetHash();
         }
 
         public void SetSubItems()
         {
+            if (subItemsInitialized)
+            {
+                return;
+            }
+
             SubItems.AddRange(new[]
             {
                 Container, //Container
@@ -38,6 +45,28 @@ public void SetSubItems()
                 FullSize.ToString(), //Size
                 Hash, //Hash
             });
+            subItemsInitialized = true;
+        }
+
+        public string GetColumnText(int column)
+        {
+            return column switch
+            {
+                0 => Text,
+                1 => Container,
+                2 => TypeString,
+                3 => m_PathID.ToString(),
+                4 => FullSize.ToString(),
+                5 => Hash,
+                _ => string.Empty,
+            };
+        }
+
+        public bool MatchesListSearch(System.Text.RegularExpressions.Regex regex)
+        {
+            return regex.IsMatch(Text)
+                || regex.IsMatch(Container)
+                || regex.IsMatch(m_PathID.ToString());
         }
     }
 }