Mark for 0.16.1

* commit '18641d4f9b849daea7b6fbb7edad51369534ffa3':
  Normalize Rar keys

README.md

@@ -31,6 +31,11 @@ I'm always looking for help or ideas. Please submit code or email with ideas. Un
 
 ## Version Log
 
+### Version 0.16.1
+
+* Fix [Preserve compression method when getting a compressed stream](https://github.com/adamhathcock/sharpcompress/pull/235)
+* Fix [RAR entry key normalization fix](https://github.com/adamhathcock/sharpcompress/issues/201)
+
 ### Version 0.16.0
 
 * Breaking - [Progress Event Tracking rethink](https://github.com/adamhathcock/sharpcompress/pull/226)

build.cake

@@ -22,7 +22,12 @@ Task("Test")
     var files = GetFiles("tests/**/*.csproj");
     foreach(var file in files)
     {
-        DotNetCoreTest(file.ToString());
+        var settings = new DotNetCoreTestSettings
+        {
+            Configuration = "Release"
+        };
+
+        DotNetCoreTest(file.ToString(), settings);
     }
 });
 
@@ -45,7 +50,8 @@ Task("Default")
 
  Task("RunTests")
     .IsDependentOn("Restore")
-    .IsDependentOn("Build");
+    .IsDependentOn("Build")
+    .IsDependentOn("Test");
 
 
 RunTarget(target);

src/SharpCompress/Common/ArchiveExtractionEventArgs.cs

@@ -9,6 +9,6 @@ namespace SharpCompress.Common
             Item = entry;
         }
 
-        public T Item { get; private set; }
+        public T Item { get; }
     }
 }

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

@@ -165,25 +165,13 @@ namespace SharpCompress.Common.Rar.Headers
 #if NO_FILE
             return path.Replace('\\', '/');
 #else
-            switch (os)
+            if (Path.DirectorySeparatorChar == '/')
             {
-                case HostOS.MacOS:
-                case HostOS.Unix:
-                    {
-                        if (Path.DirectorySeparatorChar == '\\')
-                        {
-                            return path.Replace('/', '\\');
-                        }
-                    }
-                    break;
-                default:
-                    {
-                        if (Path.DirectorySeparatorChar == '/')
-                        {
-                            return path.Replace('\\', '/');
-                        }
-                    }
-                    break;
+                return path.Replace('\\', '/');
+            }
+            else if (Path.DirectorySeparatorChar == '\\')
+            {
+                return path.Replace('/', '\\');
             }
             return path;
 #endif

src/SharpCompress/Common/Rar/RarFilePart.cs

@@ -14,9 +14,9 @@ namespace SharpCompress.Common.Rar
             FileHeader = fh;
         }
 
-        internal MarkHeader MarkHeader { get; private set; }
+        internal MarkHeader MarkHeader { get; }
 
-        internal FileHeader FileHeader { get; private set; }
+        internal FileHeader FileHeader { get; }
 
         internal override Stream GetRawStream()
         {

src/SharpCompress/Common/ReaderExtractionEventArgs.cs

@@ -11,7 +11,7 @@ namespace SharpCompress.Common
             ReaderProgress = readerProgress;
         }
 
-        public T Item { get; private set; }
-        public ReaderProgress ReaderProgress { get; private set; }
+        public T Item { get; }
+        public ReaderProgress ReaderProgress { get; }
     }
 }

src/SharpCompress/Common/Zip/Headers/ZipHeader.cs

@@ -10,7 +10,7 @@ namespace SharpCompress.Common.Zip.Headers
             HasData = true;
         }
 
-        internal ZipHeaderType ZipHeaderType { get; private set; }
+        internal ZipHeaderType ZipHeaderType { get; }
 
         internal abstract void Read(BinaryReader reader);
 

src/SharpCompress/Common/Zip/StreamingZipFilePart.cs

@@ -25,7 +25,7 @@ namespace SharpCompress.Common.Zip
             {
                 return Stream.Null;
             }
-            decompressionStream = CreateDecompressionStream(GetCryptoStream(CreateBaseStream()));
+            decompressionStream = CreateDecompressionStream(GetCryptoStream(CreateBaseStream()), Header.CompressionMethod);
             if (LeaveStreamOpen)
             {
                 return new NonDisposingStream(decompressionStream);

src/SharpCompress/Common/Zip/ZipFilePart.cs

@@ -21,7 +21,7 @@ namespace SharpCompress.Common.Zip
             BaseStream = stream;
         }
 
-        internal Stream BaseStream { get; private set; }
+        internal Stream BaseStream { get; }
         internal ZipFileEntry Header { get; set; }
 
         internal override string FilePartName => Header.Name;
@@ -32,7 +32,7 @@ namespace SharpCompress.Common.Zip
             {
                 return Stream.Null;
             }
