Replace DotNetZip (#46)

Fixes #45

Replace DotNetZip and use System.IO.Compression instead.
Recreated the Examples.zip file so that filenames are properly encoded.

Author: aspettl

Installer/Product.wxs

@@ -118,9 +118,6 @@
 			</Component>
 		</ComponentGroup>
 		<ComponentGroup Id="ThirdPartyAssemblies" Directory="APPLICATIONFOLDER">
-			<Component>
-				<File Source="$(var.WordsLive.TargetDir)DotNetZip.dll" Name="DotNetZip.dll" KeyPath="yes" />
-			</Component>
 			<Component>
 				<File Source="$(var.WordsLive.TargetDir)MonitoredUndo.dll" Name="MonitoredUndo.dll" KeyPath="yes" />
 			</Component>

WordsLive/Data/Examples.zip

@@ -19,10 +19,10 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using System.Windows;
 using System.Xml.Linq;
-using Ionic.Zip;
 using WordsLive.Resources;
 
 namespace WordsLive
@@ -152,8 +152,7 @@ private void Window_Closing(object sender, CancelEventArgs e)
 					if (!songsExist && !backgroundsExist)
 					{
 						var appDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
-						var examplesZip = ZipFile.Read(Path.Combine(appDir.FullName, "Data", "Examples.zip"));
-						examplesZip.ExtractAll(actualDirectory);
+						ZipFile.ExtractToDirectory(Path.Combine(appDir.FullName, "Data", "Examples.zip"), actualDirectory);
 					}
 				}
 			}

WordsLive/FirstStartWindow.xaml.cs

@@ -19,9 +19,9 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Windows.Media.Imaging;
-using Ionic.Zip;
 using WordsLive.Utils.ImageLoader;
 
 namespace WordsLive.Images
@@ -42,14 +42,14 @@ public Uri Uri
 			}
 		}
 
-		public ZipEntry ZipEntry
+		public ZipArchiveEntry ZipEntry
 		{
 			get
 			{
 				if (sourceType != SourceType.ZipFile)
 					throw new InvalidOperationException("Not loaded from a zip file.");
 
-				return (ZipEntry)source;
+				return (ZipArchiveEntry)source;
 			}
 		}
 
@@ -77,7 +77,7 @@ public string Title
 					case SourceType.ExternalResource:
 						return Uri.UnescapeDataString(Uri.Segments.Last());
 					case SourceType.ZipFile:
-						return ZipEntry.FileName;
+						return ZipEntry.Name;
 					default:
 						return null;
 				}
@@ -114,7 +114,7 @@ public ImageInfo(Uri uri)
 			this.source = uri;
 		}
 
-		public ImageInfo(ZipEntry entry)
+		public ImageInfo(ZipArchiveEntry entry)
 		{
 			this.sourceType = SourceType.ZipFile;
 			this.source = entry;

WordsLive/Images/ImageInfo.cs

@@ -20,8 +20,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
-using Ionic.Zip;
 using WordsLive.Core;
 
 namespace WordsLive.Images
@@ -139,13 +139,15 @@ private IEnumerable<ImageInfo> LoadFromZip()
 			if (!Uri.IsFile)
 				throw new NotImplementedException("Loading slideshows from a remote source is not implemented.");
 
-			Stream stream = System.IO.File.OpenRead(Uri.LocalPath);
-			using (var zip = ZipFile.Read(stream))
+			var archive = ZipFile.OpenRead(Uri.LocalPath);
+			foreach (var entry in archive.Entries)
 			{
-				foreach (var entry in zip.Entries)
+				if (string.IsNullOrEmpty(entry.Name))
 				{
-					yield return new ImageInfo(entry);
+					// skip directories
+					continue;
 				}
+				yield return new ImageInfo(entry);
 			}
 
 			// important: don't close stream directly, so ImageLoader can load the images

WordsLive/Images/ImagesMedia.cs

@@ -18,7 +18,7 @@
 
 using System;
 using System.IO;
-using Ionic.Zip;
+using System.IO.Compression;
 
 namespace WordsLive.Utils.ImageLoader.Loaders
 {
@@ -28,13 +28,16 @@ internal class ZipLoader: ILoader
 
 		public Stream Load(object source)
 		{
-			if (source is ZipEntry)
+			if (source is ZipArchiveEntry)
 			{
-				ZipEntry entry = source as ZipEntry;
+				var entry = source as ZipArchiveEntry;
 				lock(Lock)
 				{
 					MemoryStream stream = new MemoryStream();
-					entry.Extract(stream);
+					using (var entryStream = entry.Open())
+					{
+						entryStream.CopyTo(stream);
+					}
 					stream.Flush();
 					stream.Seek(0, SeekOrigin.Begin);
 					return stream;

WordsLive/Utils/ImageLoader/Loaders/ZipLoader.cs

@@ -84,6 +84,8 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Windows.Forms" />
@@ -581,9 +583,6 @@
     <PackageReference Include="CefSharp.Wpf">
       <Version>139.0.280</Version>
     </PackageReference>
-    <PackageReference Include="DotNetZip">
-      <Version>1.16.0</Version>
-    </PackageReference>
     <PackageReference Include="Extended.Wpf.Toolkit">
       <Version>4.0.2</Version>
     </PackageReference>