Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 12:26:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change sav.LoadBoxes to return int

Browse Source 
make MysteryGift specific method flexible so that any IEncounterable
enumerable can be passed.
This commit is contained in:
Kurt
2019-02-23 14:37:06 -08:00
parent 5e242833ba
commit ca51edbdcf
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PKHeX.Core/Saves/Util/BoxUtil.cs
View File

@@ -82,11 +82,11 @@ public static int DumpBox(this SaveFile SAV, string path, int currentBox)
/// <param name="overwrite">Overwrite existing full slots. If true, will only overwrite empty slots.</param>
/// <param name="noSetb">Bypass option to not modify <see cref="PKM"/> properties when setting to Save File.</param>
/// <param name="all">Enumerate all files even in sub-folders.</param>
/// <returns>True if any files are imported.</returns>
public static bool LoadBoxes(this SaveFile SAV, string path, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null, bool all = false)
/// <returns>Count of files imported.</returns>
public static int LoadBoxes(this SaveFile SAV, string path, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null, bool all = false)
{
if (string.IsNullOrWhiteSpace(path) || !Directory.Exists(path))
{ result = MsgSaveBoxExportPathInvalid; return false; }
{ result = MsgSaveBoxExportPathInvalid; return -1; }
var opt = all ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
var filepaths = Directory.EnumerateFiles(path, "*.*", opt);
@@ -103,8 +103,8 @@ public static bool LoadBoxes(this SaveFile SAV, string path, out string result,
/// <param name="boxClear">Instruction to clear boxes after the starting box.</param>
/// <param name="overwrite">Overwrite existing full slots. If true, will only overwrite empty slots.</param>
/// <param name="noSetb">Bypass option to not modify <see cref="PKM"/> properties when setting to Save File.</param>
/// <returns>True if any files are imported.</returns>
public static bool LoadBoxes(this SaveFile SAV, IEnumerable<string> filepaths, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
/// <returns>Count of files imported.</returns>
public static int LoadBoxes(this SaveFile SAV, IEnumerable<string> filepaths, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
{
var pks = GetPossiblePKMsFromPaths(SAV, filepaths);
return SAV.LoadBoxes(pks, out result, boxStart, boxClear, overwrite, noSetb);
@@ -114,16 +114,16 @@ public static bool LoadBoxes(this SaveFile SAV, IEnumerable<string> filepaths, o
/// Loads a folder of files to the <see cref="SaveFile"/>.
/// </summary>
/// <param name="SAV"><see cref="SaveFile"/> to load folder to.</param>
/// <param name="gifts">Gifts to load <see cref="PKM"/> files from.</param>
/// <param name="encounters">Encounters to create <see cref="PKM"/> files from.</param>
/// <param name="result">Result message from the method.</param>
/// <param name="boxStart">First box to start loading to. All prior boxes are not modified.</param>
/// <param name="boxClear">Instruction to clear boxes after the starting box.</param>
/// <param name="overwrite">Overwrite existing full slots. If true, will only overwrite empty slots.</param>
/// <param name="noSetb">Bypass option to not modify <see cref="PKM"/> properties when setting to Save File.</param>
/// <returns>True if any files are imported.</returns>
public static bool LoadBoxes(this SaveFile SAV, IEnumerable<MysteryGift> gifts, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
/// <returns>Count of files imported.</returns>
public static int LoadBoxes(this SaveFile SAV, IEnumerable<IEncounterable> encounters, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
{
var pks = gifts.Select(z => z.ConvertToPKM(SAV));
var pks = encounters.Select(z => z.ConvertToPKM(SAV));
return SAV.LoadBoxes(pks, out result, boxStart, boxClear, overwrite, noSetb);
}
@@ -138,10 +138,10 @@ public static bool LoadBoxes(this SaveFile SAV, IEnumerable<MysteryGift> gifts,
/// <param name="overwrite">Overwrite existing full slots. If true, will only overwrite empty slots.</param>
/// <param name="noSetb">Bypass option to not modify <see cref="PKM"/> properties when setting to Save File.</param>
/// <returns>True if any files are imported.</returns>
public static bool LoadBoxes(this SaveFile SAV, IEnumerable<PKM> pks, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
public static int LoadBoxes(this SaveFile SAV, IEnumerable<PKM> pks, out string result, int boxStart = 0, bool boxClear = false, bool overwrite = false, bool? noSetb = null)
{
if (!SAV.HasBox)
{ result = MsgSaveBoxFailNone; return false; }
{ result = MsgSaveBoxFailNone; return -1; }
var compat = SAV.GetCompatible(pks);
if (boxClear)
@@ -151,11 +151,11 @@ public static bool LoadBoxes(this SaveFile SAV, IEnumerable<PKM> pks, out string
if (ctr <= 0)
{
result = MsgSaveBoxImportNoFiles;
return false;
return -1;
}
result = string.Format(MsgSaveBoxImportSuccess, ctr);
return true;
return ctr;
}
public static IEnumerable<PKM> GetPKMsFromPaths(IEnumerable<string> filepaths, int generation)

3
PKHeX.WinForms/Subforms/SAV_Database.cs
View File

@@ -416,7 +416,8 @@ private void Menu_Import_Click(object sender, EventArgs e)
return;
int box = BoxView.Box.CurrentBox;
if (!SAV.LoadBoxes(Results, out var result, box, clearAll, overwrite, noSetb))
int ctr = SAV.LoadBoxes(Results, out var result, box, clearAll, overwrite, noSetb);
if (ctr <= 0)
return;
BoxView.SetPKMBoxes();

3
PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
View File

@@ -361,7 +361,8 @@ private void Menu_Import_Click(object sender, EventArgs e)
return;
int box = BoxView.Box.CurrentBox;
if (!SAV.LoadBoxes(Results, out var result, box, clearAll, overwrite, noSetb))
int ctr = SAV.LoadBoxes(Results, out var result, box, clearAll, overwrite, noSetb);
if (ctr <= 0)
return;
BoxView.SetPKMBoxes();