[FileTypes/] Add remaining unimplemented types

SabreTools.Library/DatFiles/DatFile.cs

@@ -3942,7 +3942,7 @@ namespace SabreTools.Library.DatFiles
 				case OutputFormat.TorrentGzip:
 					format = "TorrentGZ";
 					break;
-				case OutputFormat.TorrentLrzip:
+				case OutputFormat.TorrentLRZip:
 					format = "TorrentLRZ";
 					break;
 				case OutputFormat.TorrentRar:
@@ -4120,7 +4120,7 @@ namespace SabreTools.Library.DatFiles
 				case OutputFormat.TorrentGzip:
 					format = "TorrentGZ";
 					break;
-				case OutputFormat.TorrentLrzip:
+				case OutputFormat.TorrentLRZip:
 					format = "TorrentLRZ";
 					break;
 				case OutputFormat.TorrentRar:

SabreTools.Library/Data/Enums.cs

@@ -100,11 +100,14 @@
 		TorrentGzip = 2,
 		TapeArchive = 5,
 
-		// Currently unimplemented
+		// Currently unimplemented fully
 		Torrent7Zip = 3,
 		TorrentRar = 4,
 		TorrentXZ = 6,
-		TorrentLrzip = 7,
+		TorrentLRZip = 7,
+		TorrentLZ4 = 8,
+		TorrentZstd = 9,
+		TorrentZPAQ = 10,
 	}
 
 	/// <summary>

SabreTools.Library/FileTypes/LRZipArchive.cs

@@ -16,25 +16,24 @@ namespace SabreTools.Library.FileTypes
 	/// <summary>
 	/// Represents a TorrentLRZip archive for reading and writing
 	/// </summary>
