chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [GUI] fix bug with AssetBrowser (fixes #42, #47).

Browse Source
This commit is contained in:
Razmoth
2023-12-28 18:54:36 +04:00
parent cc08abddc7
commit c51c2b81d8
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
AssetStudio.GUI/AssetBrowser.cs
View File

@@ -13,18 +13,18 @@ namespace AssetStudio.GUI
partial class AssetBrowser : Form partial class AssetBrowser : Form
{ {
private readonly MainForm _parent; private readonly MainForm _parent;
private readonly List<AssetEntry> _assetEntries;
private readonly List<string> _columnNames;
private SortOrder _sortOrder; private SortOrder _sortOrder;
private DataGridViewColumn _sortedColumn; private DataGridViewColumn _sortedColumn;
private List<AssetEntry> _assetEntries;
private List<string> _columnNames;
public AssetBrowser(MainForm form) public AssetBrowser(MainForm form)
{ {
InitializeComponent(); InitializeComponent();
_parent = form; _parent = form;
_assetEntries = new List<AssetEntry>();
_columnNames = new List<string>(); _columnNames = new List<string>();
_assetEntries = new List<AssetEntry>();
} }
private async void loadAssetMap_Click(object sender, EventArgs e) private async void loadAssetMap_Click(object sender, EventArgs e)
@@ -62,7 +62,7 @@ namespace AssetStudio.GUI
} }
private void loadSelected_Click(object sender, EventArgs e) private void loadSelected_Click(object sender, EventArgs e)
{ {
var files = assetDataGridView.SelectedRows.Cast<DataGridViewRow>().Select(x => _assetEntries[x.Index]).Select(x => x.Source).ToHashSet(); var files = assetDataGridView.SelectedRows.Cast<DataGridViewRow>().Select(x => _assetEntries[x.Index]?.Source).ToHashSet();
var missingFiles = files.Where(x => !File.Exists(x)); var missingFiles = files.Where(x => !File.Exists(x));
foreach (var file in missingFiles) foreach (var file in missingFiles)
{ {
@@ -92,14 +92,24 @@ namespace AssetStudio.GUI
Logger.Error($"Invalid argument at index {i + 1}"); Logger.Error($"Invalid argument at index {i + 1}");
continue; continue;
} }
var (name, regex) = (arguments[0], arguments[1]); var (name, regex) = (arguments[0], arguments[1]);
if (!_columnNames.Contains(name, StringComparer.OrdinalIgnoreCase)) if (!_columnNames.Contains(name, StringComparer.OrdinalIgnoreCase))
{ {
Logger.Error($"Unknonw argument {name}"); Logger.Error($"Unknonw argument {name}");
continue; continue;
} }
try
{
filters[name] = new Regex(regex, RegexOptions.IgnoreCase); filters[name] = new Regex(regex, RegexOptions.IgnoreCase);
} }
catch (Exception)
{
Logger.Error($"Invalid regex {regex} at argument {name}");
continue;
}
}
_assetEntries.Clear(); _assetEntries.Clear();
_assetEntries.AddRange(ResourceMap.GetEntries().FindAll(x => x.Matches(filters))); _assetEntries.AddRange(ResourceMap.GetEntries().FindAll(x => x.Matches(filters)));
@@ -111,7 +121,7 @@ namespace AssetStudio.GUI
} }
private void AssetDataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) private void AssetDataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
{ {
if (e.RowIndex <= _assetEntries.Count) if (_assetEntries.Count != 0 && e.RowIndex <= _assetEntries.Count)
{ {
var assetEntry = _assetEntries[e.RowIndex]; var assetEntry = _assetEntries[e.RowIndex];
e.Value = e.ColumnIndex switch e.Value = e.ColumnIndex switch
@@ -159,14 +169,15 @@ namespace AssetStudio.GUI
1 => x => x.Container, 1 => x => x.Container,
2 => x => x.Source, 2 => x => x.Source,
3 => x => x.PathID, 3 => x => x.PathID,
4 => x => x.Type, 4 => x => x.Type.ToString(),
_ => x => "" _ => x => ""
}; };
_assetEntries.Clear(); var sorted = direction == ListSortDirection.Ascending ? _assetEntries.OrderBy(keySelector).ToList() : _assetEntries.OrderByDescending(keySelector).ToList();
_assetEntries.AddRange(direction == ListSortDirection.Ascending ? _assetEntries.OrderBy(keySelector).ToList() : _assetEntries.OrderByDescending(keySelector).ToList());
_assetEntries.Clear();
_assetEntries.AddRange(sorted);
assetDataGridView.CurrentCell = assetDataGridView[0, 0];
assetDataGridView.Rows.Clear(); assetDataGridView.Rows.Clear();
assetDataGridView.RowCount = _assetEntries.Count; assetDataGridView.RowCount = _assetEntries.Count;
assetDataGridView.Refresh(); assetDataGridView.Refresh();