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

[SimpleSort, ALL] Consolodate ArchiveScanLevel to a single flag

Browse Source
This commit is contained in:
Matt Nadareski
2016-10-05 17:23:44 -07:00
parent 1fa4cfa65f
commit fec1d15a1f
7 changed files with 153 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SabreTools.Helper/Objects/Dat/DatFile.cs
View File

@@ -4913,13 +4913,12 @@ namespace SabreTools.Helper
// Otherwise, attempt to extract the files to the temporary directory
else
{
bool encounteredErrors = ArchiveTools.ExtractArchive(newItem,
tempSubDir,
(archivesAsFiles ? ArchiveScanLevel.External : ArchiveScanLevel.Internal),
(!archivesAsFiles && enableGzip ? ArchiveScanLevel.Internal : ArchiveScanLevel.External),
(archivesAsFiles ? ArchiveScanLevel.External : ArchiveScanLevel.Internal),
(archivesAsFiles ? ArchiveScanLevel.External : ArchiveScanLevel.Internal),
logger);
ArchiveScanLevel asl = (archivesAsFiles ? ArchiveScanLevel.SevenZipExternal : ArchiveScanLevel.SevenZipInternal)
| (!archivesAsFiles && enableGzip ? ArchiveScanLevel.GZipInternal : ArchiveScanLevel.GZipExternal)
| (archivesAsFiles ? ArchiveScanLevel.RarExternal : ArchiveScanLevel.RarInternal)
| (archivesAsFiles ? ArchiveScanLevel.ZipExternal : ArchiveScanLevel.ZipInternal);
bool encounteredErrors = ArchiveTools.ExtractArchive(newItem, tempSubDir, asl, logger);
// If the file was an archive and was extracted successfully, check it
if (!encounteredErrors)