claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce unnecessary method calls

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-29 13:14:42 -05:00
parent 741c681cb2
commit 8c8dd4ea83
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SabreTools.DatFiles/DatHeader.cs
View File

@@ -515,6 +515,15 @@ namespace SabreTools.DatFiles
// Create the output dictionary // Create the output dictionary
Dictionary<DatFormat, string> outfileNames = []; Dictionary<DatFormat, string> outfileNames = [];
// Get the filename to use
string? filename = string.IsNullOrEmpty(GetStringFieldValue(DatHeader.FileNameKey))
? GetStringFieldValue(Models.Metadata.Header.DescriptionKey)
: GetStringFieldValue(DatHeader.FileNameKey);
// Strip off the extension if it's a holdover from the DAT
if (Utilities.HasValidDatExtension(filename))
filename = Path.GetFileNameWithoutExtension(filename);
// Double check the outDir for the end delim // Double check the outDir for the end delim
if (!outDir.EndsWith(Path.DirectorySeparatorChar.ToString())) if (!outDir.EndsWith(Path.DirectorySeparatorChar.ToString()))
outDir += Path.DirectorySeparatorChar; outDir += Path.DirectorySeparatorChar;
@@ -541,7 +550,7 @@ namespace SabreTools.DatFiles
extension = extensions[1]; extension = extensions[1];
// Create the filename and set the extension as used // Create the filename and set the extension as used
outfileNames.Add(format, CreateOutFileNamesHelper(outDir, extension, overwrite)); outfileNames.Add(format, CreateOutFileNamesHelper(filename, outDir, extension, overwrite));
usedExtensions.Add(extension); usedExtensions.Add(extension);
} }
@@ -551,20 +560,13 @@ namespace SabreTools.DatFiles
/// <summary> /// <summary>
/// Help generating the outfile name /// Help generating the outfile name
/// </summary> /// </summary>
/// <param name="filename">Base filename to use</param>
/// <param name="outDir">Output directory</param> /// <param name="outDir">Output directory</param>
/// <param name="extension">Extension to use for the file</param> /// <param name="extension">Extension to use for the file</param>
/// <param name="overwrite">True if we ignore existing files, false otherwise</param> /// <param name="overwrite">True if we ignore existing files, false otherwise</param>
/// <returns>String containing the new filename</returns> /// <returns>String containing the new filename</returns>
private string CreateOutFileNamesHelper(string outDir, string extension, bool overwrite) private static string CreateOutFileNamesHelper(string? filename, string outDir, string extension, bool overwrite)
{ {
string? filename = string.IsNullOrEmpty(GetStringFieldValue(DatHeader.FileNameKey))
? GetStringFieldValue(Models.Metadata.Header.DescriptionKey)
: GetStringFieldValue(DatHeader.FileNameKey);
// Strip off the extension if it's a holdover from the DAT
if (Utilities.HasValidDatExtension(filename))
filename = Path.GetFileNameWithoutExtension(filename);
string outfile = $"{outDir}{filename}{extension}"; string outfile = $"{outDir}{filename}{extension}";
outfile = outfile.Replace($"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}", Path.DirectorySeparatorChar.ToString()); outfile = outfile.Replace($"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}", Path.DirectorySeparatorChar.ToString());
@@ -588,7 +590,7 @@ namespace SabreTools.DatFiles
/// <param name="datFormat">Combined DatFormat value to split</param> /// <param name="datFormat">Combined DatFormat value to split</param>
/// <returns>List representing the individual flag values set</returns> /// <returns>List representing the individual flag values set</returns>
/// TODO: Consider making DatFormat a non-flag enum so this doesn't need to happen /// TODO: Consider making DatFormat a non-flag enum so this doesn't need to happen
private List<DatFormat> SplitFormats(DatFormat datFormat) private static List<DatFormat> SplitFormats(DatFormat datFormat)
{ {
List<DatFormat> usedFormats = []; List<DatFormat> usedFormats = [];