Use SharpZipLib instead of System.IO.Compression for zip file handling

kaeedo · Jan 7, 2017 · 02322fa · 02322fa
1 parent 2fe773f
commit 02322fa
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 488 deletions.
diff --git a/Cursed.Base/AssemblyInfo.fs b/Cursed.Base/AssemblyInfo.fs
@@ -2,8 +2,8 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("1.2.1")>]
+[<assembly: AssemblyVersionAttribute("1.2.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] AssemblyVersion = "1.2.1"
+    let [<Literal>] AssemblyVersion = "1.2.2"
diff --git a/Cursed.Base/ModpackController.fs b/Cursed.Base/ModpackController.fs
@@ -5,6 +5,7 @@ open System.IO
 open Common
 open Hopac
 open HttpFs.Client
+
 open Unzip
 
 module ModpackController =
@@ -35,10 +36,8 @@ module ModpackController =
     let ExtractZip location ((zipName: string), (zipLocation: string)) =
         let modpackSubdirectory = zipName.Substring(0, zipName.LastIndexOf('.'))
         let extractLocation = location @@ modpackSubdirectory @@ "minecraft"
-
-        using (new Unzip(zipLocation @@ zipName)) (fun zip ->
-            zip.ExtractToDirectory(extractLocation)
-        )
+
+        Zip.ExtractZipFile(zipLocation @@ zipName, extractLocation)
 
         let fileInfo = new FileInfo(zipLocation @@ zipName)
         fileInfo.Delete()

diff --git a/Cursed/AssemblyInfo.fs b/Cursed/AssemblyInfo.fs
@@ -2,8 +2,8 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("1.2.1")>]
+[<assembly: AssemblyVersionAttribute("1.2.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] AssemblyVersion = "1.2.1"
+    let [<Literal>] AssemblyVersion = "1.2.2"