Skip to content

Commit

Permalink
update csharpier
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhathcock committed Mar 21, 2023
1 parent 0129b31 commit 16e8dd4
Show file tree
Hide file tree
Showing 94 changed files with 320 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.21.0",
"version": "0.23.0",
"commands": [
"dotnet-csharpier"
]
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/AbstractWritableArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public void Dispose()
private bool hasModifications;
private bool pauseRebuilding;

internal AbstractWritableArchive(ArchiveType type) : base(type) { }
internal AbstractWritableArchive(ArchiveType type)
: base(type) { }

internal AbstractWritableArchive(ArchiveType type, SourceStream srcStream)
: base(type, srcStream) { }
Expand Down
6 changes: 4 additions & 2 deletions src/SharpCompress/Archives/ArchiveFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,16 @@ public static void WriteToDirectory(
}
}

private static T FindFactory<T>(FileInfo finfo) where T : IFactory
private static T FindFactory<T>(FileInfo finfo)
where T : IFactory
{
finfo.CheckNotNull(nameof(finfo));
using Stream stream = finfo.OpenRead();
return FindFactory<T>(stream);
}

private static T FindFactory<T>(Stream stream) where T : IFactory
private static T FindFactory<T>(Stream stream)
where T : IFactory
{
stream.CheckNotNull(nameof(stream));
if (!stream.CanRead || !stream.CanSeek)
Expand Down
6 changes: 4 additions & 2 deletions src/SharpCompress/Archives/GZip/GZipArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ public static GZipArchive Open(Stream stream, ReaderOptions? readerOptions = nul
/// </summary>
/// <param name="srcStream"></param>
/// <param name="options"></param>
internal GZipArchive(SourceStream srcStream) : base(ArchiveType.Tar, srcStream) { }
internal GZipArchive(SourceStream srcStream)
: base(ArchiveType.Tar, srcStream) { }

protected override IEnumerable<GZipVolume> LoadVolumes(SourceStream srcStream)
{
Expand Down Expand Up @@ -150,7 +151,8 @@ public static bool IsGZipFile(Stream stream)
return true;
}

internal GZipArchive() : base(ArchiveType.GZip) { }
internal GZipArchive()
: base(ArchiveType.GZip) { }

protected override GZipArchiveEntry CreateEntryInternal(
string filePath,
Expand Down
4 changes: 2 additions & 2 deletions src/SharpCompress/Archives/GZip/GZipArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace SharpCompress.Archives.GZip;

public class GZipArchiveEntry : GZipEntry, IArchiveEntry
{
internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part) : base(part) =>
Archive = archive;
internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part)
: base(part) => Archive = archive;

public virtual Stream OpenEntryStream()
{
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/GZip/GZipWritableArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ internal GZipWritableArchiveEntry(
long size,
DateTime? lastModified,
bool closeStream
) : base(archive, null)
)
: base(archive, null)
{
this.stream = stream;
Key = path;
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Rar/FileInfoRarFilePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ internal FileInfoRarFilePart(
MarkHeader mh,
FileHeader fh,
FileInfo fi
) : base(mh, fh, volume.Index, volume.Stream, password) => FileInfo = fi;
)
: base(mh, fh, volume.Index, volume.Stream, password) => FileInfo = fi;

internal FileInfo FileInfo { get; }

Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Rar/RarArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
/// </summary>
/// <param name="srcStream"></param>
/// <param name="options"></param>
internal RarArchive(SourceStream srcStream) : base(ArchiveType.Rar, srcStream) { }
internal RarArchive(SourceStream srcStream)
: base(ArchiveType.Rar, srcStream) { }

protected override IEnumerable<RarArchiveEntry> LoadEntries(IEnumerable<RarVolume> volumes) =>
RarArchiveEntryFactory.GetEntries(this, volumes, ReaderOptions);
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Rar/RarArchiveVolumeFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ internal static class RarArchiveVolumeFactory
m.Groups[1].Value,
index == 0
? m.Groups[2].Value + m.Groups[3].Value
: (char)(m.Groups[2].Value[0] + ((index - 1)/100)) + (index - 1).ToString("D4").Substring(2)
: (char)(m.Groups[2].Value[0] + ((index - 1) / 100))
+ (index - 1).ToString("D4").Substring(2)
)
)
);
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Rar/SeekableFilePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ internal SeekableFilePart(
int index,
Stream stream,
string? password
) : base(mh, fh, index)
)
: base(mh, fh, index)
{
this.stream = stream;
this.password = password;
Expand Down
6 changes: 4 additions & 2 deletions src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ public static SevenZipArchive Open(Stream stream, ReaderOptions readerOptions =
/// </summary>
/// <param name="srcStream"></param>
/// <param name="options"></param>
internal SevenZipArchive(SourceStream srcStream) : base(ArchiveType.SevenZip, srcStream) { }
internal SevenZipArchive(SourceStream srcStream)
: base(ArchiveType.SevenZip, srcStream) { }

protected override IEnumerable<SevenZipVolume> LoadVolumes(SourceStream srcStream)
{
Expand All @@ -125,7 +126,8 @@ public static bool IsSevenZipFile(FileInfo fileInfo)
return IsSevenZipFile(stream);
}

internal SevenZipArchive() : base(ArchiveType.SevenZip) { }
internal SevenZipArchive()
: base(ArchiveType.SevenZip) { }

protected override IEnumerable<SevenZipArchiveEntry> LoadEntries(
IEnumerable<SevenZipVolume> volumes
Expand Down
4 changes: 2 additions & 2 deletions src/SharpCompress/Archives/SevenZip/SevenZipArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace SharpCompress.Archives.SevenZip;

public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
{
internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part) : base(part) =>
Archive = archive;
internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
: base(part) => Archive = archive;

public Stream OpenEntryStream() => FilePart.GetCompressedStream();

Expand Down
6 changes: 4 additions & 2 deletions src/SharpCompress/Archives/Tar/TarArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,11 @@ protected override IEnumerable<TarVolume> LoadVolumes(SourceStream srcStream)
/// </summary>
/// <param name="srcStream"></param>
/// <param name="options"></param>
internal TarArchive(SourceStream srcStream) : base(ArchiveType.Tar, srcStream) { }
internal TarArchive(SourceStream srcStream)
: base(ArchiveType.Tar, srcStream) { }

internal TarArchive() : base(ArchiveType.Tar) { }
internal TarArchive()
: base(ArchiveType.Tar) { }

protected override IEnumerable<TarArchiveEntry> LoadEntries(IEnumerable<TarVolume> volumes)
{
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Tar/TarWritableArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ internal TarWritableArchiveEntry(
long size,
DateTime? lastModified,
bool closeStream
) : base(archive, null, compressionType)
)
: base(archive, null, compressionType)
{
this.stream = stream;
Key = path;
Expand Down
6 changes: 4 additions & 2 deletions src/SharpCompress/Archives/Zip/ZipArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
/// </summary>
/// <param name="srcStream"></param>
/// <param name="options"></param>
internal ZipArchive(SourceStream srcStream) : base(ArchiveType.Zip, srcStream) =>
internal ZipArchive(SourceStream srcStream)
: base(ArchiveType.Zip, srcStream) =>
headerFactory = new SeekableZipHeaderFactory(
srcStream.ReaderOptions.Password,
srcStream.ReaderOptions.ArchiveEncoding
Expand Down Expand Up @@ -217,7 +218,8 @@ protected override IEnumerable<ZipVolume> LoadVolumes(SourceStream srcStream)
return new ZipVolume(SrcStream, ReaderOptions, idx++).AsEnumerable();
}

internal ZipArchive() : base(ArchiveType.Zip) { }
internal ZipArchive()
: base(ArchiveType.Zip) { }

protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
{
Expand Down
4 changes: 2 additions & 2 deletions src/SharpCompress/Archives/Zip/ZipArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace SharpCompress.Archives.Zip;

public class ZipArchiveEntry : ZipEntry, IArchiveEntry
{
internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart? part) : base(part) =>
Archive = archive;
internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart? part)
: base(part) => Archive = archive;

public virtual Stream OpenEntryStream() => Parts.Single().GetCompressedStream();

Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Archives/Zip/ZipWritableArchiveEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ internal ZipWritableArchiveEntry(
long size,
DateTime? lastModified,
bool closeStream
) : base(archive, null)
)
: base(archive, null)
{
this.stream = stream;
Key = path;
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/ArchiveEncoding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public class ArchiveEncoding
/// <returns>string Func(bytes, index, length)</returns>
public Func<byte[], int, int, string>? CustomDecoder { get; set; }

public ArchiveEncoding() : this(Encoding.Default, Encoding.Default) { }
public ArchiveEncoding()
: this(Encoding.Default, Encoding.Default) { }

public ArchiveEncoding(Encoding def, Encoding password)
{
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/ArchiveException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ namespace SharpCompress.Common;

public class ArchiveException : Exception
{
public ArchiveException(string message) : base(message) { }
public ArchiveException(string message)
: base(message) { }
}
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/CryptographicException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ namespace SharpCompress.Common;

public class CryptographicException : Exception
{
public CryptographicException(string message) : base(message) { }
public CryptographicException(string message)
: base(message) { }
}
6 changes: 4 additions & 2 deletions src/SharpCompress/Common/ExtractionException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ namespace SharpCompress.Common;

public class ExtractionException : Exception
{
public ExtractionException(string message) : base(message) { }
public ExtractionException(string message)
: base(message) { }

public ExtractionException(string message, Exception inner) : base(message, inner) { }
public ExtractionException(string message, Exception inner)
: base(message, inner) { }
}
16 changes: 8 additions & 8 deletions src/SharpCompress/Common/FlagUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ internal static class FlagUtility
/// <param name="bitField">Flagged variable</param>
/// <param name="flag">Flag to test</param>
/// <returns></returns>
public static bool HasFlag<T>(long bitField, T flag) where T : struct =>
HasFlag(bitField, flag);
public static bool HasFlag<T>(long bitField, T flag)
where T : struct => HasFlag(bitField, flag);

/// <summary>
/// Returns true if the flag is set on the specified bit field.
Expand All @@ -23,8 +23,8 @@ public static bool HasFlag<T>(long bitField, T flag) where T : struct =>
/// <param name="bitField">Flagged variable</param>
/// <param name="flag">Flag to test</param>
/// <returns></returns>
public static bool HasFlag<T>(ulong bitField, T flag) where T : struct =>
HasFlag(bitField, flag);
public static bool HasFlag<T>(ulong bitField, T flag)
where T : struct => HasFlag(bitField, flag);

/// <summary>
/// Returns true if the flag is set on the specified bit field.
Expand All @@ -45,8 +45,8 @@ public static bool HasFlag<T>(ulong bitField, T flag) where T : struct =>
/// <param name="bitField">Flagged variable</param>
/// <param name="flag">Flag to test</param>
/// <returns></returns>
public static bool HasFlag<T>(T bitField, T flag) where T : struct =>
HasFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag));
public static bool HasFlag<T>(T bitField, T flag)
where T : struct => HasFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag));

/// <summary>
/// Returns true if the flag is set on the specified bit field.
Expand Down Expand Up @@ -81,6 +81,6 @@ public static long SetFlag(long bitField, long flag, bool on)
/// <param name="flag">Flag to change</param>
/// <param name="on">bool</param>
/// <returns>The flagged variable with the flag changed</returns>
public static long SetFlag<T>(T bitField, T flag, bool on) where T : struct =>
SetFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag), on);
public static long SetFlag<T>(T bitField, T flag, bool on)
where T : struct => SetFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag), on);
}
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/GZip/GZipFilePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ internal sealed class GZipFilePart : FilePart
private string? _name;
private readonly Stream _stream;

