Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-14 08:17:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Database speed improvements

Browse source 
Use parallel threading for loading pkm files, speeds up form open time.
allow empty string filtering like in the Batch Editor
This commit is contained in:
Kurt 2016-12-29 15:24:02 -08:00
parent d81cf50f99
commit 8b274ddbc3
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
PKHeX/Subforms/SAV_Database.cs
View file

@ -4,6 +4,7 @@ using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace PKHeX
@ -81,12 +82,19 @@ namespace PKHeX
// Load Data
RawDB = new List<PKM>();
foreach (string file in Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories))
var files = Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories);
Parallel.ForEach(files, file =>
{
FileInfo fi = new FileInfo(file);
if (fi.Extension.Contains(".pk") && PKX.getIsPKM(fi.Length))
RawDB.Add(PKMConverter.getPKMfromBytes(File.ReadAllBytes(file), file));
}
if (!fi.Extension.Contains(".pk") || !PKX.getIsPKM(fi.Length)) return;
var pk = PKMConverter.getPKMfromBytes(File.ReadAllBytes(file), file);
if (pk == null)
return;
lock (RawDB)
RawDB.Add(pk);
});
RawDB = new List<PKM>(RawDB.Where(pk => pk != null).OrderBy(pk => pk.Identifier));
// Fetch from save file
foreach (var pkm in Main.SAV.BoxData.Where(pk => pk.Species != 0))
RawDB.Add(pkm);
@ -486,9 +494,6 @@ namespace PKHeX
where split.Length == 2 && !string.IsNullOrWhiteSpace(split[0])
select new BatchEditor.StringInstruction { PropertyName = split[0], PropertyValue = split[1], Evaluator = eval }).ToArray();
if (filters.Any(z => string.IsNullOrWhiteSpace(z.PropertyValue)))
{ Util.Error("Empty Filter Value detected."); return; }
BatchEditor.screenStrings(filters);
res = res.Where(pkm => // Compare across all filters
{