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

- [GUI] Added back .txt batch loading

Browse Source 
- [GUI] Regex Validation
This commit is contained in:
Razmoth
2023-10-24 20:48:56 +04:00
parent 92c52ac108
commit e2ac381202
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
AssetStudio.GUI/MainForm.cs
View File

@@ -20,6 +20,7 @@ using OpenTK.Graphics;
using OpenTK.Mathematics; using OpenTK.Mathematics;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using OpenTK.Audio.OpenAL;
namespace AssetStudio.GUI namespace AssetStudio.GUI
{ {
@@ -210,10 +211,15 @@ namespace AssetStudio.GUI
openFileDialog1.InitialDirectory = openDirectoryBackup; openFileDialog1.InitialDirectory = openDirectoryBackup;
if (openFileDialog1.ShowDialog(this) == DialogResult.OK) if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{ {
var paths = openFileDialog1.FileNames;
ResetForm(); ResetForm();
openDirectoryBackup = Path.GetDirectoryName(openFileDialog1.FileNames[0]); openDirectoryBackup = Path.GetDirectoryName(paths[0]);
assetsManager.SpecifyUnityVersion = specifyUnityVersion.Text; assetsManager.SpecifyUnityVersion = specifyUnityVersion.Text;
assetsManager.Game = Studio.Game; assetsManager.Game = Studio.Game;
if (paths.Length == 1 && File.Exists(paths[0]) && Path.GetExtension(paths[0]) == ".txt")
{
paths = File.ReadAllLines(paths[0]);
}
await Task.Run(() => assetsManager.LoadFiles(openFileDialog1.FileNames)); await Task.Run(() => assetsManager.LoadFiles(openFileDialog1.FileNames));
BuildAssetStructures(); BuildAssetStructures();
} }
@@ -568,6 +574,15 @@ namespace AssetStudio.GUI
{ {
if (treeSrcResults.Count == 0) if (treeSrcResults.Count == 0)
{ {
try
{
Regex.Match("", treeSearch.Text, RegexOptions.IgnoreCase);
}
catch (Exception ex)
{
Logger.Error("Invalid Regex.\n" + ex.Message);
return;
}
var regex = new Regex(treeSearch.Text, RegexOptions.IgnoreCase); var regex = new Regex(treeSearch.Text, RegexOptions.IgnoreCase);
foreach (TreeNode node in sceneTreeView.Nodes) foreach (TreeNode node in sceneTreeView.Nodes)
{ {
@@ -1814,6 +1829,15 @@ namespace AssetStudio.GUI
} }
if (!string.IsNullOrEmpty(listSearch.Text)) if (!string.IsNullOrEmpty(listSearch.Text))
{ {
try
{
Regex.Match("", listSearch.Text, RegexOptions.IgnoreCase);
}
catch (Exception ex)
{
Logger.Error("Invalid Regex.\n" + ex.Message);
listSearch.Text = "";
}
var regex = new Regex(listSearch.Text, RegexOptions.IgnoreCase); var regex = new Regex(listSearch.Text, RegexOptions.IgnoreCase);
visibleAssets = visibleAssets.FindAll( visibleAssets = visibleAssets.FindAll(
x => regex.IsMatch(x.Text) || x => regex.IsMatch(x.Text) ||