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

[FileTypes/] Move some things around

Browse Source
This commit is contained in:
Matt Nadareski
2017-11-02 01:03:36 -07:00
parent f11a0b1038
commit 6cd84ae8aa
11 changed files with 261 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -3614,7 +3614,8 @@ namespace SabreTools.Library.DatFiles
// Special case for if we are in Romba mode (all names are supposed to be SHA-1 hashes)
if (Romba)
{
Rom rom = ArchiveTools.GetTorrentGZFileInfo(item);
GZipArchive archive = new GZipArchive(item);
Rom rom = archive.GetTorrentGZFileInfo();
// If the rom is valid, write it out
if (rom != null && rom.Name != null)
@@ -4014,7 +4015,8 @@ namespace SabreTools.Library.DatFiles
}
// If we have a path, we want to try to get the rom information
Rom fileinfo = ArchiveTools.GetTorrentGZFileInfo(foundpath);
GZipArchive archive = new GZipArchive(foundpath);
Rom fileinfo = archive.GetTorrentGZFileInfo();
// If the file information is null, then we continue
if (fileinfo == null)
@@ -4225,7 +4227,8 @@ namespace SabreTools.Library.DatFiles
usedInternally = true;
// Get the TGZ status for later
bool isTorrentGzip = (ArchiveTools.GetTorrentGZFileInfo(file) != null);
GZipArchive tgz = new GZipArchive(file);
bool isTorrentGzip = tgz.IsTorrent();
// Get the base archive first
BaseArchive archive = ArchiveTools.CreateArchiveFromExistingInput(file);
@@ -4319,7 +4322,9 @@ namespace SabreTools.Library.DatFiles
}
// If we have a very specifc TGZ->TGZ case, just copy it accordingly
if (isZip == false && ArchiveTools.GetTorrentGZFileInfo(file) != null && outputFormat == OutputFormat.TorrentGzip)
GZipArchive tgz = new GZipArchive(file);
Rom rom = tgz.GetTorrentGZFileInfo();
if (isZip == false && rom != null && outputFormat == OutputFormat.TorrentGzip)
{
// Get the proper output path
if (romba)
@@ -4399,7 +4404,9 @@ namespace SabreTools.Library.DatFiles
string machinename = null;
// If we have a very specifc TGZ->TGZ case, just copy it accordingly
if (isZip == false && ArchiveTools.GetTorrentGZFileInfo(file) != null && outputFormat == OutputFormat.TorrentGzip)
GZipArchive tgz = new GZipArchive(file);
Rom rom = tgz.GetTorrentGZFileInfo();
if (isZip == false && rom != null && outputFormat == OutputFormat.TorrentGzip)
{
// Get the proper output path
if (romba)
@@ -4674,7 +4681,8 @@ namespace SabreTools.Library.DatFiles
}
// If we have a path, we want to try to get the rom information
Rom fileinfo = ArchiveTools.GetTorrentGZFileInfo(foundpath);
GZipArchive tgz = new GZipArchive(foundpath);
Rom fileinfo = tgz.GetTorrentGZFileInfo();
// If the file information is null, then we continue
if (fileinfo == null)