diff --git a/SabreTools.Library/FileTypes/TorrentGZipArchive.cs b/SabreTools.Library/FileTypes/GZipArchive.cs
similarity index 99%
rename from SabreTools.Library/FileTypes/TorrentGZipArchive.cs
rename to SabreTools.Library/FileTypes/GZipArchive.cs
index 0fd51e3d..dde26fab 100644
--- a/SabreTools.Library/FileTypes/TorrentGZipArchive.cs
+++ b/SabreTools.Library/FileTypes/GZipArchive.cs
@@ -27,14 +27,14 @@ namespace SabreTools.Library.FileTypes
///
/// Represents a TorrentGZip archive for reading and writing
///
- public class TorrentGZipArchive : BaseArchive
+ public class GZipArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentGZipArchive with no base file
///
- public TorrentGZipArchive()
+ public GZipArchive()
: base()
{
}
@@ -44,7 +44,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentGZipArchive(string filename)
+ public GZipArchive(string filename)
: base(filename)
{
_archiveType = ArchiveType.GZip;
diff --git a/SabreTools.Library/FileTypes/TorrentLRZArchive.cs b/SabreTools.Library/FileTypes/LRZArchive.cs
similarity index 97%
rename from SabreTools.Library/FileTypes/TorrentLRZArchive.cs
rename to SabreTools.Library/FileTypes/LRZArchive.cs
index a0e62c00..597eff77 100644
--- a/SabreTools.Library/FileTypes/TorrentLRZArchive.cs
+++ b/SabreTools.Library/FileTypes/LRZArchive.cs
@@ -17,14 +17,14 @@ namespace SabreTools.Library.FileTypes
/// Represents a TorrentLRZip archive for reading and writing
///
/// TODO: LRZIP: https://github.com/ckolivas/lrzip
- public class TorrentLRZArchive : BaseArchive
+ public class LRZArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentGZipArchive with no base file
///
- public TorrentLRZArchive()
+ public LRZArchive()
: base()
{
}
@@ -34,7 +34,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentLRZArchive(string filename)
+ public LRZArchive(string filename)
: base(filename)
{
//_archiveType = ArchiveType.LRZip;
diff --git a/SabreTools.Library/FileTypes/TorrentRARArchive.cs b/SabreTools.Library/FileTypes/RarArchive.cs
similarity index 93%
rename from SabreTools.Library/FileTypes/TorrentRARArchive.cs
rename to SabreTools.Library/FileTypes/RarArchive.cs
index f7f34be3..972abbb8 100644
--- a/SabreTools.Library/FileTypes/TorrentRARArchive.cs
+++ b/SabreTools.Library/FileTypes/RarArchive.cs
@@ -27,14 +27,14 @@ namespace SabreTools.Library.FileTypes
///
/// Represents a TorrentRAR archive for reading and writing
///
- public class TorrentRARArchive : BaseArchive
+ public class RarArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentRARArchive with no base file
///
- public TorrentRARArchive()
+ public RarArchive()
: base()
{
}
@@ -44,7 +44,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentRARArchive(string filename)
+ public RarArchive(string filename)
: base(filename)
{
_archiveType = ArchiveType.Rar;
@@ -69,7 +69,7 @@ namespace SabreTools.Library.FileTypes
Directory.CreateDirectory(outDir);
// Extract all files to the temp directory
- RarArchive ra = RarArchive.Open(_filename);
+ SharpCompress.Archives.Rar.RarArchive ra = SharpCompress.Archives.Rar.RarArchive.Open(_filename);
foreach (RarArchiveEntry entry in ra.Entries)
{
entry.WriteToDirectory(outDir, new ExtractionOptions { PreserveFileTime = true, ExtractFullPath = true, Overwrite = true });
@@ -153,7 +153,7 @@ namespace SabreTools.Library.FileTypes
try
{
- RarArchive ra = RarArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false, });
+ SharpCompress.Archives.Rar.RarArchive ra = SharpCompress.Archives.Rar.RarArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false, });
foreach (RarArchiveEntry entry in ra.Entries)
{
if (entry != null && !entry.IsDirectory && entry.Key.Contains(entryName))
@@ -193,7 +193,7 @@ namespace SabreTools.Library.FileTypes
try
{
- RarArchive ra = RarArchive.Open(FileTools.TryOpenRead(_filename));
+ SharpCompress.Archives.Rar.RarArchive ra = SharpCompress.Archives.Rar.RarArchive.Open(FileTools.TryOpenRead(_filename));
foreach (RarArchiveEntry entry in ra.Entries.Where(e => e != null && !e.IsDirectory))
{
// If secure hashes are disabled, do a quickscan
@@ -246,7 +246,7 @@ namespace SabreTools.Library.FileTypes
try
{
- RarArchive ra = RarArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false });
+ SharpCompress.Archives.Rar.RarArchive ra = SharpCompress.Archives.Rar.RarArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false });
List rarEntries = ra.Entries.OrderBy(e => e.Key, new NaturalSort.NaturalReversedComparer()).ToList();
string lastRarEntry = null;
foreach (RarArchiveEntry entry in rarEntries)
diff --git a/SabreTools.Library/FileTypes/TorrentSevenZipArchive.cs b/SabreTools.Library/FileTypes/SevenZipArchive.cs
similarity index 97%
rename from SabreTools.Library/FileTypes/TorrentSevenZipArchive.cs
rename to SabreTools.Library/FileTypes/SevenZipArchive.cs
index b1f73fd5..c7b98ce8 100644
--- a/SabreTools.Library/FileTypes/TorrentSevenZipArchive.cs
+++ b/SabreTools.Library/FileTypes/SevenZipArchive.cs
@@ -31,14 +31,14 @@ namespace SabreTools.Library.FileTypes
/// Represents a Torrent7zip archive for reading and writing
///
/// TODO: Torrent 7-zip: https://sourceforge.net/p/t7z/code/HEAD/tree/
- public class TorrentSevenZipArchive : BaseArchive
+ public class SevenZipArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentSevenZipArchive with no base file
///
- public TorrentSevenZipArchive()
+ public SevenZipArchive()
: base()
{
}
@@ -48,7 +48,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentSevenZipArchive(string filename)
+ public SevenZipArchive(string filename)
: base(filename)
{
_archiveType = ArchiveType.SevenZip;
@@ -73,7 +73,7 @@ namespace SabreTools.Library.FileTypes
Directory.CreateDirectory(outDir);
// Extract all files to the temp directory
- SevenZipArchive sza = SevenZipArchive.Open(FileTools.TryOpenRead(_filename));
+ SharpCompress.Archives.SevenZip.SevenZipArchive sza = SharpCompress.Archives.SevenZip.SevenZipArchive.Open(FileTools.TryOpenRead(_filename));
foreach (SevenZipArchiveEntry entry in sza.Entries)
{
entry.WriteToDirectory(outDir, new ExtractionOptions { PreserveFileTime = true, ExtractFullPath = true, Overwrite = true });
@@ -157,7 +157,7 @@ namespace SabreTools.Library.FileTypes
try
{
- SevenZipArchive sza = SevenZipArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false, });
+ SharpCompress.Archives.SevenZip.SevenZipArchive sza = SharpCompress.Archives.SevenZip.SevenZipArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false, });
foreach (SevenZipArchiveEntry entry in sza.Entries)
{
if (entry != null && !entry.IsDirectory && entry.Key.Contains(entryName))
@@ -198,7 +198,7 @@ namespace SabreTools.Library.FileTypes
try
{
- SevenZipArchive sza = SevenZipArchive.Open(FileTools.TryOpenRead(_filename));
+ SharpCompress.Archives.SevenZip.SevenZipArchive sza = SharpCompress.Archives.SevenZip.SevenZipArchive.Open(FileTools.TryOpenRead(_filename));
foreach (SevenZipArchiveEntry entry in sza.Entries.Where(e => e != null && !e.IsDirectory))
{
// If secure hashes are disabled, do a quickscan
@@ -251,7 +251,7 @@ namespace SabreTools.Library.FileTypes
try
{
- SevenZipArchive sza = SevenZipArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false });
+ SharpCompress.Archives.SevenZip.SevenZipArchive sza = SharpCompress.Archives.SevenZip.SevenZipArchive.Open(_filename, new ReaderOptions { LeaveStreamOpen = false });
List sevenZipEntries = sza.Entries.OrderBy(e => e.Key, new NaturalSort.NaturalReversedComparer()).ToList();
string lastSevenZipEntry = null;
foreach (SevenZipArchiveEntry entry in sevenZipEntries)
diff --git a/SabreTools.Library/FileTypes/TorrentTarArchive.cs b/SabreTools.Library/FileTypes/TapeArchive.cs
similarity index 99%
rename from SabreTools.Library/FileTypes/TorrentTarArchive.cs
rename to SabreTools.Library/FileTypes/TapeArchive.cs
index f8e3f56b..98361715 100644
--- a/SabreTools.Library/FileTypes/TorrentTarArchive.cs
+++ b/SabreTools.Library/FileTypes/TapeArchive.cs
@@ -30,14 +30,14 @@ namespace SabreTools.Library.FileTypes
/// Represents a Torrent7zip archive for reading and writing
///
/// TODO: Don't try to read entries to MemoryStream during write
- public class TorrentTarArchive : BaseArchive
+ public class TapeArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentTarArchive with no base file
///
- public TorrentTarArchive()
+ public TapeArchive()
: base()
{
}
@@ -47,7 +47,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentTarArchive(string filename)
+ public TapeArchive(string filename)
: base(filename)
{
_archiveType = ArchiveType.Tar;
diff --git a/SabreTools.Library/FileTypes/TorrentXZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs
similarity index 99%
rename from SabreTools.Library/FileTypes/TorrentXZArchive.cs
rename to SabreTools.Library/FileTypes/XZArchive.cs
index c415be7f..4ad4a09c 100644
--- a/SabreTools.Library/FileTypes/TorrentXZArchive.cs
+++ b/SabreTools.Library/FileTypes/XZArchive.cs
@@ -26,14 +26,14 @@ namespace SabreTools.Library.FileTypes
/// Represents a TorrentXZ archive for reading and writing
///
/// TODO: Wait for XZ write to be enabled by SevenZipSharp library
- public class TorrentXZArchive : BaseArchive
+ public class XZArchive : BaseArchive
{
#region Constructors
///
/// Create a new TorrentGZipArchive with no base file
///
- public TorrentXZArchive()
+ public XZArchive()
: base()
{
}
@@ -43,7 +43,7 @@ namespace SabreTools.Library.FileTypes
///
/// Name of the file to use as an archive
/// True for opening file as read, false for opening file as write
- public TorrentXZArchive(string filename)
+ public XZArchive(string filename)
: base(filename)
{
//_archiveType = ArchiveType.XZip;
diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj
index 24e3707d..ca61f9e6 100644
--- a/SabreTools.Library/SabreTools.Library.csproj
+++ b/SabreTools.Library/SabreTools.Library.csproj
@@ -152,12 +152,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/SabreTools.Library/Tools/ArchiveTools.cs b/SabreTools.Library/Tools/ArchiveTools.cs
index 31420ecb..c31c359c 100644
--- a/SabreTools.Library/Tools/ArchiveTools.cs
+++ b/SabreTools.Library/Tools/ArchiveTools.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Text.RegularExpressions;
using SabreTools.Library.Data;
@@ -12,8 +11,6 @@ using System.IO;
using Alphaleonis.Win32.Filesystem;
using BinaryReader = System.IO.BinaryReader;
-using FileStream = System.IO.FileStream;
-using MemoryStream = System.IO.MemoryStream;
using SeekOrigin = System.IO.SeekOrigin;
using Stream = System.IO.Stream;
#endif
@@ -57,16 +54,16 @@ namespace SabreTools.Library.Tools
switch (at)
{
case ArchiveType.GZip:
- archive = new TorrentGZipArchive(input);
+ archive = new GZipArchive(input);
break;
case ArchiveType.Rar:
- archive = new TorrentRARArchive(input);
+ archive = new RarArchive(input);
break;
case ArchiveType.SevenZip:
- archive = new TorrentSevenZipArchive(input);
+ archive = new SevenZipArchive(input);
break;
case ArchiveType.Tar:
- archive = new TorrentTarArchive(input);
+ archive = new TapeArchive(input);
break;
case ArchiveType.Zip:
archive = new TorrentZipArchive(input);
@@ -86,13 +83,13 @@ namespace SabreTools.Library.Tools
switch(archiveType)
{
case ArchiveType.GZip:
- return new TorrentGZipArchive();
+ return new GZipArchive();
case ArchiveType.Rar:
- return new TorrentRARArchive();
+ return new RarArchive();
case ArchiveType.SevenZip:
- return new TorrentSevenZipArchive();
+ return new SevenZipArchive();
case ArchiveType.Tar:
- return new TorrentTarArchive();
+ return new TapeArchive();
case ArchiveType.Zip:
return new TorrentZipArchive();
default:
@@ -112,17 +109,17 @@ namespace SabreTools.Library.Tools
case OutputFormat.Folder:
return new Folder();
case OutputFormat.TapeArchive:
- return new TorrentTarArchive();
+ return new TapeArchive();
case OutputFormat.Torrent7Zip:
- return new TorrentSevenZipArchive();
+ return new SevenZipArchive();
case OutputFormat.TorrentGzip:
- return new TorrentGZipArchive();
+ return new GZipArchive();
case OutputFormat.TorrentLrzip:
- return new TorrentLRZArchive();
+ return new LRZArchive();
case OutputFormat.TorrentRar:
- return new TorrentRARArchive();
+ return new RarArchive();
case OutputFormat.TorrentXZ:
- return new TorrentXZArchive();
+ return new XZArchive();
case OutputFormat.TorrentZip:
return new TorrentZipArchive();
default: