Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve database loading speed

Browse source 
do db population in another thread, invoke an update when complete
This commit is contained in:
Kurt 2017-09-04 22:22:02 -07:00
parent 492e378101
commit dcf2b5fd9c
2 changed files with 68 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
PKHeX.WinForms/Subforms/SAV_Database.cs
View file

@ -44,18 +44,8 @@ namespace PKHeX.WinForms
};
// Enable Scrolling when hovered over
PAN_Box.MouseWheel += (sender, e) =>
{
if (ActiveForm == this)
SCR_Box.Focus();
};
foreach (var slot in PKXBOXES)
{
slot.MouseWheel += (sender, e) =>
{
if (ActiveForm == this)
SCR_Box.Focus();
};
// Enable Click
slot.MouseClick += (sender, e) =>
{
@ -91,43 +81,9 @@ namespace PKHeX.WinForms
p.ContextMenuStrip = mnu;
// Load Data
var dbTemp = new ConcurrentBag<PKM>();
var files = Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories);
Parallel.ForEach(files, file =>
{
FileInfo fi = new FileInfo(file);
if (!fi.Extension.Contains(".pk") || !PKX.IsPKM(fi.Length)) return;
var pk = PKMConverter.GetPKMfromBytes(File.ReadAllBytes(file), file, prefer: (fi.Extension.Last() - 0x30)&7);
if (pk != null)
dbTemp.Add(pk);
});
#if DEBUG
if (SaveUtil.GetSavesFromFolder(Main.BackupPath, false, out IEnumerable<string> result))
{
Parallel.ForEach(result, file =>
{
var sav = SaveUtil.GetVariantSAV(File.ReadAllBytes(file));
var path = EXTERNAL_SAV + new FileInfo(file).Name;
if (sav.HasBox)
foreach (var pk in sav.BoxData)
addPKM(pk);
void addPKM(PKM pk)
{
pk.Identifier = Path.Combine(path, pk.Identifier);
dbTemp.Add(pk);
}
});
}
#endif
// Prepare Database
RawDB = new List<PKM>(dbTemp.OrderBy(pk => pk.Identifier)
.Concat(SAV.BoxData.Where(pk => pk.Species != 0)) // Fetch from save file
.Where(pk => pk.ChecksumValid && pk.Species != 0 && pk.Sanity == 0)
.Distinct());
SetResults(RawDB);
B_Search.Enabled = false;
L_Count.Text = "Loading...";
new Task(LoadDatabase).Start();
Menu_SearchSettings.DropDown.Closing += (sender, e) =>
{
@ -369,6 +325,48 @@ namespace PKHeX.WinForms
reportGrid.PopulateData(Results.ToArray());
}
private void LoadDatabase()
{
var dbTemp = new ConcurrentBag<PKM>();
var files = Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories);
Parallel.ForEach(files, file =>
{
FileInfo fi = new FileInfo(file);
if (!fi.Extension.Contains(".pk") || !PKX.IsPKM(fi.Length)) return;
var pk = PKMConverter.GetPKMfromBytes(File.ReadAllBytes(file), file, prefer: (fi.Extension.Last() - 0x30) & 7);
if (pk != null)
dbTemp.Add(pk);
});
#if DEBUG
if (SaveUtil.GetSavesFromFolder(Main.BackupPath, false, out IEnumerable<string> result))
{
Parallel.ForEach(result, file =>
{
var sav = SaveUtil.GetVariantSAV(File.ReadAllBytes(file));
var path = EXTERNAL_SAV + new FileInfo(file).Name;
if (sav.HasBox)
foreach (var pk in sav.BoxData)
addPKM(pk);
void addPKM(PKM pk)
{
pk.Identifier = Path.Combine(path, pk.Identifier);
dbTemp.Add(pk);
}
});
}
#endif
// Prepare Database
RawDB = new List<PKM>(dbTemp.OrderBy(pk => pk.Identifier)
.Concat(SAV.BoxData.Where(pk => pk.Species != 0)) // Fetch from save file
.Where(pk => pk.ChecksumValid && pk.Species != 0 && pk.Sanity == 0)
.Distinct());
BeginInvoke(new MethodInvoker(() => SetResults(RawDB)));
}
// IO Usage
private void OpenDB(object sender, EventArgs e)
{
@ -597,6 +595,7 @@ namespace PKHeX.WinForms
FillPKXBoxes(0);
L_Count.Text = string.Format(Counter, Results.Count);
B_Search.Enabled = true;
}
private void FillPKXBoxes(int start)
{

45
PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.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;
using PKHeX.Core;
using PKHeX.WinForms.Controls;
@ -40,18 +41,8 @@ namespace PKHeX.WinForms
};
// Enable Scrolling when hovered over
PAN_Box.MouseWheel += (sender, e) =>
{
if (ActiveForm == this)
SCR_Box.Focus();
};
foreach (var slot in PKXBOXES)
{
slot.MouseWheel += (sender, e) =>
{
if (ActiveForm == this)
SCR_Box.Focus();
};
// Enable Click
slot.MouseClick += (sender, e) =>
{
@ -84,30 +75,21 @@ namespace PKHeX.WinForms
p.ContextMenuStrip = mnu;
// Load Data
RawDB = new List<MysteryGift>();
RawDB.AddRange(Legal.MGDB_G4);
RawDB.AddRange(Legal.MGDB_G5);
RawDB.AddRange(Legal.MGDB_G6);
RawDB.AddRange(Legal.MGDB_G7);
RawDB = new List<MysteryGift>(RawDB.Where(mg => !mg.IsItem && mg.IsPokémon && mg.Species > 0).Distinct().Concat(Legal.MGDB_G3).OrderBy(mg => mg.Species));
foreach (var mg in RawDB)
mg.GiftUsed = false;
SetResults(RawDB);
B_Search.Enabled = false;
L_Count.Text = "Loading...";
new Task(LoadDatabase).Start();
Menu_SearchSettings.DropDown.Closing += (sender, e) =>
{
if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked)
e.Cancel = true;
};
PopulateComboBoxes();
CenterToParent();
}
private readonly PictureBox[] PKXBOXES;
private readonly string DatabasePath = Main.MGDatabasePath;
private List<MysteryGift> Results;
private readonly List<MysteryGift> RawDB;
private List<MysteryGift> RawDB;
private int slotSelected = -1; // = null;
private Image slotColor;
private const int RES_MAX = 66;
@ -216,6 +198,23 @@ namespace PKHeX.WinForms
if (sender != null)
System.Media.SystemSounds.Asterisk.Play();
}
private void LoadDatabase()
{
RawDB = new List<MysteryGift>();
RawDB.AddRange(Legal.MGDB_G4);
RawDB.AddRange(Legal.MGDB_G5);
RawDB.AddRange(Legal.MGDB_G6);
RawDB.AddRange(Legal.MGDB_G7);
RawDB = new List<MysteryGift>(RawDB.Where(mg => !mg.IsItem && mg.IsPokémon && mg.Species > 0).Distinct().Concat(Legal.MGDB_G3).OrderBy(mg => mg.Species));
foreach (var mg in RawDB)
mg.GiftUsed = false;
BeginInvoke(new MethodInvoker(delegate
{
SetResults(RawDB);
PopulateComboBoxes();
}));
}
// IO Usage
private void OpenDB(object sender, EventArgs e)