From 32b90fab132ebd78dcbd03e2afc7db7e8566e6a0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 29 Jul 2018 21:54:02 -0700 Subject: [PATCH] Simplify some logic --- PKHeX.Core/Editing/ShowdownSet.cs | 4 ++-- PKHeX.Core/Saves/Util/SaveExtensions.cs | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs index d8cff4893..230ceec64 100644 --- a/PKHeX.Core/Editing/ShowdownSet.cs +++ b/PKHeX.Core/Editing/ShowdownSet.cs @@ -469,7 +469,7 @@ private bool ParseSpeciesForm(string spec) private void ParseSpeciesNickname(string line) { - int index = line.LastIndexOf("(", StringComparison.Ordinal); + int index = line.LastIndexOf('('); string n1, n2; if (index > 1) // correct format { @@ -479,7 +479,7 @@ private void ParseSpeciesNickname(string line) } else // nickname first (manually created set, incorrect) { - int end = line.IndexOf(")", StringComparison.Ordinal); + int end = line.IndexOf(')'); n2 = line.Substring(index + 1, end - 1); n1 = line.Substring(end + 2); } diff --git a/PKHeX.Core/Saves/Util/SaveExtensions.cs b/PKHeX.Core/Saves/Util/SaveExtensions.cs index 9f8c9d565..44b6c7657 100644 --- a/PKHeX.Core/Saves/Util/SaveExtensions.cs +++ b/PKHeX.Core/Saves/Util/SaveExtensions.cs @@ -36,15 +36,11 @@ public static void SetFileInfo(this SaveFile sav, string path) sav.FilePath = path; sav.FileFolder = Path.GetDirectoryName(path); + sav.FileName = string.Empty; + var bakName = Util.CleanFileName(sav.BAKName); sav.FileName = Path.GetFileName(path); - if (!sav.FileName.EndsWith(".bak")) - return; - - // trim off any bak details to get original file name - int index = sav.FileName.LastIndexOf(" [", StringComparison.Ordinal); - if (index < 0) - return; - sav.FileName = sav.FileName.Substring(0, index); + if (sav.FileName?.EndsWith(bakName) == true) + sav.FileName = sav.FileName.Substring(0, sav.FileName.Length - bakName.Length); } ///