Merge pull request #14 from icarus-consulting/i12-extraction-fails-depends-on-zip

Tests with ZIPs from different tools

Author: koeeenig

README.md

@@ -20,15 +20,29 @@ It does not work with simple compressed streams of data.
 You can create a new ZIP archive like this:
 
 ```csharp
-var zipArchive =
+var file =
     new ZipExtracted(
         new Zipped(
             "small.dat", new InputOf("I feel so compressed")
         ),
         "small.dat"
     ).Stream();
 ```
-
+or with multiple files
+```csharp
+new Zipped(
+    new Dictionary<string, IInput>()
+    {
+        {"small.dat", new InputOf("I feel so compressed") },
+        {"smaller.dat", new InputOf("I'm so compressed") }
+    }
+);
+
+new Zipped(
+    new KeyValuePair<string, IInput>("small.dat", new InputOf("I feel so compressed")),
+    new KeyValuePair<string, IInput>("smaller.dat", new InputOf("I'm so compressed"))
+);
+```
 Update a file in the ZIP:
 
 ```csharp
@@ -38,6 +52,15 @@ var updated =
         "Brave Citizens.txt", new InputOf("Edward Snowden")
     ).Stream();
 
+```
+or add a file to the ZIP if it doesn't exist
+```csharp
+var updated =
+    new ZipUpdated(
+        new Zipped("Brave Citizens.txt", new InputOf("Edward Snowden")),
+        "Concerned Citizens.txt", new InputOf("Donald")
+    ).Stream();
+
 ```
 
 Extract a file in the zip:
@@ -51,7 +74,7 @@ var extracted =
     ).Stream();
 ```
 
-List the contents of an archive:
+List the contents (directories and files) of an archive:
 
 ```csharp
 IEnumerable<string> contents =
@@ -60,6 +83,15 @@ IEnumerable<string> contents =
     );
 ```
 
+List all files only of an archive:
+
+```csharp
+IEnumerable<string> files =
+    new ZipFiles(
+        new InputOf(File.OpenRead("c:/some-zip-archive.zip")),
+    );
+```
+
 Remove a file from the archive:
 
 ```csharp
@@ -89,6 +121,16 @@ var isZip =
     ).Value();
 ```
 
+Test if a file exists in a zip:
+
+```csharp
+var exists =
+    new ZipContains(
+        new InputOf(File.OpenRead("c:/some-zip-archive.zip")),
+        "someFileInTheZip.txt")
+    ).Value();
+```
+
 Test if a file in a zip is protected with a password:
 
 ```csharp

src/Yaapii.Zip/ZipUpdated.cs

@@ -3,22 +3,22 @@
 using System.IO.Compression;
 using Yaapii.Atoms;
 using Yaapii.Atoms.Enumerable;
+using Yaapii.Atoms.Error;
 using Yaapii.Atoms.IO;
 using Yaapii.Atoms.Scalar;
-using Yaapii.Atoms.Text;
 
 namespace Yaapii.Zip
 {
     /// <summary>
-    /// A zip from which a file has been removed.
+    /// A zip from which a file has been updated or added.
     /// If the file to update does not exist, it is created.
     /// </summary>
     public sealed class ZipUpdated : IInput
     {
         private readonly IScalar<Stream> zip;
 
         /// <summary>
-        /// A zip in which a file has been updated.
+        /// A zip in which a file has been updated or added.
         /// If the file to update does not exist, it is created.
         /// </summary>
         public ZipUpdated(IInput input, string pathToUpdate, IInput update, bool leaveOpen = true) : this(
@@ -27,13 +27,20 @@ public ZipUpdated(IInput input, string pathToUpdate, IInput update, bool leaveOp
         { }
 
         /// <summary>
-        /// A zip from which a file has been removed.
+        /// A zip from which a file has been updated or added.
         /// If the file to update does not exist, it is created.
         /// </summary>
         public ZipUpdated(IScalar<Stream> zip, string pathToUpdate, IInput update, bool leaveOpen)
         {
             this.zip = new Solid<Stream>(() =>
             {
+                new FailWhen(
+                    () => ExistsAndCrypted(new InputOf(zip.Value()), pathToUpdate),
+                    new InvalidOperationException(
+                        $"Cannot update '{pathToUpdate}' because the file is password protected"
+                    )
+                ).Go();
+
                 lock (zip.Value())
                 {
                     var stream = zip.Value();
@@ -76,5 +83,18 @@ private string Normalized(string path)
             var file = Path.GetFileName(path).ToLower();
             return Path.Combine(dir, file);
         }
+
+        private bool ExistsAndCrypted(IInput zip, string filepath)
+        {
+            bool result = false;
+            if(new ZipContains(zip, filepath).Value())
+            {
+                if(new HasPassword(zip, filepath).Value())
+                {
+                    result = true;
+                }
+            }
+            return result;
+        }
     }
 }

tests/Test.Yaapii.Zip/Datum/7zip.zip

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 using Yaapii.Atoms.IO;
 
@@ -23,6 +21,21 @@ public void ReturnsTrueOnPassword()
             );
         }
 
+        [Theory]
+        [InlineData("Datum/7zip_crypt.zip")]
+        [InlineData("Datum/7zip_crypt_aes.zip")]
+        [InlineData("Datum/winrar_crypt.zip")]
+        [InlineData("Datum/winrar_crypt_aes.zip")]
+        public void HasPasswordFromDifferentZips(string path)
+        {
+            Assert.True(
+                new HasPassword(
+                    new ResourceOf(path, this.GetType()),
+                    @"c\Y\test-a-y-1.txt"
+                ).Value()
+            );
+        }
+
         [Fact]
         public void ReturnsFalseOnNoPassword()
         {
@@ -37,6 +50,20 @@ public void ReturnsFalseOnNoPassword()
             );
         }
 
+        [Theory]
+        [InlineData("Datum/windows.zip")]
+        [InlineData("Datum/7zip.zip")]
+        [InlineData("Datum/winrar.zip")]
+        public void HasNoPasswordFromDifferentZips(string path)
+        {
+            Assert.False(
+                new HasPassword(
+                    new ResourceOf(path, this.GetType()),
+                    @"c\Y\test-a-y-1.txt"
+                ).Value()
+            );
+        }
+
         [Fact]
         public void ThrowsOnNoZip()
         {