internal GZipFilePart(Stream stream, ArchiveEncoding archiveEncoding) : base(archiveEncoding)
internal GZipFilePart(Stream stream, ArchiveEncoding archiveEncoding)
: base(archiveEncoding)
{
_stream = stream;
ReadAndValidateGzipHeader();
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/IncompleteArchiveException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ namespace SharpCompress.Common;

public class IncompleteArchiveException : ArchiveException
{
public IncompleteArchiveException(string message) : base(message) { }
public IncompleteArchiveException(string message)
: base(message) { }
}
6 changes: 4 additions & 2 deletions src/SharpCompress/Common/InvalidFormatException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ namespace SharpCompress.Common;

public class InvalidFormatException : ExtractionException
{
public InvalidFormatException(string message) : base(message) { }
public InvalidFormatException(string message)
: base(message) { }

public InvalidFormatException(string message, Exception inner) : base(message, inner) { }
public InvalidFormatException(string message, Exception inner)
: base(message, inner) { }
}
7 changes: 4 additions & 3 deletions src/SharpCompress/Common/MultiVolumeExtractionException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ namespace SharpCompress.Common;

public class MultiVolumeExtractionException : ExtractionException
{
public MultiVolumeExtractionException(string message) : base(message) { }
public MultiVolumeExtractionException(string message)
: base(message) { }

public MultiVolumeExtractionException(string message, Exception inner) : base(message, inner)
{ }
public MultiVolumeExtractionException(string message, Exception inner)
: base(message, inner) { }
}
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/MultipartStreamRequiredException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ namespace SharpCompress.Common;

public class MultipartStreamRequiredException : ExtractionException
{
public MultipartStreamRequiredException(string message) : base(message) { }
public MultipartStreamRequiredException(string message)
: base(message) { }
}
6 changes: 4 additions & 2 deletions src/SharpCompress/Common/PasswordProtectedException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ namespace SharpCompress.Common;

public class PasswordProtectedException : ExtractionException
{
public PasswordProtectedException(string message) : base(message) { }
public PasswordProtectedException(string message)
: base(message) { }

public PasswordProtectedException(string message, Exception inner) : base(message, inner) { }
public PasswordProtectedException(string message, Exception inner)
: base(message, inner) { }
}
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/Rar/RarCrcBinaryReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ internal class RarCrcBinaryReader : MarkingBinaryReader
{
private uint _currentCrc;

public RarCrcBinaryReader(Stream stream) : base(stream) { }
public RarCrcBinaryReader(Stream stream)
: base(stream) { }

public uint GetCrc32() => ~_currentCrc;

Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/Rar/RarCryptoBinaryReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ internal sealed class RarCryptoBinaryReader : RarCrcBinaryReader
private readonly Queue<byte> _data = new Queue<byte>();
private long _readCount;

public RarCryptoBinaryReader(Stream stream, string password) : base(stream)
public RarCryptoBinaryReader(Stream stream, string password)
: base(stream)
{
_password = password;

Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/Rar/RarFilePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ namespace SharpCompress.Common.Rar;
/// </summary>
internal abstract class RarFilePart : FilePart
{
internal RarFilePart(MarkHeader mh, FileHeader fh, int index) : base(fh.ArchiveEncoding)
internal RarFilePart(MarkHeader mh, FileHeader fh, int index)
: base(fh.ArchiveEncoding)
{
MarkHeader = mh;
FileHeader = fh;
Expand Down
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/SevenZip/SevenZipFilePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ internal SevenZipFilePart(
int index,
CFileItem fileEntry,
ArchiveEncoding archiveEncoding
) : base(archiveEncoding)
)
: base(archiveEncoding)
{
_stream = stream;
_database = database;
Expand Down
Loading

0 comments on commit 16e8dd4

Please sign in to comment.