diff --git a/src/SharpCompress/Archives/ArchiveFactory.Async.cs b/src/SharpCompress/Archives/ArchiveFactory.Async.cs index 59e16c31..8339171c 100644 --- a/src/SharpCompress/Archives/ArchiveFactory.Async.cs +++ b/src/SharpCompress/Archives/ArchiveFactory.Async.cs @@ -69,7 +69,7 @@ public static partial class ArchiveFactory options ??= new ReaderOptions { LeaveStreamOpen = false }; var factory = await FindFactoryAsync(fileInfo, cancellationToken); - return factory.OpenAsyncArchive(filesArray, options, cancellationToken); + return factory.OpenAsyncArchive(filesArray, options); } public static async ValueTask OpenAsyncArchive( diff --git a/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs b/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs index e793cd9b..56d4c541 100644 --- a/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs +++ b/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs @@ -23,11 +23,9 @@ public partial class GZipArchive { public static IWritableAsyncArchive OpenAsyncArchive( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IWritableAsyncArchive)OpenArchive( new FileInfo(path), @@ -104,41 +102,33 @@ public partial class GZipArchive public static IWritableAsyncArchive OpenAsyncArchive( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(stream, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(streams, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Archives/IArchiveOpenable.cs b/src/SharpCompress/Archives/IArchiveOpenable.cs index e5ae52b3..e36ea02b 100644 --- a/src/SharpCompress/Archives/IArchiveOpenable.cs +++ b/src/SharpCompress/Archives/IArchiveOpenable.cs @@ -20,20 +20,17 @@ public interface IArchiveOpenable public static abstract TASync OpenAsyncArchive( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); public static abstract TASync OpenAsyncArchive( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); public static abstract TASync OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); } diff --git a/src/SharpCompress/Archives/IMultiArchiveFactory.cs b/src/SharpCompress/Archives/IMultiArchiveFactory.cs index fc418ad4..936222e6 100644 --- a/src/SharpCompress/Archives/IMultiArchiveFactory.cs +++ b/src/SharpCompress/Archives/IMultiArchiveFactory.cs @@ -50,10 +50,8 @@ public interface IMultiArchiveFactory : IFactory /// /// /// reading options. - /// Cancellation token. IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); } diff --git a/src/SharpCompress/Archives/IMultiArchiveOpenable.cs b/src/SharpCompress/Archives/IMultiArchiveOpenable.cs index 53f375c0..0fed7adb 100644 --- a/src/SharpCompress/Archives/IMultiArchiveOpenable.cs +++ b/src/SharpCompress/Archives/IMultiArchiveOpenable.cs @@ -22,14 +22,12 @@ public interface IMultiArchiveOpenable public static abstract TASync OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); public static abstract TASync OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); } #endif diff --git a/src/SharpCompress/Archives/Rar/RarArchive.Factory.cs b/src/SharpCompress/Archives/Rar/RarArchive.Factory.cs index fe1eb5c3..76154b7f 100644 --- a/src/SharpCompress/Archives/Rar/RarArchive.Factory.cs +++ b/src/SharpCompress/Archives/Rar/RarArchive.Factory.cs @@ -22,11 +22,9 @@ public partial class RarArchive { public static IRarAsyncArchive OpenAsyncArchive( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IRarAsyncArchive)OpenArchive(new FileInfo(path), readerOptions); } @@ -102,41 +100,33 @@ public partial class RarArchive public static IRarAsyncArchive OpenAsyncArchive( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IRarAsyncArchive)OpenArchive(stream, readerOptions); } public static IRarAsyncArchive OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IRarAsyncArchive)OpenArchive(fileInfo, readerOptions); } public static IRarAsyncArchive OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IRarAsyncArchive)OpenArchive(streams, readerOptions); } public static IRarAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IRarAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.Factory.cs b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.Factory.cs index 614c4408..2748e07c 100644 --- a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.Factory.cs +++ b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.Factory.cs @@ -16,13 +16,8 @@ public partial class SevenZipArchive IMultiArchiveOpenable #endif { - public static IAsyncArchive OpenAsyncArchive( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncArchive OpenAsyncArchive(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty("path"); return (IAsyncArchive)OpenArchive(new FileInfo(path), readerOptions ?? new ReaderOptions()); } @@ -91,43 +86,32 @@ public partial class SevenZipArchive ); } - public static IAsyncArchive OpenAsyncArchive( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncArchive OpenAsyncArchive(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(stream, readerOptions); } public static IAsyncArchive OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfo, readerOptions); } public static IAsyncArchive OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(streams, readerOptions); } public static IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs b/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs index 959b4ab4..ad8bd8ab 100644 --- a/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs +++ b/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs @@ -87,51 +87,41 @@ public partial class TarArchive public static IWritableAsyncArchive OpenAsyncArchive( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(stream, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(new FileInfo(path), readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(streams, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs b/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs index 4904decb..c4ddc86a 100644 --- a/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs +++ b/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs @@ -87,51 +87,41 @@ public partial class ZipArchive public static IWritableAsyncArchive OpenAsyncArchive( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(path, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(stream, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList streams, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(streams, readerOptions); } public static IWritableAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Factories/GZipFactory.cs b/src/SharpCompress/Factories/GZipFactory.cs index ae4ac8b8..1030c63a 100644 --- a/src/SharpCompress/Factories/GZipFactory.cs +++ b/src/SharpCompress/Factories/GZipFactory.cs @@ -93,11 +93,9 @@ public class GZipFactory /// public IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfos, readerOptions); } @@ -166,13 +164,8 @@ public class GZipFactory } /// - public IAsyncWriter OpenAsyncWriter( - Stream stream, - WriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public IAsyncWriter OpenAsyncWriter(Stream stream, WriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); if (writerOptions.CompressionType != CompressionType.GZip) { throw new InvalidFormatException("GZip archives only support GZip compression type."); diff --git a/src/SharpCompress/Factories/LzwFactory.cs b/src/SharpCompress/Factories/LzwFactory.cs index 00083c3d..b9767064 100644 --- a/src/SharpCompress/Factories/LzwFactory.cs +++ b/src/SharpCompress/Factories/LzwFactory.cs @@ -60,7 +60,7 @@ public class LzwFactory : Factory, IReaderFactory ) { cancellationToken.ThrowIfCancellationRequested(); - return new((IAsyncReader)LzwReader.OpenReader(stream, options)); + return new(LzwReader.OpenAsyncReader(stream, options)); } #endregion diff --git a/src/SharpCompress/Factories/RarFactory.cs b/src/SharpCompress/Factories/RarFactory.cs index 11fe6cf8..f3236d2e 100644 --- a/src/SharpCompress/Factories/RarFactory.cs +++ b/src/SharpCompress/Factories/RarFactory.cs @@ -90,11 +90,9 @@ public class RarFactory : Factory, IArchiveFactory, IMultiArchiveFactory, IReade /// public IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfos, readerOptions); } diff --git a/src/SharpCompress/Factories/SevenZipFactory.cs b/src/SharpCompress/Factories/SevenZipFactory.cs index f8f4b779..0a276223 100644 --- a/src/SharpCompress/Factories/SevenZipFactory.cs +++ b/src/SharpCompress/Factories/SevenZipFactory.cs @@ -50,7 +50,7 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory /// public IAsyncArchive OpenAsyncArchive(Stream stream, ReaderOptions? readerOptions = null) => - SevenZipArchive.OpenAsyncArchive(stream, readerOptions, CancellationToken.None); + SevenZipArchive.OpenAsyncArchive(stream, readerOptions); /// public IArchive OpenArchive(FileInfo fileInfo, ReaderOptions? readerOptions = null) => @@ -58,7 +58,7 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory /// public IAsyncArchive OpenAsyncArchive(FileInfo fileInfo, ReaderOptions? readerOptions = null) => - SevenZipArchive.OpenAsyncArchive(fileInfo, readerOptions, CancellationToken.None); + SevenZipArchive.OpenAsyncArchive(fileInfo, readerOptions); #endregion @@ -74,7 +74,7 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory public IAsyncArchive OpenAsyncArchive( IReadOnlyList streams, ReaderOptions? readerOptions = null - ) => SevenZipArchive.OpenAsyncArchive(streams, readerOptions, CancellationToken.None); + ) => SevenZipArchive.OpenAsyncArchive(streams, readerOptions); /// public IArchive OpenArchive( @@ -85,9 +85,8 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory /// public IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) => SevenZipArchive.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken); + ReaderOptions? readerOptions = null + ) => SevenZipArchive.OpenAsyncArchive(fileInfos, readerOptions); #endregion diff --git a/src/SharpCompress/Factories/TarFactory.cs b/src/SharpCompress/Factories/TarFactory.cs index 8857cca7..19836cd6 100644 --- a/src/SharpCompress/Factories/TarFactory.cs +++ b/src/SharpCompress/Factories/TarFactory.cs @@ -144,11 +144,9 @@ public class TarFactory /// public IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfos, readerOptions); } @@ -220,13 +218,8 @@ public class TarFactory new TarWriter(stream, new TarWriterOptions(writerOptions)); /// - public IAsyncWriter OpenAsyncWriter( - Stream stream, - WriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public IAsyncWriter OpenAsyncWriter(Stream stream, WriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(stream, writerOptions); } diff --git a/src/SharpCompress/Factories/ZipFactory.cs b/src/SharpCompress/Factories/ZipFactory.cs index 573c95bf..3108c3d2 100644 --- a/src/SharpCompress/Factories/ZipFactory.cs +++ b/src/SharpCompress/Factories/ZipFactory.cs @@ -153,11 +153,9 @@ public class ZipFactory /// public IAsyncArchive OpenAsyncArchive( IReadOnlyList fileInfos, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncArchive)OpenArchive(fileInfos, readerOptions); } @@ -189,13 +187,8 @@ public class ZipFactory new ZipWriter(stream, new ZipWriterOptions(writerOptions)); /// - public IAsyncWriter OpenAsyncWriter( - Stream stream, - WriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public IAsyncWriter OpenAsyncWriter(Stream stream, WriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(stream, writerOptions); } diff --git a/src/SharpCompress/Readers/Ace/AceReader.Factory.cs b/src/SharpCompress/Readers/Ace/AceReader.Factory.cs index 8daa344e..9f873d77 100644 --- a/src/SharpCompress/Readers/Ace/AceReader.Factory.cs +++ b/src/SharpCompress/Readers/Ace/AceReader.Factory.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Ace; @@ -34,24 +33,14 @@ public partial class AceReader return new MultiVolumeAceReader(streams, options ?? new ReaderOptions()); } - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } @@ -66,11 +55,9 @@ public partial class AceReader public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/Arc/ArcReader.Factory.cs b/src/SharpCompress/Readers/Arc/ArcReader.Factory.cs index 22ec2666..abfad14a 100644 --- a/src/SharpCompress/Readers/Arc/ArcReader.Factory.cs +++ b/src/SharpCompress/Readers/Arc/ArcReader.Factory.cs @@ -1,40 +1,27 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Arc; public partial class ArcReader : IReaderOpenable { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/Arj/ArjReader.Factory.cs b/src/SharpCompress/Readers/Arj/ArjReader.Factory.cs index f0f7b01b..7a84f4c2 100644 --- a/src/SharpCompress/Readers/Arj/ArjReader.Factory.cs +++ b/src/SharpCompress/Readers/Arj/ArjReader.Factory.cs @@ -1,40 +1,27 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Arj; public partial class ArjReader : IReaderOpenable { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/GZip/GZipReader.Factory.cs b/src/SharpCompress/Readers/GZip/GZipReader.Factory.cs index 3132d139..55e96e73 100644 --- a/src/SharpCompress/Readers/GZip/GZipReader.Factory.cs +++ b/src/SharpCompress/Readers/GZip/GZipReader.Factory.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; namespace SharpCompress.Readers.GZip; @@ -8,34 +7,22 @@ public partial class GZipReader : IReaderOpenable #endif { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/IReaderOpenable.cs b/src/SharpCompress/Readers/IReaderOpenable.cs index a421a49e..ea42b827 100644 --- a/src/SharpCompress/Readers/IReaderOpenable.cs +++ b/src/SharpCompress/Readers/IReaderOpenable.cs @@ -17,20 +17,17 @@ public interface IReaderOpenable public static abstract IAsyncReader OpenAsyncReader( string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); public static abstract IAsyncReader OpenAsyncReader( Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); public static abstract IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ); } #endif diff --git a/src/SharpCompress/Readers/Lzw/LzwReader.Factory.cs b/src/SharpCompress/Readers/Lzw/LzwReader.Factory.cs index 59448f14..344a9572 100644 --- a/src/SharpCompress/Readers/Lzw/LzwReader.Factory.cs +++ b/src/SharpCompress/Readers/Lzw/LzwReader.Factory.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; namespace SharpCompress.Readers.Lzw; @@ -8,34 +7,22 @@ public partial class LzwReader : IReaderOpenable #endif { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/Rar/RarReader.Factory.cs b/src/SharpCompress/Readers/Rar/RarReader.Factory.cs index 775b3764..5fa1cba0 100644 --- a/src/SharpCompress/Readers/Rar/RarReader.Factory.cs +++ b/src/SharpCompress/Readers/Rar/RarReader.Factory.cs @@ -1,40 +1,27 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Rar; public partial class RarReader : IReaderOpenable { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } } diff --git a/src/SharpCompress/Readers/Tar/TarReader.Factory.cs b/src/SharpCompress/Readers/Tar/TarReader.Factory.cs index 801440a7..b8f41e60 100644 --- a/src/SharpCompress/Readers/Tar/TarReader.Factory.cs +++ b/src/SharpCompress/Readers/Tar/TarReader.Factory.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Tar; @@ -9,34 +8,22 @@ public partial class TarReader : IReaderOpenable #endif { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Readers/Zip/ZipReader.Factory.cs b/src/SharpCompress/Readers/Zip/ZipReader.Factory.cs index 289059fc..f03ea4ab 100644 --- a/src/SharpCompress/Readers/Zip/ZipReader.Factory.cs +++ b/src/SharpCompress/Readers/Zip/ZipReader.Factory.cs @@ -1,40 +1,27 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Readers.Zip; public partial class ZipReader : IReaderOpenable { - public static IAsyncReader OpenAsyncReader( - string path, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(string path, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); path.NotNullOrEmpty(nameof(path)); return (IAsyncReader)OpenReader(new FileInfo(path), readerOptions); } - public static IAsyncReader OpenAsyncReader( - Stream stream, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default - ) + public static IAsyncReader OpenAsyncReader(Stream stream, ReaderOptions? readerOptions = null) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(stream, readerOptions); } public static IAsyncReader OpenAsyncReader( FileInfo fileInfo, - ReaderOptions? readerOptions = null, - CancellationToken cancellationToken = default + ReaderOptions? readerOptions = null ) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncReader)OpenReader(fileInfo, readerOptions); } diff --git a/src/SharpCompress/Writers/GZip/GZipWriter.Factory.cs b/src/SharpCompress/Writers/GZip/GZipWriter.Factory.cs index 7fd8aec1..715bdc22 100644 --- a/src/SharpCompress/Writers/GZip/GZipWriter.Factory.cs +++ b/src/SharpCompress/Writers/GZip/GZipWriter.Factory.cs @@ -1,6 +1,5 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Writers.GZip; @@ -25,33 +24,18 @@ public partial class GZipWriter : IWriterOpenable return new GZipWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - string path, - GZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(string path, GZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(path, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - Stream stream, - GZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(Stream stream, GZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - FileInfo fileInfo, - GZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(FileInfo fileInfo, GZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(fileInfo, writerOptions); } } diff --git a/src/SharpCompress/Writers/IWriterFactory.cs b/src/SharpCompress/Writers/IWriterFactory.cs index f8bd8bde..9095231a 100644 --- a/src/SharpCompress/Writers/IWriterFactory.cs +++ b/src/SharpCompress/Writers/IWriterFactory.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; using SharpCompress.Factories; namespace SharpCompress.Writers; @@ -8,9 +7,5 @@ public interface IWriterFactory : IFactory { IWriter OpenWriter(Stream stream, WriterOptions writerOptions); - IAsyncWriter OpenAsyncWriter( - Stream stream, - WriterOptions writerOptions, - CancellationToken cancellationToken = default - ); + IAsyncWriter OpenAsyncWriter(Stream stream, WriterOptions writerOptions); } diff --git a/src/SharpCompress/Writers/IWriterOpenable.cs b/src/SharpCompress/Writers/IWriterOpenable.cs index 14b98f71..d3102a02 100644 --- a/src/SharpCompress/Writers/IWriterOpenable.cs +++ b/src/SharpCompress/Writers/IWriterOpenable.cs @@ -18,24 +18,20 @@ public interface IWriterOpenable /// The stream to write to. /// The archive type. /// Writer options. - /// Cancellation token. /// A task that returns an IWriter. public static abstract IAsyncWriter OpenAsyncWriter( Stream stream, - TWriterOptions writerOptions, - CancellationToken cancellationToken = default + TWriterOptions writerOptions ); public static abstract IAsyncWriter OpenAsyncWriter( string filePath, - TWriterOptions writerOptions, - CancellationToken cancellationToken = default + TWriterOptions writerOptions ); public static abstract IAsyncWriter OpenAsyncWriter( FileInfo fileInfo, - TWriterOptions writerOptions, - CancellationToken cancellationToken = default + TWriterOptions writerOptions ); } #endif diff --git a/src/SharpCompress/Writers/Tar/TarWriter.Factory.cs b/src/SharpCompress/Writers/Tar/TarWriter.Factory.cs index c5f9c846..d7077478 100644 --- a/src/SharpCompress/Writers/Tar/TarWriter.Factory.cs +++ b/src/SharpCompress/Writers/Tar/TarWriter.Factory.cs @@ -1,6 +1,5 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Writers.Tar; @@ -25,33 +24,18 @@ public partial class TarWriter : IWriterOpenable return new TarWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - string path, - TarWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(string path, TarWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(path, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - Stream stream, - TarWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(Stream stream, TarWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - FileInfo fileInfo, - TarWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(FileInfo fileInfo, TarWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(fileInfo, writerOptions); } } diff --git a/src/SharpCompress/Writers/WriterFactory.cs b/src/SharpCompress/Writers/WriterFactory.cs index 3d482541..ebf18625 100644 --- a/src/SharpCompress/Writers/WriterFactory.cs +++ b/src/SharpCompress/Writers/WriterFactory.cs @@ -1,7 +1,6 @@ using System; using System.IO; using System.Linq; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Writers; @@ -31,32 +30,24 @@ public static class WriterFactory public static IAsyncWriter OpenAsyncWriter( string filePath, ArchiveType archiveType, - WriterOptions writerOptions, - CancellationToken cancellationToken = default + WriterOptions writerOptions ) { filePath.NotNullOrEmpty(nameof(filePath)); - return OpenAsyncWriter( - new FileInfo(filePath), - archiveType, - writerOptions, - cancellationToken - ); + return OpenAsyncWriter(new FileInfo(filePath), archiveType, writerOptions); } public static IAsyncWriter OpenAsyncWriter( FileInfo fileInfo, ArchiveType archiveType, - WriterOptions writerOptions, - CancellationToken cancellationToken = default + WriterOptions writerOptions ) { fileInfo.NotNull(nameof(fileInfo)); return OpenAsyncWriter( fileInfo.Open(FileMode.Create, FileAccess.Write), archiveType, - writerOptions, - cancellationToken + writerOptions ); } @@ -84,13 +75,11 @@ public static class WriterFactory /// The stream to write to. /// The archive type. /// Writer options. - /// Cancellation token. /// A task that returns an IWriter. public static IAsyncWriter OpenAsyncWriter( Stream stream, ArchiveType archiveType, - WriterOptions writerOptions, - CancellationToken cancellationToken = default + WriterOptions writerOptions ) { var factory = Factories @@ -99,7 +88,7 @@ public static class WriterFactory if (factory != null) { - return factory.OpenAsyncWriter(stream, writerOptions, cancellationToken); + return factory.OpenAsyncWriter(stream, writerOptions); } throw new NotSupportedException("Archive Type does not have a Writer: " + archiveType); diff --git a/src/SharpCompress/Writers/Zip/ZipWriter.Factory.cs b/src/SharpCompress/Writers/Zip/ZipWriter.Factory.cs index 0df1a81c..c4083aea 100644 --- a/src/SharpCompress/Writers/Zip/ZipWriter.Factory.cs +++ b/src/SharpCompress/Writers/Zip/ZipWriter.Factory.cs @@ -1,6 +1,5 @@ #if NET8_0_OR_GREATER using System.IO; -using System.Threading; using SharpCompress.Common; namespace SharpCompress.Writers.Zip; @@ -25,33 +24,18 @@ public partial class ZipWriter : IWriterOpenable return new ZipWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - string path, - ZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(string path, ZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(path, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - Stream stream, - ZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(Stream stream, ZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(stream, writerOptions); } - public static IAsyncWriter OpenAsyncWriter( - FileInfo fileInfo, - ZipWriterOptions writerOptions, - CancellationToken cancellationToken = default - ) + public static IAsyncWriter OpenAsyncWriter(FileInfo fileInfo, ZipWriterOptions writerOptions) { - cancellationToken.ThrowIfCancellationRequested(); return (IAsyncWriter)OpenWriter(fileInfo, writerOptions); } } diff --git a/tests/SharpCompress.Test/ReaderTests.cs b/tests/SharpCompress.Test/ReaderTests.cs index a6e1c25b..bab9d9f5 100644 --- a/tests/SharpCompress.Test/ReaderTests.cs +++ b/tests/SharpCompress.Test/ReaderTests.cs @@ -174,8 +174,7 @@ public abstract class ReaderTests : TestBase await using ( var reader = await ReaderFactory.OpenAsyncReader( new AsyncOnlyStream(testStream), - options, - cancellationToken + options ) ) { diff --git a/tests/SharpCompress.Test/WriterTests.cs b/tests/SharpCompress.Test/WriterTests.cs index f02b65d7..a04e92cc 100644 --- a/tests/SharpCompress.Test/WriterTests.cs +++ b/tests/SharpCompress.Test/WriterTests.cs @@ -94,8 +94,7 @@ public class WriterTests : TestBase await using var reader = await ReaderFactory.OpenAsyncReader( new AsyncOnlyStream(SharpCompressStream.CreateNonDisposing(stream)), - readerOptions, - cancellationToken + readerOptions ); await reader.WriteAllToDirectoryAsync( SCRATCH_FILES_PATH,