0.0.6 beta2 (Muraad#17)

* Beta2 bug fix
sandrock · Mar 22, 2018 · b147d0c · b147d0c
1 parent 06bc12d
commit b147d0c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/src/Mime-Detective/Analyzers/ZipFileAnalyzer.cs b/src/Mime-Detective/Analyzers/ZipFileAnalyzer.cs
@@ -24,7 +24,8 @@ public FileType Search(in ReadResult readResult)
 
             if (readResult.Source is null)
             {
-                mStream = new MemoryStream(readResult.Array, 0, readResult.ReadLength);
+                //this should be the length of the array passed via ReadResult
+                mStream = new MemoryStream(readResult.Array, 0, readResult.Array.Length);
                 locallyCreatedStream = true;
             }
             else

diff --git a/src/Mime-Detective/Helpers/ReadResult.cs b/src/Mime-Detective/Helpers/ReadResult.cs
@@ -14,8 +14,17 @@ namespace MimeDetective
     /// </summary>
     public readonly struct ReadResult : IDisposable
     {
+        /// <summary>
+        /// Use Array.Length instead of ReadLength when you are refering to the whole file and source is null
+        /// </summary>
         public readonly byte[] Array;
+
         public readonly Stream Source;
+
+        /// <summary>
+        /// This is meant to be the int result of Stream.Read, it should cap at 560
+        /// Do not use when referring to the whole file
+        /// </summary>
         public readonly int ReadLength;
 
         public bool IsArrayRented { get; }

diff --git a/src/Mime-Detective/Mime-Detective.csproj b/src/Mime-Detective/Mime-Detective.csproj
@@ -18,8 +18,8 @@
 	</PackageTargetFallback>
 	<AssemblyVersion>0.0.6.0</AssemblyVersion>
 	<FileVersion>0.0.6.0</FileVersion>
-	<PackageReleaseNotes>See beta1 PR</PackageReleaseNotes>
-	<Version>0.0.6.0-beta1</Version>
+	<PackageReleaseNotes>See beta2 PR</PackageReleaseNotes>
+	<Version>0.0.6.0-beta2</Version>
 	<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 

diff --git a/test/Mime-Detective.Tests/Data/Documents/test.xlsx b/test/Mime-Detective.Tests/Data/Documents/test.xlsx
diff --git a/test/Mime-Detective.Tests/Tests/TypeExtensions.cs b/test/Mime-Detective.Tests/Tests/TypeExtensions.cs
@@ -345,5 +345,14 @@ public async Task StreamIsNotDisposedAfterReadingZipFileTypeAsync()
 
             fileStream.Dispose();
         }
+
+        [Fact]
+        public void CanReadZipFileFromByteArray()
+        {
+            var result = File.ReadAllBytes("./data/Documents/test.xlsx").GetFileType();
+
+            Assert.NotNull(result);
+            Assert.Equal(MimeTypes.EXCELX, result);
+        }
     }
 }