Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-25 02:44:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimized aa5c83c26a, a lot of code was unnecessary u.u

Browse Source
This commit is contained in:
MaikyM
2019-07-12 15:51:31 -06:00
parent aa5c83c26a
commit 2d213063f0
1 changed files with 10 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
FModel/Forms/SearchFiles.cs
View File

@@ -166,52 +166,21 @@ namespace FModel.Forms
{
for (int i = 0; i < _myInfos.Count; i++)
{
bool checkSearch = false;
string[] searchTextMultiple = textBox1.Text.Trim().Split(' ');
if (searchTextMultiple.Length > 1)
{
bool checkSearch = false;
for (int s = 0; s < searchTextMultiple.Length; ++s)
{
checkSearch = Utilities.CaseInsensitiveContains(_myInfos[i].FileName, searchTextMultiple[s]);
if (!checkSearch)
break;
}
if (checkSearch)
{
if (_myInfos[i].FileName.Contains(".uasset") || _myInfos[i].FileName.Contains(".uexp") || _myInfos[i].FileName.Contains(".ubulk"))
{
if (!_myFilteredInfosDict.ContainsKey(_myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal))))
{
_myFilteredInfosDict.Add(_myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal)), ThePak.CurrentUsedPak);
_fileName = _myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal));
_myFilteredInfos.Add(new FileInfoFilter
{
FileName = _fileName,
PakFile = ThePak.CurrentUsedPak,
});
}
}
else
{
if (!_myFilteredInfosDict.ContainsKey(_myInfos[i].FileName))
{
_myFilteredInfosDict.Add(_myInfos[i].FileName, ThePak.CurrentUsedPak);
_fileName = _myInfos[i].FileName;
_myFilteredInfos.Add(new FileInfoFilter
{
FileName = _fileName,
PakFile = ThePak.CurrentUsedPak,
});
}
}
ShowItemsVirtualFiltered(_myFilteredInfos);
}
}
else if (Utilities.CaseInsensitiveContains(_myInfos[i].FileName, textBox1.Text))
else
checkSearch = Utilities.CaseInsensitiveContains(_myInfos[i].FileName, textBox1.Text);
if (checkSearch)
{
if (_myInfos[i].FileName.Contains(".uasset") || _myInfos[i].FileName.Contains(".uexp") || _myInfos[i].FileName.Contains(".ubulk"))
{
@@ -257,52 +226,21 @@ namespace FModel.Forms
{
for (int i = 0; i < _myInfos.Count; i++)
{
bool checkSearch = false;
string[] searchTextMultiple = textBox1.Text.Trim().Split(' ');
if (searchTextMultiple.Length > 1)
{
bool checkSearch = false;
for (int s = 0; s < searchTextMultiple.Length; ++s)
{
checkSearch = Utilities.CaseInsensitiveContains(_myInfos[i].FileName, searchTextMultiple[s]);
if (!checkSearch)
break;
}
if (checkSearch)
{
if (_myInfos[i].FileName.Contains(".uasset") || _myInfos[i].FileName.Contains(".uexp") || _myInfos[i].FileName.Contains(".ubulk"))
{
if (!_myFilteredInfosDict.ContainsKey(_myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal))))
{
_myFilteredInfosDict.Add(_myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal)), ThePak.AllpaksDictionary[Path.GetFileNameWithoutExtension(_myInfos[i].FileName)]);
_fileName = _myInfos[i].FileName.Substring(0, _myInfos[i].FileName.LastIndexOf(".", StringComparison.Ordinal));
_myFilteredInfos.Add(new FileInfoFilter
{
FileName = _fileName,
PakFile = ThePak.AllpaksDictionary[Path.GetFileNameWithoutExtension(_myInfos[i].FileName)],
});
}
}
else
{
if (!_myFilteredInfosDict.ContainsKey(_myInfos[i].FileName))
{
_myFilteredInfosDict.Add(_myInfos[i].FileName, ThePak.AllpaksDictionary[Path.GetFileName(_myInfos[i].FileName)]);
_fileName = _myInfos[i].FileName;
_myFilteredInfos.Add(new FileInfoFilter
{
FileName = _fileName,
PakFile = ThePak.AllpaksDictionary[Path.GetFileName(_myInfos[i].FileName)],
});
}
}
ShowItemsVirtualFiltered(_myFilteredInfos);
}
}
else if (Utilities.CaseInsensitiveContains(_myInfos[i].FileName, textBox1.Text))
else
checkSearch = Utilities.CaseInsensitiveContains(_myInfos[i].FileName, textBox1.Text);
if (checkSearch)
{
if (_myInfos[i].FileName.Contains(".uasset") || _myInfos[i].FileName.Contains(".uexp") || _myInfos[i].FileName.Contains(".ubulk"))
{