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

Signature-based instead of extension-based

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-13 13:35:50 -07:00
parent 35a6fbe1d6
commit f5d7bbd847
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DATFromDir/DATFromDir.cs
View File

@@ -54,8 +54,6 @@ namespace SabreTools
_logger = new Logger(false, "datfromdir.log"); _logger = new Logger(false, "datfromdir.log");
_logger.Start(); _logger.Start();
Remapping.CreateArchiveFormats();
// First things first, take care of all of the arguments that this could have // First things first, take care of all of the arguments that this could have
_noMD5 = false; _noSHA1 = false; _forceunzip = false; _allfiles = false; _old = false; _noMD5 = false; _noSHA1 = false; _forceunzip = false; _allfiles = false; _old = false;
_name = ""; _desc = ""; _cat = ""; _version = ""; _author = ""; _name = ""; _desc = ""; _cat = ""; _version = ""; _author = "";
@@ -291,16 +289,21 @@ namespace SabreTools
DirectoryInfo di = Directory.CreateDirectory(_tempDir); DirectoryInfo di = Directory.CreateDirectory(_tempDir);
bool encounteredErrors = true; bool encounteredErrors = true;
if (!_allfiles && Remapping.ArchiveFormats.Contains(Path.GetExtension(item).ToLowerInvariant())) if (!_allfiles)
{ {
try try
{ {
IArchive archive = ArchiveFactory.Open(item); IArchive archive = ArchiveFactory.Open(item);
_logger.Log("Found archive of type: " + archive.Type); ArchiveType at = archive.Type;
_logger.Log("Found archive of type: " + at);
if (at == ArchiveType.Zip || at == ArchiveType.SevenZip || at == ArchiveType.Rar)
{
IReader reader = archive.ExtractAllEntries(); IReader reader = archive.ExtractAllEntries();
reader.WriteAllToDirectory(_tempDir, ExtractOptions.ExtractFullPath); reader.WriteAllToDirectory(_tempDir, ExtractOptions.ExtractFullPath);
encounteredErrors = false; encounteredErrors = false;
} }
}
catch (InvalidOperationException) catch (InvalidOperationException)
{ {
encounteredErrors = true; encounteredErrors = true;

10
SabreHelper/Remapping.cs
View File

@@ -28,9 +28,6 @@ namespace SabreTools.Helper
public static Dictionary<string, int> PCE = new Dictionary<string, int>(); public static Dictionary<string, int> PCE = new Dictionary<string, int>();
public static Dictionary<string, int> SNES = new Dictionary<string, int>(); public static Dictionary<string, int> SNES = new Dictionary<string, int>();
// Available archive formats
public static List<string> ArchiveFormats = new List<string>();
/// <summary> /// <summary>
/// Create all remappings to be used by the program /// Create all remappings to be used by the program
/// </summary> /// </summary>
@@ -229,12 +226,5 @@ namespace SabreTools.Helper
} }
} }
} }
public static void CreateArchiveFormats()
{
ArchiveFormats.Add("7z");
ArchiveFormats.Add("zip");
ArchiveFormats.Add("rar");
}
} }
} }