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] Add method for getting archive type safely

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-15 14:43:05 -07:00
parent 07aeb3f3b7
commit 7d22fa8bf0
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
using SharpCompress.Archive; using SharpCompress.Common;
using SharpCompress.Common;
using SharpCompress.Reader; using SharpCompress.Reader;
using System; using System;
using System.IO; using System.IO;
@@ -105,11 +104,20 @@ namespace SabreTools.Helper
ArchiveScanLevel gz, ArchiveScanLevel rar, ArchiveScanLevel zip, Logger logger) ArchiveScanLevel gz, ArchiveScanLevel rar, ArchiveScanLevel zip, Logger logger)
{ {
bool encounteredErrors = true; bool encounteredErrors = true;
// First get the archive type
ArchiveType? at = GetCurrentArchiveType(input, logger);
// If we got back null, then it's not an archive, so we we return
if (at == null)
{
return encounteredErrors;
}
IReader reader = null; IReader reader = null;
try try
{ {
reader = ReaderFactory.Open(File.OpenRead(input)); reader = ReaderFactory.Open(File.OpenRead(input));
ArchiveType at = reader.ArchiveType;
logger.Log("Found archive of type: " + at); logger.Log("Found archive of type: " + at);
if ((at == ArchiveType.Zip && zip != ArchiveScanLevel.External) || if ((at == ArchiveType.Zip && zip != ArchiveScanLevel.External) ||
@@ -169,6 +177,7 @@ namespace SabreTools.Helper
/// Retrieve file information for a single torrent GZ file /// Retrieve file information for a single torrent GZ file
/// </summary> /// </summary>
/// <param name="input">Filename to get information from</param> /// <param name="input">Filename to get information from</param>
/// <param name="logger">Logger object for file and console output</param>
/// <returns>Populated RomData object if success, empty one on error</returns> /// <returns>Populated RomData object if success, empty one on error</returns>
public static RomData GetTorrentGZFileInfo(string input, Logger logger) public static RomData GetTorrentGZFileInfo(string input, Logger logger)
{ {
@@ -244,5 +253,33 @@ namespace SabreTools.Helper
return rom; return rom;
} }
/// <summary>
/// Returns the archive type of an input file
/// </summary>
/// <param name="input">Input file to check</param>
/// <param name="logger">Logger object for file and console output</param>
/// <returns>ArchiveType of inputted file (null on error)</returns>
public static ArchiveType? GetCurrentArchiveType(string input, Logger logger)
{
ArchiveType? outtype = null;
IReader reader = null;
try
{
reader = ReaderFactory.Open(File.OpenRead(input));
outtype = reader.ArchiveType;
}
catch (Exception ex)
{
logger.Error(ex.ToString());
}
finally
{
reader?.Dispose();
}
return outtype;
}
} }
} }