mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-07-16 19:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

[GUI] Improve asset list filtering

Browse Source 
- Added filter history
- Added more filtering modes: Include, Exclude, Regex (Name/Container)
This commit is contained in:
VaDiM
2023-05-18 23:35:14 +03:00
parent b0bf5e0cfd
commit 02e46eaa0d
4 changed files with 158 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -12,6 +12,7 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
@ -119,6 +120,7 @@ namespace AssetStudioGUI
displayInfo.Checked = Properties.Settings.Default.displayInfo;
enablePreview.Checked = Properties.Settings.Default.enablePreview;
FMODinit();
listSearchFilterMode.SelectedIndex = 0;
logger = new GUILogger(StatusStripUpdate);
Logger.Default = logger;
@ -217,7 +219,6 @@ namespace AssetStudioGUI
{
if (assetsManager.assetsFileList.Count == 0)
{
filterExcludeModeCheck(assetsManager.assetsFileList.Count);
Logger.Info("No Unity file can be loaded.");
return;
}
@ -256,8 +257,6 @@ namespace AssetStudioGUI
typeMap.Clear();
classesListView.EndUpdate();
filterExcludeModeCheck(exportableAssets.Count);
var types = exportableAssets.Select(x => x.Type).Distinct().OrderBy(x => x.ToString()).ToArray();
foreach (var type in types)
{
@ -616,7 +615,7 @@ namespace AssetStudioGUI
{
listSearch.Text = "";
listSearch.ForeColor = SystemColors.WindowText;
enableFiltering = true;
BeginInvoke(new Action(() => enableFiltering = true));
}
}
@ -627,6 +626,7 @@ namespace AssetStudioGUI
enableFiltering = false;
listSearch.Text = " Filter ";
listSearch.ForeColor = SystemColors.GrayText;
listSearch.BackColor = System.Drawing.Color.White;
}
}
@ -649,9 +649,25 @@ namespace AssetStudioGUI
private void delayTimer_Elapsed(object sender, ElapsedEventArgs e)
{
delayTimer.Stop();
ListSearchHistoryAdd();
Invoke(new Action(FilterAssetList));
}
private void ListSearchHistoryAdd()
{
BeginInvoke(new Action(() =>
{
if (listSearch.Text != "")
{
if (listSearchHistory.Items.Count == listSearchHistory.MaxDropDownItems)
{
listSearchHistory.Items.RemoveAt(listSearchHistory.MaxDropDownItems - 1);
}
listSearchHistory.Items.Insert(0, listSearch.Text);
}
}));
}
private void assetListView_ColumnClick(object sender, ColumnClickEventArgs e)
{
if (sortColumn != e.Column)
@ -1335,6 +1351,8 @@ namespace AssetStudioGUI
reverseSort = false;
enableFiltering = false;
listSearch.Text = " Filter ";
listSearch.ForeColor = SystemColors.GrayText;
listSearch.BackColor = System.Drawing.Color.White;
if (tabControl1.SelectedIndex == 1)
assetListView.Select();
@ -1634,22 +1652,11 @@ namespace AssetStudioGUI
return selectedAssets;
}
private void filterExcludeMode_CheckedChanged(object sender, EventArgs e)
{
FilterAssetList();
}
private void filterExcludeModeCheck(int itemCount)
{
filterExcludeMode.Enabled = itemCount > 0;
if (!filterExcludeMode.Enabled)
{
filterExcludeMode.Checked = false;
}
}
private void FilterAssetList()
{
if (exportableAssets.Count < 1)
return;
assetListView.BeginUpdate();
assetListView.SelectedIndices.Clear();
var show = new List<ClassIDType>();
@ -1671,19 +1678,49 @@ namespace AssetStudioGUI
}
if (listSearch.Text != " Filter ")
{
if (filterExcludeMode.Checked)
var mode = (ListSearchFilterMode)listSearchFilterMode.SelectedIndex;
switch (mode)
{
visibleAssets = visibleAssets.FindAll(
x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0);
}
else
{
visibleAssets = visibleAssets.FindAll(
x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0);
case ListSearchFilterMode.Include:
visibleAssets = visibleAssets.FindAll(
x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0);
break;
case ListSearchFilterMode.Exclude:
visibleAssets = visibleAssets.FindAll(
x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0);
break;
case ListSearchFilterMode.RegexName:
case ListSearchFilterMode.RegexContainer:
StatusStripUpdate("");
var pattern = listSearch.Text;
var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Singleline;
try
{
if (mode == ListSearchFilterMode.RegexName)
{
visibleAssets = visibleAssets.FindAll(x => Regex.IsMatch(x.Text, pattern, regexOptions));
}
else
{
visibleAssets = visibleAssets.FindAll(x => Regex.IsMatch(x.SubItems[1].Text, pattern, regexOptions));
}
listSearch.BackColor = System.Drawing.Color.PaleGreen;
}
catch (ArgumentException e)
{
listSearch.BackColor = System.Drawing.Color.FromArgb(255, 160, 160);
StatusStripUpdate($"Regex error: {e.Message}");
}
catch (RegexMatchTimeoutException)
{
listSearch.BackColor = System.Drawing.Color.FromArgb(255, 160, 160);
StatusStripUpdate($"Timeout error");
}
break;
}
}
assetListView.VirtualListSize = visibleAssets.Count;
@ -1821,6 +1858,22 @@ namespace AssetStudioGUI
aboutForm.ShowDialog(this);
}
private void listSearchFilterMode_SelectedIndexChanged(object sender, EventArgs e)
{
listSearch.BackColor = System.Drawing.Color.White;
if (listSearch.Text != " Filter ")
{
FilterAssetList();
}
}
private void listSearchHistory_TextChanged(object sender, EventArgs e)
{
listSearch.Text = listSearchHistory.Text;
listSearch.Focus();
listSearch.SelectionStart = listSearch.Text.Length;
}
#region FMOD
private void FMODinit()
{