-	/// TODO: LRZIP: https://github.com/ckolivas/lrzip
-	public class LRZArchive : BaseArchive
+	/// TODO: Implement from source at https://github.com/ckolivas/lrzip
+	public class LRZipArchive : BaseArchive
 	{
 		#region Constructors
 
 		/// <summary>
-		/// Create a new TorrentGZipArchive with no base file
+		/// Create a new LRZipArchive with no base file
 		/// </summary>
-		public LRZArchive()
+		public LRZipArchive()
 			: base()
 		{
 		}
 
 		/// <summary>
-		/// Create a new TorrentGZipArchive from the given file
+		/// Create a new LRZipArchive from the given file
 		/// </summary>
 		/// <param name="filename">Name of the file to use as an archive</param>
-		/// <param name="read">True for opening file as read, false for opening file as write</param>
-		public LRZArchive(string filename)
+		public LRZipArchive(string filename)
 			: base(filename)
 		{
 			//_archiveType = ArchiveType.LRZip;

SabreTools.Library/FileTypes/LZ4Archive.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+
+using SabreTools.Library.Data;
+using SabreTools.Library.Items;
+
+#if MONO
+using System.IO;
+#else
+using MemoryStream = System.IO.MemoryStream;
+using Stream = System.IO.Stream;
+#endif
+
+namespace SabreTools.Library.FileTypes
+{
+	/// <summary>
+	/// Represents a TorrentLRZip archive for reading and writing
+	/// </summary>
+	/// TODO: Implement from source at https://github.com/lz4/lz4
+	public class LZ4Archive : BaseArchive
+	{
+		#region Constructors
+
+		/// <summary>
+		/// Create a new LZ4Archive with no base file
+		/// </summary>
+		public LZ4Archive()
+			: base()
+		{
+		}
+
+		/// <summary>
+		/// Create a new LZ4Archive from the given file
+		/// </summary>
+		/// <param name="filename">Name of the file to use as an archive</param>
+		public LZ4Archive(string filename)
+			: base(filename)
+		{
+			//_archiveType = ArchiveType.LRZip;
+		}
+
+		#endregion
+
+		#region Extraction
+
+		/// <summary>
+		/// Attempt to extract a file as an archive
+		/// </summary>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>True if the extraction was a success, false otherwise</returns>
+		public override bool ExtractAll(string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a file from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>Name of the extracted file, null on error</returns>
+		public override string ExtractEntry(string entryName, string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a stream from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="realEntry">Output representing the entry name that was found</param>
+		/// <returns>MemoryStream representing the entry, null on error</returns>
+		public override (MemoryStream, string) ExtractEntryStream(string entryName)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Information
+
+		/// <summary>
+		/// Generate a list of DatItem objects from the header values in an archive
+		/// </summary>
+		/// <param name="omitFromScan">Hash representing the hashes that should be skipped</param>
+		/// <param name="date">True if entry dates should be included, false otherwise (default)</param>
+		/// <returns>List of DatItem objects representing the found data</returns>
+		/// <remarks>TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually</remarks>
+		public override List<Rom> GetArchiveFileInfo(Hash omitFromScan = Hash.DeepHashes, bool date = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Generate a list of empty folders in an archive
+		/// </summary>
+		/// <param name="input">Input file to get data from</param>
+		/// <returns>List of empty folders in the archive</returns>
+		public override List<string> GetEmptyFolders()
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Check whether the input file is a standardized format
+		/// </summary>
+		public override bool IsTorrent()
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Writing
+
+		/// <summary>
+		/// Write an input file to a torrent LZ4 file
+		/// </summary>
+		/// <param name="inputFile">Input filename to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(string inputFile, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write an input stream to a torrent LZ4 file
+		/// </summary>
+		/// <param name="inputStream">Input stream to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(Stream inputStream, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write a set of input files to a torrent LZ4 archive (assuming the same output archive name)
+		/// </summary>
+		/// <param name="inputFiles">Input files to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the archive was written properly, false otherwise</returns>
+		public override bool Write(List<string> inputFiles, string outDir, List<Rom> roms, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+	}
+}

SabreTools.Library/FileTypes/ZPAQArchive.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+
+using SabreTools.Library.Data;
+using SabreTools.Library.Items;
+
+#if MONO
+using System.IO;
+#else
+using MemoryStream = System.IO.MemoryStream;
+using Stream = System.IO.Stream;
+#endif
+
+namespace SabreTools.Library.FileTypes
+{
+	/// <summary>
+	/// Represents a ZPAQArchive archive for reading and writing
+	/// </summary>
+	/// TODO: Implement from source at https://github.com/zpaq/zpaq - In progress as external DLL
+	public class ZPAQArchive : BaseArchive
+	{
+		#region Constructors
+
+		/// <summary>
+		/// Create a new ZPAQArchive with no base file
+		/// </summary>
+		public ZPAQArchive()
+			: base()
+		{
+		}
+
+		/// <summary>
+		/// Create a new ZPAQArchive from the given file
+		/// </summary>
+		/// <param name="filename">Name of the file to use as an archive</param>
+		public ZPAQArchive(string filename)
+			: base(filename)
+		{
+			//_archiveType = ArchiveType.LRZip;
+		}
+
+		#endregion
+
+		#region Extraction
+
+		/// <summary>
+		/// Attempt to extract a file as an archive
+		/// </summary>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>True if the extraction was a success, false otherwise</returns>
+		public override bool ExtractAll(string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a file from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>Name of the extracted file, null on error</returns>
+		public override string ExtractEntry(string entryName, string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a stream from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="realEntry">Output representing the entry name that was found</param>
+		/// <returns>MemoryStream representing the entry, null on error</returns>
+		public override (MemoryStream, string) ExtractEntryStream(string entryName)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Information
+
+		/// <summary>
+		/// Generate a list of DatItem objects from the header values in an archive
+		/// </summary>
+		/// <param name="omitFromScan">Hash representing the hashes that should be skipped</param>
+		/// <param name="date">True if entry dates should be included, false otherwise (default)</param>
+		/// <returns>List of DatItem objects representing the found data</returns>
+		/// <remarks>TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually</remarks>
+		public override List<Rom> GetArchiveFileInfo(Hash omitFromScan = Hash.DeepHashes, bool date = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Generate a list of empty folders in an archive
+		/// </summary>
+		/// <param name="input">Input file to get data from</param>
+		/// <returns>List of empty folders in the archive</returns>
+		public override List<string> GetEmptyFolders()
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Check whether the input file is a standardized format
+		/// </summary>
+		public override bool IsTorrent()
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Writing
+
+		/// <summary>
+		/// Write an input file to a torrent ZPAQ file
+		/// </summary>
+		/// <param name="inputFile">Input filename to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(string inputFile, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write an input stream to a torrent ZPAQ file
+		/// </summary>
+		/// <param name="inputStream">Input stream to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(Stream inputStream, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write a set of input files to a torrent ZPAQ archive (assuming the same output archive name)
+		/// </summary>
+		/// <param name="inputFiles">Input files to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the archive was written properly, false otherwise</returns>
+		public override bool Write(List<string> inputFiles, string outDir, List<Rom> roms, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+	}
+}

SabreTools.Library/FileTypes/ZstdArchive.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+
+using SabreTools.Library.Data;
+using SabreTools.Library.Items;
+
+#if MONO
+using System.IO;
+#else
+using MemoryStream = System.IO.MemoryStream;
+using Stream = System.IO.Stream;
+#endif
+
+namespace SabreTools.Library.FileTypes
+{
+	/// <summary>
+	/// Represents a ZstdArchive archive for reading and writing
+	/// </summary>
+	/// TODO: Implement from source at https://github.com/skbkontur/ZstdNet
+	public class ZstdArchive : BaseArchive
+	{
+		#region Constructors
+
+		/// <summary>
+		/// Create a new ZstdArchive with no base file
+		/// </summary>
+		public ZstdArchive()
+			: base()
+		{
+		}
+
+		/// <summary>
+		/// Create a new ZstdArchive from the given file
+		/// </summary>
+		/// <param name="filename">Name of the file to use as an archive</param>
+		public ZstdArchive(string filename)
+			: base(filename)
+		{
+			//_archiveType = ArchiveType.LRZip;
+		}
+
+		#endregion
+
+		#region Extraction
+
+		/// <summary>
+		/// Attempt to extract a file as an archive
+		/// </summary>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>True if the extraction was a success, false otherwise</returns>
+		public override bool ExtractAll(string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a file from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="outDir">Output directory for archive extraction</param>
+		/// <returns>Name of the extracted file, null on error</returns>
+		public override string ExtractEntry(string entryName, string outDir)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Attempt to extract a stream from an archive
+		/// </summary>
+		/// <param name="entryName">Name of the entry to be extracted</param>
+		/// <param name="realEntry">Output representing the entry name that was found</param>
+		/// <returns>MemoryStream representing the entry, null on error</returns>
+		public override (MemoryStream, string) ExtractEntryStream(string entryName)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Information
+
+		/// <summary>
+		/// Generate a list of DatItem objects from the header values in an archive
+		/// </summary>
+		/// <param name="omitFromScan">Hash representing the hashes that should be skipped</param>
+		/// <param name="date">True if entry dates should be included, false otherwise (default)</param>
+		/// <returns>List of DatItem objects representing the found data</returns>
+		/// <remarks>TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually</remarks>
+		public override List<Rom> GetArchiveFileInfo(Hash omitFromScan = Hash.DeepHashes, bool date = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Generate a list of empty folders in an archive
+		/// </summary>
+		/// <param name="input">Input file to get data from</param>
+		/// <returns>List of empty folders in the archive</returns>
+		public override List<string> GetEmptyFolders()
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Check whether the input file is a standardized format
+		/// </summary>
+		public override bool IsTorrent()
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		#region Writing
+
+		/// <summary>
+		/// Write an input file to a torrent Zstd file
+		/// </summary>
+		/// <param name="inputFile">Input filename to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(string inputFile, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write an input stream to a torrent Zstd file
+		/// </summary>
+		/// <param name="inputStream">Input stream to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the write was a success, false otherwise</returns>
+		/// <remarks>This works for now, but it can be sped up by using Ionic.Zip or another zlib wrapper that allows for header values built-in. See edc's code.</remarks>
+		public override bool Write(Stream inputStream, string outDir, Rom rom, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// Write a set of input files to a torrent Zstd archive (assuming the same output archive name)
+		/// </summary>
+		/// <param name="inputFiles">Input files to be moved</param>
+		/// <param name="outDir">Output directory to build to</param>
+		/// <param name="rom">DatItem representing the new information</param>
+		/// <param name="date">True if the date from the DAT should be used if available, false otherwise (default)</param>
+		/// <param name="romba">True if files should be output in Romba depot folders, false otherwise</param>
+		/// <returns>True if the archive was written properly, false otherwise</returns>
+		public override bool Write(List<string> inputFiles, string outDir, List<Rom> roms, bool date = false, bool romba = false)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+	}
+}

SabreTools.Library/README.1ST

@@ -549,6 +549,13 @@ Options:
 			but with custom header information. This is currently unused by any
 			major application.
 			
+		-tlz4				Enable Torrent LZ4 output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent LZ4 (TLZ4) files. This format is based on the LZ4 file
+			format as defined at https://github.com/lz4/lz4 but with custom
+			header information. This is currently unused by any major
+			application.
+			
 		-trar				Enable Torrent RAR output [UNIMPLEMENTED]
 			Instead of outputting files to folder, files will be rebuilt to
 			Torrent RAR (TRAR) files. This format is based on the RAR propietary
@@ -569,6 +576,20 @@ Options:
 			by external tool RomVault (http://www.romvault.com/) and is already
 			widely used.
 		
+		-tzpaq				Enable Torrent ZPAQ output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent ZPAQ (TZPAQ) files. This format is based on the ZPAQ file
+			format as defined at https://github.com/zpaq/zpaq but with custom
+			header information. This is currently unused by any major
+			application.
+			
+		-tzstd				Enable Torrent Zstd output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent Zstd (TZstd) files. This format is based on the Zstd file
+			format as defined at https://github.com/skbkontur/ZstdNet but with
+			custom header information. This is currently unused by any major
+			application.
+			
 		-h=, --header=		Remove headers from hash calculations
 			If this is set, then all files that have copier headers that are
 			detected will have them removed from the hash calculation. This will
@@ -697,6 +718,13 @@ Options:
 			but with custom header information. This is currently unused by any
 			major application.
 			
+		-tlz4				Enable Torrent LZ4 output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent LZ4 (TLZ4) files. This format is based on the LZ4 file
+			format as defined at https://github.com/lz4/lz4 but with custom
+			header information. This is currently unused by any major
+			application.
+			
 		-trar				Enable Torrent RAR output [UNIMPLEMENTED]
 			Instead of outputting files to folder, files will be rebuilt to
 			Torrent RAR (TRAR) files. This format is based on the RAR propietary
@@ -717,6 +745,20 @@ Options:
 			by external tool RomVault (http://www.romvault.com/) and is already
 			widely used.
 			
+		-tzpaq				Enable Torrent ZPAQ output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent ZPAQ (TZPAQ) files. This format is based on the ZPAQ file
+			format as defined at https://github.com/zpaq/zpaq but with custom
+			header information. This is currently unused by any major
+			application.
+			
+		-tzstd				Enable Torrent Zstd output [UNIMPLEMENTED]
+			Instead of ouputting the files to folder, files will be rebuilt to
+			Torrent Zstd (TZstd) files. This format is based on the Zstd file
+			format as defined at https://github.com/skbkontur/ZstdNet but with
+			custom header information. This is currently unused by any major
+			application.
+			
 		-h=, --header=		Remove headers from hash calculations
 			If this is set, then all files that have copier headers that are
 			detected will have them removed from the hash calculation. This will

SabreTools.Library/SabreTools.Library.csproj

@@ -153,12 +153,15 @@
     <Compile Include="FileTypes\BaseArchive.cs" />
     <Compile Include="FileTypes\Folder.cs" />
     <Compile Include="FileTypes\GZipArchive.cs" />
-    <Compile Include="FileTypes\LRZArchive.cs" />
+    <Compile Include="FileTypes\LRZipArchive.cs" />
+    <Compile Include="FileTypes\LZ4Archive.cs" />
     <Compile Include="FileTypes\RarArchive.cs" />
     <Compile Include="FileTypes\SevenZipArchive.cs" />
     <Compile Include="FileTypes\TapeArchive.cs" />
     <Compile Include="FileTypes\XZArchive.cs" />
     <Compile Include="FileTypes\TorrentZipArchive.cs" />
+    <Compile Include="FileTypes\ZPAQArchive.cs" />
+    <Compile Include="FileTypes\ZstdArchive.cs" />
     <Compile Include="Items\Archive.cs" />
     <Compile Include="Items\BiosSet.cs" />
     <Compile Include="DatFiles\DatFile.cs" />

SabreTools.Library/Tools/ArchiveTools.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.FileTypes;
-using SabreTools.Library.Items;
 
 #if MONO
 using System.IO;
@@ -21,15 +19,9 @@ namespace SabreTools.Library.Tools
 	/// <summary>
 	/// Tools for working with archives
 	/// </summary>
-	/// <remarks>
-	/// TODO: Full archive support for: RAR, LRZip, ZPAQ?, Zstd?, LZ4?
-	/// ZPAQ: https://github.com/zpaq/zpaq - In progress as external DLL
-	/// Zstd: https://github.com/skbkontur/ZstdNet
-	/// LZ4: https://github.com/lz4/lz4
-	/// </remarks>
 	public static class ArchiveTools
 	{
-		#region Factory
+		#region Factories
 
 		/// <summary>
 		/// Create an archive of the specified type, if possible
@@ -114,8 +106,8 @@ namespace SabreTools.Library.Tools
 					return new SevenZipArchive();
 				case OutputFormat.TorrentGzip:
 					return new GZipArchive();
-				case OutputFormat.TorrentLrzip:
-					return new LRZArchive();
+				case OutputFormat.TorrentLRZip:
+					return new LRZipArchive();
 				case OutputFormat.TorrentRar:
 					return new RarArchive();
 				case OutputFormat.TorrentXZ:

SabreTools/SabreTools.Help.cs

@@ -462,6 +462,13 @@ namespace SabreTools
 				null));
 			*/
 			/*
+			sort.AddFeature("tlz4", new Feature(
+				new List<string>() { "-tlz4", "--tlz4" },
+				"Enable TorrentLZ4 output",
+				FeatureType.Flag,
+				null));
+			*/
+			/*
 			sort.AddFeature("trar", new Feature(
 				new List<string>() { "-trar", "--trar" },
 				"Enable TorrentRAR output",
@@ -480,6 +487,20 @@ namespace SabreTools
 				"Enable TorrentZip output",
 				FeatureType.Flag,
 				null));
+			/*
+			sort.AddFeature("tzpaq", new Feature(
+				new List<string>() { "-tzpaq", "--tzpaq" },
+				"Enable TorrentZPAQ output",
+				FeatureType.Flag,
+				null));
+			*/
+			/*
+			sort.AddFeature("tzstd", new Feature(
+				new List<string>() { "-tzstd", "--tzstd" },
+				"Enable TorrentZstd output",
+				FeatureType.Flag,
+				null));
+			*/
 			sort.AddFeature("header", new Feature(
 				new List<string>() { "-h", "--header" },
 				"Set a header skipper to use, blank means all",
@@ -600,6 +621,13 @@ namespace SabreTools
 				null));
 			*/
 			/*
+			sortDepot.AddFeature("tlz4", new Feature(
+				new List<string>() { "-tlz4", "--tlz4" },
+				"Enable TorrentLZ4 output",
+				FeatureType.Flag,
+				null));
+			*/
+			/*
 			sortDepot.AddFeature("trar", new Feature(
 				new List<string>() { "-trar", "--trar" },
 				"Enable TorrentRAR output",
@@ -618,6 +646,20 @@ namespace SabreTools
 				"Enable TorrentZip output",
 				FeatureType.Flag,
 				null));
+			/*
+			sortDepot.AddFeature("tzpaq", new Feature(
+				new List<string>() { "-tzpaq", "--tzpaq" },
+				"Enable TorrentZPAQ output",
+				FeatureType.Flag,
+				null));
+			*/
+			/*
+			sortDepot.AddFeature("tzstd", new Feature(
+				new List<string>() { "-tzstd", "--tzstd" },
+				"Enable TorrentZstd output",
+				FeatureType.Flag,
+				null));
+			*/
 			sortDepot.AddFeature("header", new Feature(
 				new List<string>() { "-h", "--header" },
 				"Set a header skipper to use, blank means all",

SabreTools/SabreTools.cs

@@ -615,7 +615,11 @@ namespace SabreTools
 						break;
 					case "-tlrz":
 					case "--tlrz":
-						outputFormat = OutputFormat.TorrentLrzip;
+						outputFormat = OutputFormat.TorrentLRZip;
+						break;
+					case "-lz4":
+					case "--tlz4":
+						outputFormat = OutputFormat.TorrentLZ4;
 						break;
 					case "-trar":
 					case "--trar":
@@ -637,6 +641,14 @@ namespace SabreTools
 					case "--tzip":
 						outputFormat = OutputFormat.TorrentZip;
 						break;
+					case "-tzpaq":
+					case "--tzpaq":
+						outputFormat = OutputFormat.TorrentZPAQ;
+						break;
+					case "-tzstd":
+					case "--tzstd":
+						outputFormat = OutputFormat.TorrentZstd;
+						break;
 					case "-upd":
 					case "--update-dat":
 						updateDat = true;