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

[ArchiveTools, SimpleSort] Fix reading info from archive header

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-15 15:44:11 -07:00
parent e9cb58464f
commit 18d01080f9
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -200,20 +200,19 @@ namespace SabreTools.Helper
try
{
reader = ReaderFactory.Open(File.OpenRead(input));
logger.Log("Found archive of type: " + at);
if (at == ArchiveType.Zip || at == ArchiveType.SevenZip || at == ArchiveType.Rar)
{
// Create the temp directory
Directory.CreateDirectory(tempdir);
IArchiveEntry entry;
while ((entry = reader.Entry as IArchiveEntry) != null)
while (reader.MoveToNextEntry())
{
if (entry.Key.Contains(entryname))
logger.Log("Current entry name: '" + reader.Entry.Key + "'");
if (reader.Entry != null && reader.Entry.Key.Contains(entryname))
{
entry.WriteToDirectory(tempdir);
outfile = tempdir + Path.DirectorySeparatorChar + entry.Key;
reader.WriteEntryToFile(tempdir + Path.DirectorySeparatorChar + reader.Entry.Key);
outfile = tempdir + Path.DirectorySeparatorChar + reader.Entry.Key;
}
}
}
@@ -259,16 +258,21 @@ namespace SabreTools.Helper
if (at != ArchiveType.Tar)
{
IArchiveEntry entry;
while ((entry = reader.Entry as IArchiveEntry) != null)
while (reader.MoveToNextEntry())
{
roms.Add(new RomData
if (reader.Entry != null && !reader.Entry.IsDirectory)
{
Name = entry.Key,
Game = gamename,
Size = entry.Size,
CRC = entry.Crc.ToString("X"),
});
logger.Log("Entry found: '" + reader.Entry.Key + "': " + reader.Entry.Size + ", " + reader.Entry.Crc.ToString("X").ToLowerInvariant());
roms.Add(new RomData
{
Type = "rom",
Name = reader.Entry.Key,
Game = gamename,
Size = reader.Entry.Size,
CRC = reader.Entry.Crc.ToString("X").ToLowerInvariant(),
});
}
}
}
}