Merge pull request #781 from adamhathcock/fix-formatting

Update csharpier and fix formatting

Author: adamhathcock

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.25.0",
+      "version": "0.26.1",
       "commands": [
         "dotnet-csharpier"
       ]

src/SharpCompress/Archives/ArchiveFactory.cs

@@ -25,7 +25,8 @@ public static IArchive Open(Stream stream, ReaderOptions? readerOptions = null)
 
     public static IWritableArchive Create(ArchiveType type)
     {
-        var factory = Factory.Factories
+        var factory = Factory
+            .Factories
             .OfType<IWriteableArchiveFactory>()
             .FirstOrDefault(item => item.KnownArchiveType == type);
 

src/SharpCompress/Archives/Rar/RarArchive.cs

@@ -40,9 +40,9 @@ protected override IEnumerable<RarVolume> LoadVolumes(SourceStream srcStream)
             streams[1].Position = 0;
             SrcStream.Position = 0;
 
-            return srcStream.Streams.Select(
-                a => new StreamRarArchiveVolume(a, ReaderOptions, idx++)
-            );
+            return srcStream
+                .Streams
+                .Select(a => new StreamRarArchiveVolume(a, ReaderOptions, idx++));
         }
         else //split mode or single file
         {

src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs

@@ -236,11 +236,13 @@ var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder)
                 }
                 else
                 {
-                    currentStream = archive.database.GetFolderStream(
-                        stream,
-                        currentFolder,
-                        new PasswordProvider(Options.Password)
-                    );
+                    currentStream = archive
+                        .database
+                        .GetFolderStream(
+                            stream,
+                            currentFolder,
+                            new PasswordProvider(Options.Password)
+                        );
                 }
                 foreach (var entry in group)
                 {

src/SharpCompress/Common/Rar/Headers/FileHeader.cs

@@ -1,5 +1,9 @@
 #nullable disable
 
+using System;
+using System.IO;
+using System.Text;
+using SharpCompress.IO;
 #if !Rar2017_64bit
 using size_t = System.UInt32;
 #else
@@ -8,11 +12,6 @@
 using size_t = System.UInt64;
 #endif
 
-using SharpCompress.IO;
-using System;
-using System.IO;
-using System.Text;
-
 namespace SharpCompress.Common.Rar.Headers;
 
 internal class FileHeader : RarHeader

src/SharpCompress/Common/Rar/RarVolume.cs

@@ -70,11 +70,11 @@ internal IEnumerable<RarFilePart> GetVolumeFileParts()
                             var part = CreateFilePart(lastMarkHeader!, fh);
                             var buffer = new byte[fh.CompressedSize];
                             part.GetCompressedStream().Read(buffer, 0, buffer.Length);
-                            Comment = System.Text.Encoding.UTF8.GetString(
-                                buffer,
-                                0,
-                                buffer.Length - 1
-                            );
+                            Comment = System
+                                .Text
+                                .Encoding
+                                .UTF8
+                                .GetString(buffer, 0, buffer.Length - 1);
                         }
                     }
                     break;

src/SharpCompress/Common/ReaderCancelledException.cs

@@ -3,7 +3,6 @@
 namespace SharpCompress.Common;
 
 public class ReaderCancelledException : Exception
-
 {
     public ReaderCancelledException(string message)
         : base(message) { }

src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs

@@ -1,6 +1,6 @@
-using SharpCompress.IO;
-using System;
+using System;
 using System.IO;
+using SharpCompress.IO;
 
 namespace SharpCompress.Common.Tar;
 

src/SharpCompress/Common/Zip/ZipHeaderFactory.cs

@@ -142,9 +142,9 @@ private void LoadHeader(ZipFileEntry entryHeader, Stream stream)
 
             if (entryHeader.CompressionMethod == ZipCompressionMethod.WinzipAes)
             {
-                var data = entryHeader.Extra.SingleOrDefault(
-                    x => x.Type == ExtraDataType.WinZipAes
-                );
+                var data = entryHeader
+                    .Extra
+                    .SingleOrDefault(x => x.Type == ExtraDataType.WinZipAes);
                 if (data != null)
                 {
                     var keySize = (WinzipAesKeySize)data.DataBytes[4];

src/SharpCompress/Compressors/Deflate/DeflateManager.cs

@@ -69,7 +69,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-
 using SharpCompress.Algorithms;
 
 namespace SharpCompress.Compressors.Deflate;
@@ -1959,7 +1958,9 @@ _codec.OutputBuffer is null
             // returning Z_STREAM_END instead of Z_BUFF_ERROR.
         }
         else if (
-            _codec.AvailableBytesIn == 0 && (int)flush <= old_flush && flush != FlushType.Finish
+            _codec.AvailableBytesIn == 0
+            && (int)flush <= old_flush
+            && flush != FlushType.Finish
         )
         {
             // workitem 8557