diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index 640f12b8..300a6454 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -462,7 +462,7 @@ namespace SabreTools { foreach (string input in inputs) { - InitConvert(input, OutputFormat.Xml, outdir); + InitConvert(input, OutputFormat.Xml, outdir, clean); } } @@ -840,7 +840,7 @@ Make a selection: break; case "4": Console.Clear(); - InitConvert(input, outputFormat, outdir); + InitConvert(input, outputFormat, outdir, false); Console.Write("\nPress any key to continue..."); Console.ReadKey(); input = ""; outdir = ""; @@ -1382,7 +1382,7 @@ Make a selection: /// /// Optional param for output directory /// True to clean the game names to WoD standard, false otherwise (default) - private static void InitConvert(string filename, OutputFormat outputFormat, string outdir = "", bool clean = false) + private static void InitConvert(string filename, OutputFormat outputFormat, string outdir, bool clean) { // Clean the input strings outdir = outdir.Replace("\"", ""); diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs index 502ae5bd..95cb0bda 100644 --- a/SabreHelper/RomManipulation.cs +++ b/SabreHelper/RomManipulation.cs @@ -173,6 +173,9 @@ namespace SabreTools.Helper gamename = Style.RussianToLatin(gamename); gamename = Style.SearchPattern(gamename); gamename = gamename.TrimStart().TrimEnd(); + + gamename = new Regex(@"(([[(].*[\)\]] )?([^([]+))").Match(gamename).Groups[1].Value; + gamename = gamename.TrimStart().TrimEnd(); } RomData rom = new RomData @@ -512,6 +515,8 @@ namespace SabreTools.Helper rominfo[3] = Style.NormalizeChars(rominfo[3]); rominfo[3] = Style.RussianToLatin(rominfo[3]); rominfo[3] = Style.SearchPattern(rominfo[3]); + + rominfo[3] = new Regex(@"(([[(].*[\)\]] )?([^([]+))").Match(rominfo[3]).Groups[1].Value; rominfo[3] = rominfo[3].TrimStart().TrimEnd(); }