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

Separate out basefile determination

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-05 20:38:52 -05:00
parent 281375f8e9
commit 0b7046fde5
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
SabreTools.FileTypes/FileTypeTool.cs
View File

@@ -52,25 +52,10 @@ namespace SabreTools.FileTypes
// Get input information
var fileType = GetFileType(input);
Stream inputStream = GetInfoStream(input, header);
// Get the info in the proper manner
BaseFile? baseFile;
#if NET20 || NET35
if (fileType == FileType.AaruFormat && (asFiles & TreatAsFile.AaruFormat) == 0)
baseFile = AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && (asFiles & TreatAsFile.CHD) == 0)
baseFile = CHDFile.Create(inputStream);
#else
if (fileType == FileType.AaruFormat && !asFiles.HasFlag(TreatAsFile.AaruFormat))
baseFile = AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && !asFiles.HasFlag(TreatAsFile.CHD))
baseFile = CHDFile.Create(inputStream);
#endif
else
baseFile = GetInfo(inputStream, hashes: hashes, keepReadOpen: false);
BaseFile? baseFile = GetBaseFile(inputStream, fileType, hashes, asFiles);
// Dispose of the input stream
inputStream?.Dispose();
inputStream.Dispose();
// Add unique data from the file
baseFile!.Filename = Path.GetFileName(input);
@@ -174,12 +159,29 @@ namespace SabreTools.FileTypes
}
}
/// <summary>
/// Get the correct base file based on the type and filter options
/// </summary>
private static BaseFile? GetBaseFile(Stream inputStream, FileType? fileType, HashType[] hashes, TreatAsFile asFiles)
{
#if NET20 || NET35
if (fileType == FileType.AaruFormat && (asFiles & TreatAsFile.AaruFormat) == 0)
return AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && (asFiles & TreatAsFile.CHD) == 0)
return CHDFile.Create(inputStream);
#else
if (fileType == FileType.AaruFormat && !asFiles.HasFlag(TreatAsFile.AaruFormat))
return AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && !asFiles.HasFlag(TreatAsFile.CHD))
return CHDFile.Create(inputStream);
#endif
return GetInfo(inputStream, hashes, keepReadOpen: false);
}
/// <summary>
/// Get the required stream for info hashing
/// </summary>
/// <param name="input">Filename to get information from</param>
/// <param name="header">Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise</param>
/// <returns>Open stream representing the file</returns>
private static Stream GetInfoStream(string input, string? header)
{
// Open the file directly