-            Stream decompressionStream = CreateDecompressionStream(GetCryptoStream(CreateBaseStream()));
+            Stream decompressionStream = CreateDecompressionStream(GetCryptoStream(CreateBaseStream()), Header.CompressionMethod);
             if (LeaveStreamOpen)
             {
                 return new NonDisposingStream(decompressionStream);
@@ -53,9 +53,9 @@ namespace SharpCompress.Common.Zip
 
         protected bool LeaveStreamOpen => FlagUtility.HasFlag(Header.Flags, HeaderFlags.UsePostDataDescriptor) || Header.IsZip64;
 
-        protected Stream CreateDecompressionStream(Stream stream)
+        protected Stream CreateDecompressionStream(Stream stream, ZipCompressionMethod method)
         {
-            switch (Header.CompressionMethod)
+            switch (method)
             {
                 case ZipCompressionMethod.None:
                 {
@@ -102,9 +102,9 @@ namespace SharpCompress.Common.Zip
                     {
                         throw new InvalidFormatException("Winzip data length is not 7.");
                     }
-                    ushort method = DataConverter.LittleEndian.GetUInt16(data.DataBytes, 0);
+                    ushort compressedMethod = DataConverter.LittleEndian.GetUInt16(data.DataBytes, 0);
 
-                    if (method != 0x01 && method != 0x02)
+                    if (compressedMethod != 0x01 && compressedMethod != 0x02)
                     {
                         throw new InvalidFormatException("Unexpected vendor version number for WinZip AES metadata");
                     }
@@ -114,8 +114,7 @@ namespace SharpCompress.Common.Zip
                     {
                         throw new InvalidFormatException("Unexpected vendor ID for WinZip AES metadata");
                     }
-                    Header.CompressionMethod = (ZipCompressionMethod)DataConverter.LittleEndian.GetUInt16(data.DataBytes, 5);
-                    return CreateDecompressionStream(stream);
+                    return CreateDecompressionStream(stream, (ZipCompressionMethod)DataConverter.LittleEndian.GetUInt16(data.DataBytes, 5));
                 }
                 default:
                 {

src/SharpCompress/Compressors/Rar/Decode/AudioVariables.cs

@@ -7,7 +7,7 @@ namespace SharpCompress.Compressors.Rar.Decode
             Dif = new int[11];
         }
 
-        internal int[] Dif { get; private set; }
+        internal int[] Dif { get; }
         internal int ByteCount { get; set; }
         internal int D1 { get; set; }
 

src/SharpCompress/Compressors/Rar/Decode/Decode.cs

@@ -17,17 +17,17 @@ namespace SharpCompress.Compressors.Rar.Decode
         /// <summary> returns the decode Length array</summary>
         /// <returns> decodeLength
         /// </returns>
-        internal int[] DecodeLen { get; private set; }
+        internal int[] DecodeLen { get; }
 
         /// <summary> returns the decode num array</summary>
         /// <returns> decodeNum
         /// </returns>
-        internal int[] DecodeNum { get; private set; }
+        internal int[] DecodeNum { get; }
 
         /// <summary> returns the decodePos array</summary>
         /// <returns> decodePos
         /// </returns>
-        internal int[] DecodePos { get; private set; }
+        internal int[] DecodePos { get; }
 
         internal int MaxNum { get; set; }
     }

src/SharpCompress/Compressors/Rar/VM/VMPreparedCommand.cs

@@ -10,8 +10,8 @@ namespace SharpCompress.Compressors.Rar.VM
 
         internal VMCommands OpCode { get; set; }
         internal bool IsByteMode { get; set; }
-        internal VMPreparedOperand Op1 { get; private set; }
+        internal VMPreparedOperand Op1 { get; }
 
-        internal VMPreparedOperand Op2 { get; private set; }
+        internal VMPreparedOperand Op2 { get; }
     }
 }

src/SharpCompress/Compressors/Rar/VM/VMStandardFilterSignature.cs

@@ -9,10 +9,10 @@ namespace SharpCompress.Compressors.Rar.VM
             Type = type;
         }
 
-        internal int Length { get; private set; }
+        internal int Length { get; }
 
-        internal uint CRC { get; private set; }
+        internal uint CRC { get; }
 
-        internal VMStandardFilters Type { get; private set; }
+        internal VMStandardFilters Type { get; }
     }
 }

src/SharpCompress/Readers/ReaderProgress.cs

@@ -8,8 +8,8 @@ namespace SharpCompress.Readers
     public class ReaderProgress
     {
         private readonly IEntry _entry;
-        public long BytesTransferred { get; private set; }
-        public int Iterations { get; private set; }
+        public long BytesTransferred { get; }
+        public int Iterations { get; }
 
         public int PercentageRead => (int)Math.Round(PercentageReadExact);
         public double PercentageReadExact => (float)BytesTransferred / _entry.Size * 100;

src/SharpCompress/SharpCompress.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <AssemblyTitle>SharpCompress - Pure C# Decompression/Compression</AssemblyTitle>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>0.16.0</VersionPrefix>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
+    <VersionPrefix>0.16.1</VersionPrefix>
+    <AssemblyVersion>0.16.1.0</AssemblyVersion>
+    <FileVersion>0.16.1.0</FileVersion>
     <Authors>Adam Hathcock</Authors>
     <TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net45;net35;netstandard1.0;netstandard1.3</TargetFrameworks>
     <TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>

tests/SharpCompress.Test/Zip/ZipArchiveTests.cs

@@ -324,6 +324,24 @@ namespace SharpCompress.Test
             VerifyFiles();
         }
 
+        [Fact]
+        public void Zip_Deflate_WinzipAES_MultiOpenEntryStream()
+        {
+            ResetScratch();
+            using (var reader = ZipArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.WinzipAES2.zip"), new ReaderOptions()
+            {
+                Password = "test"
+            }))
+            {
+                foreach (var entry in reader.Entries.Where(x => !x.IsDirectory))
+                {
+                    var stream = entry.OpenEntryStream();
+                    Assert.NotNull(stream);
+                    var ex = Record.Exception(() => stream = entry.OpenEntryStream());
+                    Assert.Null(ex);
+                }
+            }
+        }
 
         [Fact]
         public void Zip_BZip2_Pkware_Read()