Add new name to README

Merge pull request #154 from dimohamdy/master
Fix testCase and Apply modern Objc
2015-06-13 16:02:19 -07:00 · 2015-06-06 13:11:44 -07:00 · 2015-06-06 21:03:19 +03:00 · 2015-06-06 20:51:51 +03:00 · 2015-06-06 20:43:47 +03:00 · 2015-04-23 11:24:49 -04:00
34 changed files with 1277 additions and 494 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,20 @@
-.DS_Store
-*.mode1v3
+# Xcode
+#
+build/
 *.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
 *.perspectivev3
-*.xcworkspace
+!default.perspectivev3
 xcuserdata
+*.xccheckout
+*.moved-aside
 DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+*.DS_Store
+.DS_Store
--- a/Example/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Example/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,53 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/Example/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Example/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,51 +0,0 @@
-{
-  "images" : [
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Sam Soffes, http://soff.es
+Copyright (c) 2010-2015, Sam Soffes, http://soff.es

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -0,0 +1,45 @@
+#ZipArchive
+
+ZipArchive is a simple utility class for zipping and unzipping files. 
+
+You can do the following:
+
+- Unzip zip files
+- Unzip password protected zip files
+- Create new zip files
+- Append to existing zip files
+- Zip files
+- Zip-up `NSData` instances (with a filename)
+
+##How to add ZipArchive to your project
+
+1. Add the `SSZipArchive` and `minizip` folders to your project.
+2. Add the `libz` library to your target
+
+ZipArchive requires ARC.
+
+###Usage
+
+```objective-c
+// Unzipping
+NSString *zipPath = @"path_to_your_zip_file";
+NSString *destinationPath = @"path_to_the_folder_where_you_want_it_unzipped";
+[SSZipArchive unzipFileAtPath:zipPath toDestination:destinationPath];
+
+// Zipping
+NSString *zippedPath = @"path_where_you_want_the_file_created";
+NSArray *inputPaths = [NSArray arrayWithObjects:
+                       [[NSBundle mainBundle] pathForResource:@"photo1" ofType:@"jpg"],
+                       [[NSBundle mainBundle] pathForResource:@"photo2" ofType:@"jpg"]
+                       nil];
+[SSZipArchive createZipFileAtPath:zippedPath withFilesAtPaths:inputPaths];
+
+// Zipping directory
+[SSZipArchive createZipFileAtPath:zippedPath withContentsOfDirectory:inputPath];
+```
+
+###Licensing
+ZipArchive is protected under the [MIT license](https://github.com/ZipArchive/ZipArchive/raw/master/LICENSE) and our slightly modified version of [Minizip](http://www.winimage.com/zLibDll/minizip.html) 1.1 is licensed under the [Zlib license](http://www.zlib.net/zlib_license.html).
+
+## Acknowledgments
+Big thanks to [Aish](http://code.google.com/p/ziparchive) for creating [ZipArchive](http://code.google.com/p/ziparchive). The project that inspired ZipArchive. Thank you [@randomsequence](https://github.com/randomsequence) for implementing the creation support tech and to [@johnezang](https://github.com/johnezang) for all his amazing help along the way.
--- a/Readme.markdown
+++ b/Readme.markdown
@@ -1,46 +0,0 @@
-# SSZipArchive
-
-SSZipArchive is a simple utility class for zipping and unzipping files. Features:
-
-* Unzipping zip files
-* Unzipping password protected zip files
-* Creating zip files
-* Appending to zip files
-* Zipping files
-* Zipping NSData with a filename
-
-## Adding to your project
-
-1. Add the `SSZipArchive` folder to your project.
-2. Add the `libz` library to your target
-
-SSZipArchive requires ARC.
-
-## Usage
-
-``` objective-c
-// Unzipping
-NSString *zipPath = @"path_to_your_zip_file";
-NSString *destinationPath = @"path_to_the_folder_where_you_want_it_unzipped";
-[SSZipArchive unzipFileAtPath:zipPath toDestination:destinationPath];
-
-// Zipping
-NSString *zippedPath = @"path_where_you_want_the_file_created";
-NSArray *inputPaths = [NSArray arrayWithObjects:
-                       [[NSBundle mainBundle] pathForResource:@"photo1" ofType:@"jpg"],
-                       [[NSBundle mainBundle] pathForResource:@"photo2" ofType:@"jpg"]
-                       nil];
-[SSZipArchive createZipFileAtPath:zippedPath withFilesAtPaths:inputPaths];
-```
-
-## Tests
-
-Simply, open the Xcode 5 or higher project in the Tests directory and press Command-U to run the tests.
-
-## License
-
-SSZipArchive is licensed under the [MIT license](https://github.com/samsoffes/ssziparchive/raw/master/LICENSE).  A slightly modified version of [Minizip](http://www.winimage.com/zLibDll/minizip.html) 1.1 is also included and is licensed under the [Zlib license](http://www.zlib.net/zlib_license.html).
-
-## Thanks
-
-Thanks [aish](http://code.google.com/p/ziparchive) for creating [ZipArchive](http://code.google.com/p/ziparchive) which SSZipArchive is based on, Johnnie Walker ([@randomsequence](https://github.com/randomsequence)) for implementing creation support, and John Engelhart ([@johnezang](https://github.com/johnezang)) for all his amazing help along the way.
--- a/SSZipArchive.podspec
+++ b/SSZipArchive.podspec
@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
  s.name         = 'SSZipArchive'
-  s.version      = '0.3.0'
+  s.version      = '0.3.2'
  s.summary      = 'Utility class for zipping and unzipping files on iOS and Mac.'
  s.description  = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS and Mac.'
  s.homepage     = 'https://github.com/soffes/ssziparchive'
-  s.license      = { :type => 'MIT', :file => 'LICENSE' }
+  s.license      = { :type => 'MIT', :file => 'LICENSE.txt' }
  s.author       = { 'Sam Soffes' => 'sam@soff.es' }
  s.source       = { :git => 'https://github.com/soffes/ssziparchive.git', :tag => "v#{s.version}" }
  s.ios.deployment_target = '4.0'
  s.osx.deployment_target = '10.6'
-  s.source_files = 'SSZipArchive/SSZipArchive.{h,m}', 'SSZipArchive/minizip/*.{h,c}'
-  s.header_dir = 'SSZipArchive/minizip'
-  s.library      = 'z'
+  s.source_files = 'SSZipArchive/*', 'SSZipArchive/minizip/*'
+  s.library = 'z'
+  s.requires_arc = true
 end
--- a/SSZipArchive.xcodeproj/project.pbxproj
+++ b/SSZipArchive.xcodeproj/project.pbxproj
@@ -7,20 +7,22 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		011F4B96182D71B700DE704F /* RelativeSymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = 011F4B95182D71B700DE704F /* RelativeSymbolicLink.zip */; };
+		011F4B97182D72B400DE704F /* RelativeSymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = 011F4B95182D71B700DE704F /* RelativeSymbolicLink.zip */; };
+		210D525417DEFB880060D41A /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D524C17DEFB880060D41A /* ioapi.c */; };
+		210D525517DEFB880060D41A /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D524C17DEFB880060D41A /* ioapi.c */; };
+		210D525617DEFB880060D41A /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D524E17DEFB880060D41A /* mztools.c */; };
+		210D525717DEFB880060D41A /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D524E17DEFB880060D41A /* mztools.c */; };
+		210D525817DEFB880060D41A /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D525017DEFB880060D41A /* unzip.c */; };
+		210D525917DEFB880060D41A /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D525017DEFB880060D41A /* unzip.c */; };
+		210D525A17DEFB880060D41A /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D525217DEFB880060D41A /* zip.c */; };
+		210D525B17DEFB880060D41A /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 210D525217DEFB880060D41A /* zip.c */; };
 		21CC41A917DB7D1300201DDC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41A817DB7D1300201DDC /* Foundation.framework */; };
 		21CC41AB17DB7D1300201DDC /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AA17DB7D1300201DDC /* CoreGraphics.framework */; };
 		21CC41AD17DB7D1300201DDC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AC17DB7D1300201DDC /* UIKit.framework */; };
 		21CC41C217DB7D1300201DDC /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41C117DB7D1300201DDC /* XCTest.framework */; };
 		21CC41C317DB7D1300201DDC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41A817DB7D1300201DDC /* Foundation.framework */; };
 		21CC41C417DB7D1300201DDC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AC17DB7D1300201DDC /* UIKit.framework */; };
-		21CC41E417DB7D2F00201DDC /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DA17DB7D2F00201DDC /* ioapi.c */; };
-		21CC41E517DB7D2F00201DDC /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DA17DB7D2F00201DDC /* ioapi.c */; };
-		21CC41E617DB7D2F00201DDC /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DC17DB7D2F00201DDC /* mztools.c */; };
-		21CC41E717DB7D2F00201DDC /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DC17DB7D2F00201DDC /* mztools.c */; };
-		21CC41E817DB7D2F00201DDC /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DE17DB7D2F00201DDC /* unzip.c */; };
-		21CC41E917DB7D2F00201DDC /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DE17DB7D2F00201DDC /* unzip.c */; };
-		21CC41EA17DB7D2F00201DDC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E017DB7D2F00201DDC /* zip.c */; };
-		21CC41EB17DB7D2F00201DDC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E017DB7D2F00201DDC /* zip.c */; };
 		21CC41EC17DB7D2F00201DDC /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E317DB7D2F00201DDC /* SSZipArchive.m */; };
 		21CC41ED17DB7D2F00201DDC /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E317DB7D2F00201DDC /* SSZipArchive.m */; };
 		21CC41F817DB7D3500201DDC /* IncorrectHeaders.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */; };
@@ -30,11 +32,21 @@
 		21CC41FC17DB7D3500201DDC /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F417DB7D3500201DDC /* TestPasswordArchive.zip */; };
 		21CC41FD17DB7D3500201DDC /* Unicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F517DB7D3500201DDC /* Unicode.zip */; };
 		21CC41FF17DB7D3500201DDC /* SSZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41F717DB7D3500201DDC /* SSZipArchiveTests.m */; };
-		21CC420F17DB7D6F00201DDC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 21CC420817DB7D6300201DDC /* Images.xcassets */; };
 		21CC421017DB7D7400201DDC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC420517DB7D6300201DDC /* main.m */; };
 		21CC421117DB7D7900201DDC /* SSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC420317DB7D6300201DDC /* SSAppDelegate.m */; };
 		21CC421317DB7E0500201DDC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC421217DB7E0500201DDC /* libz.dylib */; };
 		21CC421417DB7E0900201DDC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC421217DB7E0500201DDC /* libz.dylib */; };
+		3D18E4BC1B2367A300627171 /* CollectingDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D18E4BB1B2367A300627171 /* CollectingDelegate.m */; };
+		3D18E4C51B236A7500627171 /* 0.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4BD1B236A7500627171 /* 0.m4a */; };
+		3D18E4C61B236A7500627171 /* 1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4BE1B236A7500627171 /* 1.m4a */; };
+		3D18E4C71B236A7500627171 /* 2.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4BF1B236A7500627171 /* 2.m4a */; };
+		3D18E4C81B236A7500627171 /* 3.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4C01B236A7500627171 /* 3.m4a */; };
+		3D18E4C91B236A7500627171 /* 4.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4C11B236A7500627171 /* 4.m4a */; };
+		3D18E4CA1B236A7500627171 /* 5.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4C21B236A7500627171 /* 5.m4a */; };
+		3D18E4CB1B236A7500627171 /* 6.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4C31B236A7500627171 /* 6.m4a */; };
+		3D18E4CC1B236A7500627171 /* 7.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4C41B236A7500627171 /* 7.m4a */; };
+		3D18E4CE1B236C2A00627171 /* hello.zip in Resources */ = {isa = PBXBuildFile; fileRef = 3D18E4CD1B236C2A00627171 /* hello.zip */; };
+		A5CD0D3A1AD3490700E7F209 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A5CD0D391AD3490700E7F209 /* Default-568h@2x.png */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -48,21 +60,22 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		011F4B95182D71B700DE704F /* RelativeSymbolicLink.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = RelativeSymbolicLink.zip; sourceTree = "<group>"; };
+		210D524B17DEFB880060D41A /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
+		210D524C17DEFB880060D41A /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
+		210D524D17DEFB880060D41A /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
+		210D524E17DEFB880060D41A /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
+		210D524F17DEFB880060D41A /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
+		210D525017DEFB880060D41A /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
+		210D525117DEFB880060D41A /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
+		210D525217DEFB880060D41A /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
+		210D525317DEFB880060D41A /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
 		21CC41A517DB7D1300201DDC /* SSZipArchive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SSZipArchive.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		21CC41A817DB7D1300201DDC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		21CC41AA17DB7D1300201DDC /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		21CC41AC17DB7D1300201DDC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		21CC41C017DB7D1300201DDC /* SSZipArchiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SSZipArchiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		21CC41C117DB7D1300201DDC /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
-		21CC41D917DB7D2F00201DDC /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
-		21CC41DA17DB7D2F00201DDC /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
-		21CC41DB17DB7D2F00201DDC /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
-		21CC41DC17DB7D2F00201DDC /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
-		21CC41DD17DB7D2F00201DDC /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
-		21CC41DE17DB7D2F00201DDC /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
-		21CC41DF17DB7D2F00201DDC /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
-		21CC41E017DB7D2F00201DDC /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
-		21CC41E117DB7D2F00201DDC /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
 		21CC41E217DB7D2F00201DDC /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipArchive.h; sourceTree = "<group>"; };
 		21CC41E317DB7D2F00201DDC /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchive.m; sourceTree = "<group>"; };
 		21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = IncorrectHeaders.zip; sourceTree = "<group>"; };
@@ -77,9 +90,20 @@
 		21CC420317DB7D6300201DDC /* SSAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSAppDelegate.m; sourceTree = "<group>"; };
 		21CC420517DB7D6300201DDC /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		21CC420617DB7D6300201DDC /* SSZipArchive-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSZipArchive-Prefix.pch"; sourceTree = "<group>"; };
-		21CC420817DB7D6300201DDC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		21CC420917DB7D6300201DDC /* SSZipArchive-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SSZipArchive-Info.plist"; sourceTree = "<group>"; };
 		21CC421217DB7E0500201DDC /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		3D18E4BA1B2367A300627171 /* CollectingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectingDelegate.h; sourceTree = "<group>"; };
+		3D18E4BB1B2367A300627171 /* CollectingDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectingDelegate.m; sourceTree = "<group>"; };
+		3D18E4BD1B236A7500627171 /* 0.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 0.m4a; path = Tests/Multi_Zip_Test/0.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4BE1B236A7500627171 /* 1.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 1.m4a; path = Tests/Multi_Zip_Test/1.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4BF1B236A7500627171 /* 2.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 2.m4a; path = Tests/Multi_Zip_Test/2.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4C01B236A7500627171 /* 3.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 3.m4a; path = Tests/Multi_Zip_Test/3.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4C11B236A7500627171 /* 4.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 4.m4a; path = Tests/Multi_Zip_Test/4.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4C21B236A7500627171 /* 5.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 5.m4a; path = Tests/Multi_Zip_Test/5.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4C31B236A7500627171 /* 6.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 6.m4a; path = Tests/Multi_Zip_Test/6.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4C41B236A7500627171 /* 7.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 7.m4a; path = Tests/Multi_Zip_Test/7.m4a; sourceTree = SOURCE_ROOT; };
+		3D18E4CD1B236C2A00627171 /* hello.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = hello.zip; sourceTree = "<group>"; };
+		A5CD0D391AD3490700E7F209 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -108,12 +132,28 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		210D524A17DEFB880060D41A /* minizip */ = {
+			isa = PBXGroup;
+			children = (
+				210D524B17DEFB880060D41A /* crypt.h */,
+				210D524C17DEFB880060D41A /* ioapi.c */,
+				210D524D17DEFB880060D41A /* ioapi.h */,
+				210D524E17DEFB880060D41A /* mztools.c */,
+				210D524F17DEFB880060D41A /* mztools.h */,
+				210D525017DEFB880060D41A /* unzip.c */,
+				210D525117DEFB880060D41A /* unzip.h */,
+				210D525217DEFB880060D41A /* zip.c */,
+				210D525317DEFB880060D41A /* zip.h */,
+			);
+			path = minizip;
+			sourceTree = "<group>";
+		};
 		21CC419C17DB7D1300201DDC = {
 			isa = PBXGroup;
 			children = (
 				21CC41D717DB7D2F00201DDC /* SSZipArchive */,
-				21CC420017DB7D6300201DDC /* Example */,
 				21CC41EE17DB7D3500201DDC /* Tests */,
+				21CC420017DB7D6300201DDC /* Sample Application */,
 				21CC41A717DB7D1300201DDC /* Frameworks */,
 				21CC41A617DB7D1300201DDC /* Products */,
 			);
@@ -145,30 +185,17 @@
 			children = (
 				21CC41E217DB7D2F00201DDC /* SSZipArchive.h */,
 				21CC41E317DB7D2F00201DDC /* SSZipArchive.m */,
-				21CC41D817DB7D2F00201DDC /* minizip */,
+				210D524A17DEFB880060D41A /* minizip */,
 			);
 			path = SSZipArchive;
 			sourceTree = "<group>";
 		};
-		21CC41D817DB7D2F00201DDC /* minizip */ = {
-			isa = PBXGroup;
-			children = (
-				21CC41D917DB7D2F00201DDC /* crypt.h */,
-				21CC41DA17DB7D2F00201DDC /* ioapi.c */,
-				21CC41DB17DB7D2F00201DDC /* ioapi.h */,
-				21CC41DC17DB7D2F00201DDC /* mztools.c */,
-				21CC41DD17DB7D2F00201DDC /* mztools.h */,
-				21CC41DE17DB7D2F00201DDC /* unzip.c */,
-				21CC41DF17DB7D2F00201DDC /* unzip.h */,
-				21CC41E017DB7D2F00201DDC /* zip.c */,
-				21CC41E117DB7D2F00201DDC /* zip.h */,
-			);
-			path = minizip;
-			sourceTree = "<group>";
-		};
 		21CC41EE17DB7D3500201DDC /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				3D18E4BA1B2367A300627171 /* CollectingDelegate.h */,
+				3D18E4BB1B2367A300627171 /* CollectingDelegate.m */,
+				3D18E4A91B23679000627171 /* Multi_Zip_Test */,
 				21CC41EF17DB7D3500201DDC /* Fixtures */,
 				21CC41F617DB7D3500201DDC /* SSZipArchiveTests-Info.plist */,
 				21CC41F717DB7D3500201DDC /* SSZipArchiveTests.m */,
@@ -179,6 +206,8 @@
 		21CC41EF17DB7D3500201DDC /* Fixtures */ = {
 			isa = PBXGroup;
 			children = (
+				3D18E4CD1B236C2A00627171 /* hello.zip */,
+				011F4B95182D71B700DE704F /* RelativeSymbolicLink.zip */,
 				21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */,
 				21CC41F117DB7D3500201DDC /* PermissionsTestApp.app */,
 				21CC41F217DB7D3500201DDC /* SymbolicLink.zip */,
@@ -189,41 +218,41 @@
 			path = Fixtures;
 			sourceTree = "<group>";
 		};
-		21CC420017DB7D6300201DDC /* Example */ = {
-			isa = PBXGroup;
-			children = (
-				21CC420117DB7D6300201DDC /* Classes */,
-				21CC420417DB7D6300201DDC /* Other Sources */,
-				21CC420717DB7D6300201DDC /* Resources */,
-			);
-			path = Example;
-			sourceTree = "<group>";
-		};
-		21CC420117DB7D6300201DDC /* Classes */ = {
+		21CC420017DB7D6300201DDC /* Sample Application */ = {
 			isa = PBXGroup;
 			children = (
 				21CC420217DB7D6300201DDC /* SSAppDelegate.h */,
 				21CC420317DB7D6300201DDC /* SSAppDelegate.m */,
+				21CC420417DB7D6300201DDC /* Supporting Files */,
 			);
-			path = Classes;
+			path = "Sample Application";
 			sourceTree = "<group>";
 		};
-		21CC420417DB7D6300201DDC /* Other Sources */ = {
+		21CC420417DB7D6300201DDC /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				A5CD0D391AD3490700E7F209 /* Default-568h@2x.png */,
 				21CC420517DB7D6300201DDC /* main.m */,
 				21CC420617DB7D6300201DDC /* SSZipArchive-Prefix.pch */,
-			);
-			path = "Other Sources";
-			sourceTree = "<group>";
-		};
-		21CC420717DB7D6300201DDC /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				21CC420817DB7D6300201DDC /* Images.xcassets */,
 				21CC420917DB7D6300201DDC /* SSZipArchive-Info.plist */,
 			);
-			path = Resources;
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		3D18E4A91B23679000627171 /* Multi_Zip_Test */ = {
+			isa = PBXGroup;
+			children = (
+				3D18E4BD1B236A7500627171 /* 0.m4a */,
+				3D18E4BE1B236A7500627171 /* 1.m4a */,
+				3D18E4BF1B236A7500627171 /* 2.m4a */,
+				3D18E4C01B236A7500627171 /* 3.m4a */,
+				3D18E4C11B236A7500627171 /* 4.m4a */,
+				3D18E4C21B236A7500627171 /* 5.m4a */,
+				3D18E4C31B236A7500627171 /* 6.m4a */,
+				3D18E4C41B236A7500627171 /* 7.m4a */,
+			);
+			name = Multi_Zip_Test;
+			path = ../../../Pictures/ssziparchive/Tests/Multi_Zip_Test;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -302,7 +331,17 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				21CC420F17DB7D6F00201DDC /* Images.xcassets in Resources */,
+				3D18E4C51B236A7500627171 /* 0.m4a in Resources */,
+				3D18E4CB1B236A7500627171 /* 6.m4a in Resources */,
+				3D18E4CC1B236A7500627171 /* 7.m4a in Resources */,
+				3D18E4C91B236A7500627171 /* 4.m4a in Resources */,
+				3D18E4C61B236A7500627171 /* 1.m4a in Resources */,
+				3D18E4CA1B236A7500627171 /* 5.m4a in Resources */,
+				011F4B96182D71B700DE704F /* RelativeSymbolicLink.zip in Resources */,
+				3D18E4CE1B236C2A00627171 /* hello.zip in Resources */,
+				A5CD0D3A1AD3490700E7F209 /* Default-568h@2x.png in Resources */,
+				3D18E4C81B236A7500627171 /* 3.m4a in Resources */,
+				3D18E4C71B236A7500627171 /* 2.m4a in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -310,6 +349,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				011F4B97182D72B400DE704F /* RelativeSymbolicLink.zip in Resources */,
 				21CC41F817DB7D3500201DDC /* IncorrectHeaders.zip in Resources */,
 				21CC41FD17DB7D3500201DDC /* Unicode.zip in Resources */,
 				21CC41FA17DB7D3500201DDC /* SymbolicLink.zip in Resources */,
@@ -326,13 +366,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				21CC41E817DB7D2F00201DDC /* unzip.c in Sources */,
+				210D525817DEFB880060D41A /* unzip.c in Sources */,
 				21CC41EC17DB7D2F00201DDC /* SSZipArchive.m in Sources */,
-				21CC41EA17DB7D2F00201DDC /* zip.c in Sources */,
 				21CC421117DB7D7900201DDC /* SSAppDelegate.m in Sources */,
-				21CC41E617DB7D2F00201DDC /* mztools.c in Sources */,
+				210D525417DEFB880060D41A /* ioapi.c in Sources */,
+				210D525A17DEFB880060D41A /* zip.c in Sources */,
 				21CC421017DB7D7400201DDC /* main.m in Sources */,
-				21CC41E417DB7D2F00201DDC /* ioapi.c in Sources */,
+				3D18E4BC1B2367A300627171 /* CollectingDelegate.m in Sources */,
+				210D525617DEFB880060D41A /* mztools.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -340,12 +381,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				21CC41E517DB7D2F00201DDC /* ioapi.c in Sources */,
+				210D525517DEFB880060D41A /* ioapi.c in Sources */,
+				210D525917DEFB880060D41A /* unzip.c in Sources */,
 				21CC41FF17DB7D3500201DDC /* SSZipArchiveTests.m in Sources */,
+				210D525B17DEFB880060D41A /* zip.c in Sources */,
+				210D525717DEFB880060D41A /* mztools.c in Sources */,
 				21CC41ED17DB7D2F00201DDC /* SSZipArchive.m in Sources */,
-				21CC41E917DB7D2F00201DDC /* unzip.c in Sources */,
-				21CC41EB17DB7D2F00201DDC /* zip.c in Sources */,
-				21CC41E717DB7D2F00201DDC /* mztools.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -433,11 +474,10 @@
 		21CC41D217DB7D1300201DDC /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Example/Other Sources/SSZipArchive-Prefix.pch";
-				INFOPLIST_FILE = "Example/Resources/SSZipArchive-Info.plist";
+				GCC_PREFIX_HEADER = "$(SRCROOT)/Sample Application/Supporting Files/SSZipArchive-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Sample Application/Supporting Files/SSZipArchive-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -446,11 +486,10 @@
 		21CC41D317DB7D1300201DDC /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Example/Other Sources/SSZipArchive-Prefix.pch";
-				INFOPLIST_FILE = "Example/Resources/SSZipArchive-Info.plist";
+				GCC_PREFIX_HEADER = "$(SRCROOT)/Sample Application/Supporting Files/SSZipArchive-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Sample Application/Supporting Files/SSZipArchive-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -460,6 +499,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SSZipArchive.app/SSZipArchive";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -480,6 +520,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SSZipArchive.app/SSZipArchive";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
--- a/SSZipArchive.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/SSZipArchive.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:SSZipArchive.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/SSZipArchive.xcodeproj/xcshareddata/xcschemes/SSZipArchive.xcscheme
+++ b/SSZipArchive.xcodeproj/xcshareddata/xcschemes/SSZipArchive.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "21CC41A417DB7D1300201DDC"
+               BuildableName = "SSZipArchive.app"
+               BlueprintName = "SSZipArchive"
+               ReferencedContainer = "container:SSZipArchive.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "21CC41BF17DB7D1300201DDC"
+               BuildableName = "SSZipArchiveTests.xctest"
+               BlueprintName = "SSZipArchiveTests"
+               ReferencedContainer = "container:SSZipArchive.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21CC41A417DB7D1300201DDC"
+            BuildableName = "SSZipArchive.app"
+            BlueprintName = "SSZipArchive"
+            ReferencedContainer = "container:SSZipArchive.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21CC41A417DB7D1300201DDC"
+            BuildableName = "SSZipArchive.app"
+            BlueprintName = "SSZipArchive"
+            ReferencedContainer = "container:SSZipArchive.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21CC41A417DB7D1300201DDC"
+            BuildableName = "SSZipArchive.app"
+            BlueprintName = "SSZipArchive"
+            ReferencedContainer = "container:SSZipArchive.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/SSZipArchive/SSZipArchive.h
+++ b/SSZipArchive/SSZipArchive.h
@@ -3,14 +3,14 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 7/21/10.
-//  Copyright (c) Sam Soffes 2010-2013. All rights reserved.
+//  Copyright (c) Sam Soffes 2010-2015. All rights reserved.
 //

 #ifndef _SSZIPARCHIVE_H
 #define _SSZIPARCHIVE_H

 #import <Foundation/Foundation.h>
-#include "minizip/unzip.h"
+#include "unzip.h"

@protocol SSZipArchiveDelegate;

@@ -18,24 +18,37 @@

 // Unzip
 + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination;
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error;
-
 + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination delegate:(id<SSZipArchiveDelegate>)delegate;
+
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error;
 + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate;

+ (BOOL)unzipFileAtPath:(NSString *)path
+		  toDestination:(NSString *)destination
+		progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler
+	  completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler;
+
+ (BOOL)unzipFileAtPath:(NSString *)path
+		  toDestination:(NSString *)destination
+			  overwrite:(BOOL)overwrite
+			   password:(NSString *)password
+		progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler
+	  completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler;
+
 // Zip
 + (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)filenames;
 + (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath;
+ (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath keepParentDirectory:(BOOL)keepParentDirectory;

- (id)initWithPath:(NSString *)path;
- (BOOL)open;
+- (instancetype)initWithPath:(NSString *)path NS_DESIGNATED_INITIALIZER;
+@property (NS_NONATOMIC_IOSONLY, readonly) BOOL open;
 - (BOOL)writeFile:(NSString *)path;
+- (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName;
 - (BOOL)writeData:(NSData *)data filename:(NSString *)filename;
- (BOOL)close;
+@property (NS_NONATOMIC_IOSONLY, readonly) BOOL close;

@end

-
@protocol SSZipArchiveDelegate <NSObject>

@optional
@@ -43,8 +56,13 @@
 - (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo;
 - (void)zipArchiveDidUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo unzippedPath:(NSString *)unzippedPath;

+- (BOOL)zipArchiveShouldUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;
 - (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;
 - (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;
+- (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath unzippedFilePath:(NSString *)unzippedFilePath;
+
+- (void)zipArchiveProgressEvent:(unsigned long long)loaded total:(unsigned long long)total;
+- (void)zipArchiveDidUnzipArchiveFile:(NSString *)zipFile entryPath:(NSString *)entryPath destPath:(NSString *)destPath;

@end

--- a/SSZipArchive/SSZipArchive.m
+++ b/SSZipArchive/SSZipArchive.m
@@ -3,11 +3,11 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 7/21/10.
-//  Copyright (c) Sam Soffes 2010-2013. All rights reserved.
+//  Copyright (c) Sam Soffes 2010-2015. All rights reserved.
 //

 #import "SSZipArchive.h"
-#include "minizip/zip.h"
+#include "zip.h"
 #import "zlib.h"
 #import "zconf.h"

@@ -19,65 +19,117 @@
 + (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime;
@end

-
-@implementation SSZipArchive {
+@implementation SSZipArchive
+{
 	NSString *_path;
 	NSString *_filename;
    zipFile _zip;
 }

-
 #pragma mark - Unzipping

-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination {
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination
+{
 	return [self unzipFileAtPath:path toDestination:destination delegate:nil];
 }

-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error {
-	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:error delegate:nil];
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error
+{
+	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:error delegate:nil progressHandler:nil completionHandler:nil];
 }

-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination delegate:(id<SSZipArchiveDelegate>)delegate {
-	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil delegate:delegate];
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination delegate:(id<SSZipArchiveDelegate>)delegate
+{
+	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil delegate:delegate progressHandler:nil completionHandler:nil];
 }

+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate
+{
+	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:error delegate:delegate progressHandler:nil completionHandler:nil];
+}

-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate {
+ (BOOL)unzipFileAtPath:(NSString *)path
+		  toDestination:(NSString *)destination
+			  overwrite:(BOOL)overwrite
+			   password:(NSString *)password
+		progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler
+	  completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler
+{
+	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:nil delegate:nil progressHandler:progressHandler completionHandler:completionHandler];
+}
+
+ (BOOL)unzipFileAtPath:(NSString *)path
+		  toDestination:(NSString *)destination
+		progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler
+	  completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler
+{
+	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil delegate:nil progressHandler:progressHandler completionHandler:completionHandler];
+}
+
+ (BOOL)unzipFileAtPath:(NSString *)path
+		  toDestination:(NSString *)destination
+			  overwrite:(BOOL)overwrite
+			   password:(NSString *)password
+				  error:(NSError **)error
+			   delegate:(id<SSZipArchiveDelegate>)delegate
+		progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler
+	  completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler
+{
 	// Begin opening
-	zipFile zip = unzOpen((const char*)[path UTF8String]);	
-	if (zip == NULL) {
-		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open zip file" forKey:NSLocalizedDescriptionKey];
-		if (error) {
-			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-1 userInfo:userInfo];
+	zipFile zip = unzOpen((const char*)[path UTF8String]);
+	if (zip == NULL)
+	{
+		NSDictionary *userInfo = @{NSLocalizedDescriptionKey: @"failed to open zip file"};
+		NSError *err = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-1 userInfo:userInfo];
+		if (error)
+		{
+			*error = err;
+		}
+		if (completionHandler)
+		{
+			completionHandler(nil, NO, err);
 		}
 		return NO;
 	}
-	
+
+	NSDictionary * fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:nil];
+	unsigned long long fileSize = [fileAttributes[NSFileSize] unsignedLongLongValue];
+	unsigned long long currentPosition = 0;
+
 	unz_global_info  globalInfo = {0ul, 0ul};
 	unzGetGlobalInfo(zip, &globalInfo);
-	
+
 	// Begin unzipping
-	if (unzGoToFirstFile(zip) != UNZ_OK) {
-		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open first file in zip file" forKey:NSLocalizedDescriptionKey];
-		if (error) {
-			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-2 userInfo:userInfo];
+	if (unzGoToFirstFile(zip) != UNZ_OK)
+	{
+		NSDictionary *userInfo = @{NSLocalizedDescriptionKey: @"failed to open first file in zip file"};
+		NSError *err = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-2 userInfo:userInfo];
+		if (error)
+		{
+			*error = err;
+		}
+		if (completionHandler)
+		{
+			completionHandler(nil, NO, err);
 		}
 		return NO;
 	}
-	
+
 	BOOL success = YES;
+	BOOL canceled = NO;
 	int ret = 0;
 	unsigned char buffer[4096] = {0};
 	NSFileManager *fileManager = [NSFileManager defaultManager];
 	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
-	
+
 	// Message delegate
 	if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipArchiveAtPath:zipInfo:)]) {
 		[delegate zipArchiveWillUnzipArchiveAtPath:path zipInfo:globalInfo];
 	}
-	
+	if ([delegate respondsToSelector:@selector(zipArchiveProgressEvent:total:)]) {
+		[delegate zipArchiveProgressEvent:(NSInteger)currentPosition total:(NSInteger)fileSize];
+	}
+
 	NSInteger currentFileNumber = 0;
 	do {
 		@autoreleasepool {
@@ -86,77 +138,85 @@
 			} else {
 				ret = unzOpenCurrentFilePassword(zip, [password cStringUsingEncoding:NSASCIIStringEncoding]);
 			}
-			
+
 			if (ret != UNZ_OK) {
 				success = NO;
 				break;
 			}
-			
+
 			// Reading data and write to file
 			unz_file_info fileInfo;
 			memset(&fileInfo, 0, sizeof(unz_file_info));
-			
+
 			ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
 			if (ret != UNZ_OK) {
 				success = NO;
 				unzCloseCurrentFile(zip);
 				break;
 			}
-			
+
+			currentPosition += fileInfo.compressed_size;
+
 			// Message delegate
+			if ([delegate respondsToSelector:@selector(zipArchiveShouldUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
+				if (![delegate zipArchiveShouldUnzipFileAtIndex:currentFileNumber
+                                             totalFiles:(NSInteger)globalInfo.number_entry
+                                            archivePath:path fileInfo:fileInfo]) {
+					success = NO;
+					canceled = YES;
+					break;
+				}
+			}
 			if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
 				[delegate zipArchiveWillUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
 											 archivePath:path fileInfo:fileInfo];
 			}
-	        
+			if ([delegate respondsToSelector:@selector(zipArchiveProgressEvent:total:)]) {
+				[delegate zipArchiveProgressEvent:(NSInteger)currentPosition total:(NSInteger)fileSize];
+			}
+
 			char *filename = (char *)malloc(fileInfo.size_filename + 1);
 			unzGetCurrentFileInfo(zip, &fileInfo, filename, fileInfo.size_filename + 1, NULL, 0, NULL, 0);
 			filename[fileInfo.size_filename] = '\0';
-	        
+
 	        //
-	        // NOTE
-	        // I used the ZIP spec from here:
-	        // http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+	        // Determine whether this is a symbolic link:
+	        // - File is stored with 'version made by' value of UNIX (3),
+	        //   as per http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+	        //   in the upper byte of the version field.
+	        // - BSD4.4 st_mode constants are stored in the high 16 bits of the
+	        //   external file attributes (defacto standard, verified against libarchive)
 	        //
-	        // ...to deduce this method of detecting whether the file in the ZIP is a symbolic link.
-	        // If it is, it is listed as a directory but has a data size greater than zero (real 
-	        // directories have it equal to 0) and the included, uncompressed data is the symbolic link path.
+	        // The original constants can be found here:
+	        //    http://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/include/sys/stat.h
 	        //
-	        // ZIP files did not originally include support for symbolic links so the specification
-	        // doesn't include anything in them that isn't part of a unix extension that isn't being used
-	        // by the archivers we're testing. Most of this is figured out through trial and error and
-	        // reading ZIP headers in hex editors. This seems to do the trick though.
-	        //
-	        
-	        const uLong ZipCompressionMethodStore = 0;
-	        
+	        const uLong ZipUNIXVersion = 3;
+	        const uLong BSD_SFMT = 0170000;
+	        const uLong BSD_IFLNK = 0120000;
+            
 	        BOOL fileIsSymbolicLink = NO;
-	        
-	        if((fileInfo.compression_method == ZipCompressionMethodStore) && // Is it compressed?
-	           (S_ISDIR(fileInfo.external_fa)) && // Is it marked as a directory
-	           (fileInfo.compressed_size > 0)) // Is there any data?
-	        {
-	            fileIsSymbolicLink = YES;
+	        if (((fileInfo.version >> 8) == ZipUNIXVersion) && BSD_IFLNK == (BSD_SFMT & (fileInfo.external_fa >> 16))) {
+	            fileIsSymbolicLink = NO;
 	        }
-	        
+
 			// Check if it contains directory
-			NSString *strPath = [NSString stringWithCString:filename encoding:NSUTF8StringEncoding];
+			NSString *strPath = @(filename);
 			BOOL isDirectory = NO;
 			if (filename[fileInfo.size_filename-1] == '/' || filename[fileInfo.size_filename-1] == '\\') {
 				isDirectory = YES;
 			}
 			free(filename);
-			
+
 			// Contains a path
 			if ([strPath rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"/\\"]].location != NSNotFound) {
 				strPath = [strPath stringByReplacingOccurrencesOfString:@"\\" withString:@"/"];
 			}
-			
+
 			NSString *fullPath = [destination stringByAppendingPathComponent:strPath];
 			NSError *err = nil;
 	        NSDate *modDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
-	        NSDictionary *directoryAttr = [NSDictionary dictionaryWithObjectsAndKeys:modDate, NSFileCreationDate, modDate, NSFileModificationDate, nil];
-			
+	        NSDictionary *directoryAttr = @{NSFileCreationDate: modDate, NSFileModificationDate: modDate};
+
 			if (isDirectory) {
 				[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr  error:&err];
 			} else {
@@ -165,147 +225,165 @@
 	        if (nil != err) {
 	            NSLog(@"[SSZipArchive] Error: %@", err.localizedDescription);
 	        }
-	
+
 	        if(!fileIsSymbolicLink)
-	            [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
-	
+	            [directoriesModificationDates addObject: @{@"path": fullPath, @"modDate": modDate}];
+
 	        if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
 				unzCloseCurrentFile(zip);
 				ret = unzGoToNextFile(zip);
 				continue;
 			}
-	        
-			if(!fileIsSymbolicLink)
-	        {
+
+			if (!fileIsSymbolicLink) {
 	            FILE *fp = fopen((const char*)[fullPath UTF8String], "wb");
 	            while (fp) {
 	                int readBytes = unzReadCurrentFile(zip, buffer, 4096);
-	
+
 	                if (readBytes > 0) {
 	                    fwrite(buffer, readBytes, 1, fp );
 	                } else {
 	                    break;
 	                }
 	            }
-	            
+
 	            if (fp) {
+                    if ([[[fullPath pathExtension] lowercaseString] isEqualToString:@"zip"]) {
+                        NSLog(@"Unzipping nested .zip file:  %@", [fullPath lastPathComponent]);
+                        if ([self unzipFileAtPath:fullPath toDestination:[fullPath stringByDeletingLastPathComponent] overwrite:overwrite password:password error:nil delegate:nil]) {
+                            [[NSFileManager defaultManager] removeItemAtPath:fullPath error:nil];
+                        }
+                    }
+                    
 	                fclose(fp);
-	                
+
 	                // Set the original datetime property
 	                if (fileInfo.dosDate != 0) {
 	                    NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
-	                    NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
-	                    
+	                    NSDictionary *attr = @{NSFileModificationDate: orgDate};
+
 	                    if (attr) {
 	                        if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
-	                            // Can't set attributes 
+	                            // Can't set attributes
 	                            NSLog(@"[SSZipArchive] Failed to set attributes - whilst setting modification date");
 	                        }
 	                    }
 	                }
-                    
+
                    // Set the original permissions on the file
                    uLong permissions = fileInfo.external_fa >> 16;
                    if (permissions != 0) {
                        // Store it into a NSNumber
                        NSNumber *permissionsValue = @(permissions);
-                        
+
                        // Retrieve any existing attributes
                        NSMutableDictionary *attrs = [[NSMutableDictionary alloc] initWithDictionary:[fileManager attributesOfItemAtPath:fullPath error:nil]];
-                        
+
                        // Set the value in the attributes dict
                        attrs[NSFilePosixPermissions] = permissionsValue;
-                        
+
                        // Update attributes
                        if ([fileManager setAttributes:attrs ofItemAtPath:fullPath error:nil] == NO) {
                            // Unable to set the permissions attribute
                            NSLog(@"[SSZipArchive] Failed to set attributes - whilst setting permissions");
                        }
+                        
+#if !__has_feature(objc_arc)
+                        [attrs release];
+#endif
                    }
 	            }
 	        }
-	        else
-	        {
-	            // Get the path for the symbolic link
-	            
-	            NSURL* symlinkURL = [NSURL fileURLWithPath:fullPath];
-	            NSMutableString* destinationPath = [NSMutableString string];
-	            
-	            int bytesRead = 0;
-	            while((bytesRead = unzReadCurrentFile(zip, buffer, 4096)) > 0)
-	            {
-	                buffer[bytesRead] = 0;
-	                [destinationPath appendString:[NSString stringWithUTF8String:(const char*)buffer]];
-	            }
-	            
-	            //NSLog(@"Symlinking to: %@", destinationPath);
-	            
-	            NSURL* destinationURL = [NSURL fileURLWithPath:destinationPath];
-	            
-	            // Create the symbolic link
-	            NSError* symlinkError = nil;
-	            [fileManager createSymbolicLinkAtURL:symlinkURL withDestinationURL:destinationURL error:&symlinkError];
-	            
-	            if(symlinkError != nil)
-	            {
-	                NSLog(@"Failed to create symbolic link at \"%@\" to \"%@\". Error: %@", symlinkURL.absoluteString, destinationURL.absoluteString, symlinkError.localizedDescription);
-	            }
-	        }
-			
+            else
+            {
+                // Assemble the path for the symbolic link
+                NSMutableString* destinationPath = [NSMutableString string];
+                int bytesRead = 0;
+                while((bytesRead = unzReadCurrentFile(zip, buffer, 4096)) > 0)
+                {
+                    buffer[bytesRead] = (int)0;
+                    [destinationPath appendString:@((const char*)buffer)];
+                }
+
+                // Create the symbolic link (making sure it stays relative if it was relative before)
+                int symlinkError = symlink([destinationPath cStringUsingEncoding:NSUTF8StringEncoding],
+                                           [fullPath cStringUsingEncoding:NSUTF8StringEncoding]);
+
+                if(symlinkError != 0)
+                {
+                    NSLog(@"Failed to create symbolic link at \"%@\" to \"%@\". symlink() error code: %d", fullPath, destinationPath, errno);
+                }
+            }
+
 			unzCloseCurrentFile( zip );
 			ret = unzGoToNextFile( zip );
-			
+
 			// Message delegate
 			if ([delegate respondsToSelector:@selector(zipArchiveDidUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
 				[delegate zipArchiveDidUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
 											 archivePath:path fileInfo:fileInfo];
+			} else if ([delegate respondsToSelector: @selector(zipArchiveDidUnzipFileAtIndex:totalFiles:archivePath:unzippedFilePath:)]) {
+				[delegate zipArchiveDidUnzipFileAtIndex: currentFileNumber totalFiles: (NSInteger)globalInfo.number_entry
+											archivePath:path unzippedFilePath: fullPath];
 			}
-			
+
 			currentFileNumber++;
+			if (progressHandler)
+			{
+				progressHandler(strPath, fileInfo, currentFileNumber, globalInfo.number_entry);
+			}
 		}
 	} while(ret == UNZ_OK && ret != UNZ_END_OF_LIST_OF_FILE);
-	
+
 	// Close
 	unzClose(zip);
-	
+
 	// The process of decompressing the .zip archive causes the modification times on the folders
    // to be set to the present time. So, when we are done, they need to be explicitly set.
    // set the modification date on all of the directories.
    NSError * err = nil;
    for (NSDictionary * d in directoriesModificationDates) {
-        if (![[NSFileManager defaultManager] setAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[d objectForKey:@"modDate"], NSFileModificationDate, nil] ofItemAtPath:[d objectForKey:@"path"] error:&err]) {
-            NSLog(@"[SSZipArchive] Set attributes failed for directory: %@.", [d objectForKey:@"path"]);
+        if (![[NSFileManager defaultManager] setAttributes:@{NSFileModificationDate: d[@"modDate"]} ofItemAtPath:d[@"path"] error:&err]) {
+            NSLog(@"[SSZipArchive] Set attributes failed for directory: %@.", d[@"path"]);
        }
        if (err) {
            NSLog(@"[SSZipArchive] Error setting directory file modification date attribute: %@",err.localizedDescription);
        }
    }
-	
+
 #if !__has_feature(objc_arc)
 	[directoriesModificationDates release];
 #endif
-	
+
 	// Message delegate
 	if (success && [delegate respondsToSelector:@selector(zipArchiveDidUnzipArchiveAtPath:zipInfo:unzippedPath:)]) {
 		[delegate zipArchiveDidUnzipArchiveAtPath:path zipInfo:globalInfo unzippedPath:destination];
 	}
-	
+	// final progress event = 100%
+    if (!canceled && [delegate respondsToSelector:@selector(zipArchiveProgressEvent:total:)]) {
+		[delegate zipArchiveProgressEvent:fileSize total:fileSize];
+	}
+
+	if (completionHandler)
+	{
+		completionHandler(path, YES, nil);
+	}
 	return success;
 }

-
 #pragma mark - Zipping

-+ (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)paths {
+ (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)paths
+{
 	BOOL success = NO;
 	SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
 	if ([zipArchive open]) {
-		for (NSString *path in paths) {
-			[zipArchive writeFile:path];
+		for (NSString *filePath in paths) {
+			[zipArchive writeFile:filePath];
 		}
-		success = [zipArchive close];        
+		success = [zipArchive close];
 	}
-	
+
 #if !__has_feature(objc_arc)
 	[zipArchive release];
 #endif
@@ -313,40 +391,58 @@
 	return success;
 }

-
 + (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath {
+    return [self createZipFileAtPath:path withContentsOfDirectory:directoryPath keepParentDirectory:NO];
+}
+
+
+ (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath keepParentDirectory:(BOOL)keepParentDirectory {
    BOOL success = NO;
    
    NSFileManager *fileManager = nil;
-	SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
+    SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
    
-	if ([zipArchive open]) {
+    if ([zipArchive open]) {
        // use a local filemanager (queue/thread compatibility)
        fileManager = [[NSFileManager alloc] init];
        NSDirectoryEnumerator *dirEnumerator = [fileManager enumeratorAtPath:directoryPath];
-        
-		NSString *fileName;
+        NSString *fileName;
        while ((fileName = [dirEnumerator nextObject])) {
            BOOL isDir;
            NSString *fullFilePath = [directoryPath stringByAppendingPathComponent:fileName];
            [fileManager fileExistsAtPath:fullFilePath isDirectory:&isDir];
            if (!isDir) {
+                if (keepParentDirectory)
+                {
+                    fileName = [[directoryPath lastPathComponent] stringByAppendingPathComponent:fileName];
+                }
                [zipArchive writeFileAtPath:fullFilePath withFileName:fileName];
            }
+            else
+            {
+                if([[NSFileManager defaultManager] subpathsOfDirectoryAtPath:fullFilePath error:nil].count == 0)
+                {
+                    NSString *tempName = [fullFilePath stringByAppendingPathComponent:@".DS_Store"];
+                    [@"" writeToFile:tempName atomically:YES encoding:NSUTF8StringEncoding error:nil];
+                    [zipArchive writeFileAtPath:tempName withFileName:[fileName stringByAppendingPathComponent:@".DS_Store"]];
+                    [[NSFileManager defaultManager] removeItemAtPath:tempName error:nil];
+                }
+            }
        }
        success = [zipArchive close];
-	}
-	
+    }
+    
 #if !__has_feature(objc_arc)
    [fileManager release];
-	[zipArchive release];
+    [zipArchive release];
 #endif
    
-	return success;
+    return success;
 }


- (id)initWithPath:(NSString *)path {
+- (instancetype)initWithPath:(NSString *)path
+{
 	if ((self = [super init])) {
 		_path = [path copy];
 	}
@@ -355,23 +451,30 @@


 #if !__has_feature(objc_arc)
- (void)dealloc {
+- (void)dealloc
+{
    [_path release];
 	[super dealloc];
 }
 #endif


- (BOOL)open {    
+- (BOOL)open
+{
 	NSAssert((_zip == NULL), @"Attempting open an archive which is already open");
 	_zip = zipOpen([_path UTF8String], APPEND_STATUS_CREATE);
 	return (NULL != _zip);
 }


- (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date {
+- (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date
+{
    NSCalendar *currentCalendar = [NSCalendar currentCalendar];
+#if defined(__IPHONE_8_0) || defined(__MAC_10_10)
+    uint flags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+#else
    uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
+#endif
    NSDateComponents *components = [currentCalendar components:flags fromDate:date];
    zipInfo->tmz_date.tm_sec = (unsigned int)components.second;
    zipInfo->tmz_date.tm_min = (unsigned int)components.minute;
@@ -381,6 +484,45 @@
    zipInfo->tmz_date.tm_year = (unsigned int)components.year;
 }

+- (BOOL)writeFolderAtPath:(NSString *)path withFolderName:(NSString *)folderName
+{
+    NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
+
+    zip_fileinfo zipInfo = {{0}};
+
+    NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil];
+    if( attr )
+    {
+        NSDate *fileDate = (NSDate *)attr[NSFileModificationDate];
+        if( fileDate )
+        {
+            [self zipInfo:&zipInfo setDate: fileDate ];
+        }
+
+        // Write permissions into the external attributes, for details on this see here: http://unix.stackexchange.com/a/14727
+        // Get the permissions value from the files attributes
+        NSNumber *permissionsValue = (NSNumber *)attr[NSFilePosixPermissions];
+        if (permissionsValue) {
+            // Get the short value for the permissions
+            short permissionsShort = permissionsValue.shortValue;
+
+            // Convert this into an octal by adding 010000, 010000 being the flag for a regular file
+            NSInteger permissionsOctal = 0100000 + permissionsShort;
+
+            // Convert this into a long value
+            uLong permissionsLong = @(permissionsOctal).unsignedLongValue;
+
+            // Store this into the external file attributes once it has been shifted 16 places left to form part of the second from last byte
+            zipInfo.external_fa = permissionsLong << 16L;
+        }
+    }
+
+	unsigned int len = 0;
+    zipOpenNewFileInZip(_zip, [[folderName stringByAppendingString:@"/"] UTF8String], &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_NO_COMPRESSION);
+	zipWriteInFileInZip(_zip, &len, 0);
+	zipCloseFileInZip(_zip);
+	return YES;
+}

 - (BOOL)writeFile:(NSString *)path
 {
@@ -390,14 +532,15 @@
 // supports writing files with logical folder/directory structure
 // *path* is the absolute path of the file that will be compressed
 // *fileName* is the relative name of the file how it is stored within the zip e.g. /folder/subfolder/text1.txt
- (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName {
+- (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName
+{
    NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
-    
+
 	FILE *input = fopen([path UTF8String], "r");
 	if (NULL == input) {
 		return NO;
 	}
-    
+
    const char *afileName;
    if (!fileName) {
        afileName = [path.lastPathComponent UTF8String];
@@ -405,55 +548,54 @@
    else {
        afileName = [fileName UTF8String];
    }
-    
+
    zip_fileinfo zipInfo = {{0}};

    NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil];
    if( attr )
    {
-        NSDate *fileDate = (NSDate *)[attr objectForKey:NSFileModificationDate];
+        NSDate *fileDate = (NSDate *)attr[NSFileModificationDate];
        if( fileDate )
        {
            [self zipInfo:&zipInfo setDate: fileDate ];
        }
-        
+
        // Write permissions into the external attributes, for details on this see here: http://unix.stackexchange.com/a/14727
        // Get the permissions value from the files attributes
-        NSNumber *permissionsValue = (NSNumber *)[attr objectForKey:NSFilePosixPermissions];
+        NSNumber *permissionsValue = (NSNumber *)attr[NSFilePosixPermissions];
        if (permissionsValue) {
            // Get the short value for the permissions
            short permissionsShort = permissionsValue.shortValue;
-            
+
            // Convert this into an octal by adding 010000, 010000 being the flag for a regular file
            NSInteger permissionsOctal = 0100000 + permissionsShort;
-            
+
            // Convert this into a long value
            uLong permissionsLong = @(permissionsOctal).unsignedLongValue;
-            
+
            // Store this into the external file attributes once it has been shifted 16 places left to form part of the second from last byte
            zipInfo.external_fa = permissionsLong << 16L;
        }
    }
-	
+
    zipOpenNewFileInZip(_zip, afileName, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
-    
+
 	void *buffer = malloc(CHUNK);
 	unsigned int len = 0;
-	
+
    while (!feof(input))
    {
 		len = (unsigned int) fread(buffer, 1, CHUNK, input);
 		zipWriteInFileInZip(_zip, buffer, len);
 	}
-    
+
 	zipCloseFileInZip(_zip);
 	free(buffer);
-	fclose(input);
 	return YES;
 }

-
- (BOOL)writeData:(NSData *)data filename:(NSString *)filename {
+- (BOOL)writeData:(NSData *)data filename:(NSString *)filename
+{
    if (!_zip) {
 		return NO;
    }
@@ -472,13 +614,13 @@
 }


- (BOOL)close {    
+- (BOOL)close
+{
 	NSAssert((_zip != NULL), @"[SSZipArchive] Attempting to close an archive which was never opened");
 	zipClose(_zip, NULL);
 	return YES;
 }

-
 #pragma mark - Private

 // Format from http://newsgroups.derkeiler.com/Archive/Comp/comp.os.msdos.programmer/2009-04/msg00060.html
@@ -488,37 +630,42 @@
 //
 // 3658 = 0011 0110 0101 1000 = 0011011 0010 11000 = 27 2 24 = 2007-02-24
 // 7423 = 0111 0100 0010 0011 - 01110 100001 00011 = 14 33 2 = 14:33:06
-+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime {
+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime
+{
 	static const UInt32 kYearMask = 0xFE000000;
 	static const UInt32 kMonthMask = 0x1E00000;
 	static const UInt32 kDayMask = 0x1F0000;
 	static const UInt32 kHourMask = 0xF800;
 	static const UInt32 kMinuteMask = 0x7E0;
 	static const UInt32 kSecondMask = 0x1F;
-	
+
 	static NSCalendar *gregorian;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+#if defined(__IPHONE_8_0) || defined(__MAC_10_10)
+		gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+#else
+        gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+#endif
 	});
-    
+
    NSDateComponents *components = [[NSDateComponents alloc] init];

    NSAssert(0xFFFFFFFF == (kYearMask | kMonthMask | kDayMask | kHourMask | kMinuteMask | kSecondMask), @"[SSZipArchive] MSDOS date masks don't add up");
-	    
+
    [components setYear:1980 + ((msdosDateTime & kYearMask) >> 25)];
    [components setMonth:(msdosDateTime & kMonthMask) >> 21];
    [components setDay:(msdosDateTime & kDayMask) >> 16];
    [components setHour:(msdosDateTime & kHourMask) >> 11];
    [components setMinute:(msdosDateTime & kMinuteMask) >> 5];
    [components setSecond:(msdosDateTime & kSecondMask) * 2];
-    
+
    NSDate *date = [NSDate dateWithTimeInterval:0 sinceDate:[gregorian dateFromComponents:components]];
-	
+
 #if !__has_feature(objc_arc)
 	[components release];
 #endif
-	
+
 	return date;
 }

--- a/SSZipArchive/minizip/ioapi.c
+++ b/SSZipArchive/minizip/ioapi.c
@@ -192,9 +192,8 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
    }
    ret = 0;

-    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
+    if(fseeko64((FILE *)stream, (long)offset, fseek_origin) != 0)
                        ret = -1;
-
    return ret;
 }

--- a/SSZipArchive/minizip/unzip.c
+++ b/SSZipArchive/minizip/unzip.c
@@ -1038,7 +1038,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
            /* ZIP64 extra fields */
            if (headerId == 0x0001)
            {
-                                                        uLong uL;
+                                                        uLong uLZip64;

                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
                                                                {
@@ -1062,7 +1062,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
                                                                if(file_info.disk_num_start == (unsigned long)-1)
                                                                {
                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uLZip64) != UNZ_OK)
                                                                                err=UNZ_ERRNO;
                                                                }

@@ -1514,6 +1514,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
    pfile_in_zip_read_info->pos_local_extrafield=0;
    pfile_in_zip_read_info->raw=raw;
+    pfile_in_zip_read_info->byte_before_the_zipfile = 0;

    if (pfile_in_zip_read_info->read_buffer==NULL)
    {
@@ -1554,9 +1555,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
    pfile_in_zip_read_info->filestream=s->filestream;
    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-#ifndef __clang_analyzer__
    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-#endif

    pfile_in_zip_read_info->stream.total_out = 0;

--- a/Example/Classes/SSAppDelegate.h
+++ b/Example/Classes/SSAppDelegate.h
@@ -3,11 +3,9 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 9/7/13.
-//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//  Copyright (c) 2013-2014 Sam Soffes. All rights reserved.
 //

@interface SSAppDelegate : UIResponder <UIApplicationDelegate>
-
@property (strong, nonatomic) UIWindow *window;
-
@end
--- a/Example/Classes/SSAppDelegate.m
+++ b/Example/Classes/SSAppDelegate.m
@@ -3,7 +3,7 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 9/7/13.
-//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//  Copyright (c) 2013-2014 Sam Soffes. All rights reserved.
 //

 #import "SSAppDelegate.h"
@@ -12,9 +12,6 @@

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-
-	// Nothing to see here yet.
-
    [self.window makeKeyAndVisible];
    return YES;
 }
--- a/Files/Default-568h@2x.png
+++ b/Files/Default-568h@2x.png
--- a/Example/Resources/SSZipArchive-Info.plist
+++ b/Example/Resources/SSZipArchive-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>0.3.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIRequiredDeviceCapabilities</key>
--- a/Sources/SSZipArchive-Prefix.pch
+++ b/Sources/SSZipArchive-Prefix.pch
--- a/Application/Supporting
+++ b/Application/Supporting
@@ -3,7 +3,7 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 9/7/13.
-//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//  Copyright (c) 2013-2014 Sam Soffes. All rights reserved.
 //

 #import "SSAppDelegate.h"
--- a/Tests/CollectingDelegate.h
+++ b/Tests/CollectingDelegate.h
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+/**
+ * Test delegate by collecting its calls
+ */
+@interface CollectingDelegate : NSObject <SSZipArchiveDelegate>
+@property(nonatomic, retain) NSMutableArray *files;
+@end
--- a/Tests/CollectingDelegate.m
+++ b/Tests/CollectingDelegate.m
@@ -0,0 +1,32 @@
+//
+// Created by chris on 8/1/12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import "SSZipArchive.h"
+#import "CollectingDelegate.h"
+
+@implementation CollectingDelegate {
+    
+}
+@synthesize files = _files;
+
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.files = [NSMutableArray array];
+    }
+    return self;
+}
+
+- (void)zipArchiveDidUnzipArchiveFile:(NSString *)zipFile entryPath:(NSString *)entryPath destPath:(NSString *)destPath {
+    [self.files addObject:entryPath];
+}
+
+
+
+
+@end
--- a/Tests/Fixtures/RelativeSymbolicLink.zip
+++ b/Tests/Fixtures/RelativeSymbolicLink.zip
--- a/Tests/Fixtures/hello.zip
+++ b/Tests/Fixtures/hello.zip
--- a/Tests/Multi_Zip_Test/0.m4a
+++ b/Tests/Multi_Zip_Test/0.m4a
--- a/Tests/Multi_Zip_Test/1.m4a
+++ b/Tests/Multi_Zip_Test/1.m4a
--- a/Tests/Multi_Zip_Test/2.m4a
+++ b/Tests/Multi_Zip_Test/2.m4a
--- a/Tests/Multi_Zip_Test/3.m4a
+++ b/Tests/Multi_Zip_Test/3.m4a
--- a/Tests/Multi_Zip_Test/4.m4a
+++ b/Tests/Multi_Zip_Test/4.m4a
--- a/Tests/Multi_Zip_Test/5.m4a
+++ b/Tests/Multi_Zip_Test/5.m4a
--- a/Tests/Multi_Zip_Test/6.m4a
+++ b/Tests/Multi_Zip_Test/6.m4a
--- a/Tests/Multi_Zip_Test/7.m4a
+++ b/Tests/Multi_Zip_Test/7.m4a
--- a/Tests/SSZipArchive.xcodeproj/project.pbxproj
+++ b/Tests/SSZipArchive.xcodeproj/project.pbxproj
@@ -0,0 +1,366 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0472DDA417AF617E007BDB8D /* 0.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DD9C17AF617E007BDB8D /* 0.m4a */; };
+		0472DDA517AF617E007BDB8D /* 1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DD9D17AF617E007BDB8D /* 1.m4a */; };
+		0472DDA617AF617E007BDB8D /* 2.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DD9E17AF617E007BDB8D /* 2.m4a */; };
+		0472DDA717AF617E007BDB8D /* 3.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DD9F17AF617E007BDB8D /* 3.m4a */; };
+		0472DDA817AF617E007BDB8D /* 4.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DDA017AF617E007BDB8D /* 4.m4a */; };
+		0472DDA917AF617E007BDB8D /* 5.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DDA117AF617E007BDB8D /* 5.m4a */; };
+		0472DDAA17AF617E007BDB8D /* 6.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DDA217AF617E007BDB8D /* 6.m4a */; };
+		0472DDAB17AF617E007BDB8D /* 7.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0472DDA317AF617E007BDB8D /* 7.m4a */; };
+		AF313D09177B02A700478143 /* PermissionsTestApp.app in Resources */ = {isa = PBXBuildFile; fileRef = AF313D08177B02A700478143 /* PermissionsTestApp.app */; };
+		B215FB32143AD3C7003AC546 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB31143AD3C7003AC546 /* SenTestingKit.framework */; };
+		B215FB63143AD514003AC546 /* SSZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B215FB61143AD514003AC546 /* SSZipArchiveTests.m */; };
+		B215FB65143AD527003AC546 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB64143AD527003AC546 /* libz.dylib */; };
+		B215FB66143AD52D003AC546 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB18143AD3C7003AC546 /* Foundation.framework */; };
+		B215FB67143AD56D003AC546 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = B215FB58143AD460003AC546 /* SSZipArchive.m */; };
+		B215FB68143AD576003AC546 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB4F143AD460003AC546 /* ioapi.c */; };
+		B215FB69143AD576003AC546 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB51143AD460003AC546 /* mztools.c */; };
+		B215FB6A143AD576003AC546 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB53143AD460003AC546 /* unzip.c */; };
+		B215FB6B143AD576003AC546 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB55143AD460003AC546 /* zip.c */; };
+		B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B215FB6C143AD6FF003AC546 /* TestArchive.zip */; };
+		B2283D5D155AD80F00F9395A /* Unicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = B2283D5C155AD80F00F9395A /* Unicode.zip */; };
+		B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */; };
+		C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */; };
+		C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		0472DD9C17AF617E007BDB8D /* 0.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 0.m4a; sourceTree = "<group>"; };
+		0472DD9D17AF617E007BDB8D /* 1.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 1.m4a; sourceTree = "<group>"; };
+		0472DD9E17AF617E007BDB8D /* 2.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 2.m4a; sourceTree = "<group>"; };
+		0472DD9F17AF617E007BDB8D /* 3.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 3.m4a; sourceTree = "<group>"; };
+		0472DDA017AF617E007BDB8D /* 4.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 4.m4a; sourceTree = "<group>"; };
+		0472DDA117AF617E007BDB8D /* 5.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 5.m4a; sourceTree = "<group>"; };
+		0472DDA217AF617E007BDB8D /* 6.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 6.m4a; sourceTree = "<group>"; };
+		0472DDA317AF617E007BDB8D /* 7.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = 7.m4a; sourceTree = "<group>"; };
+		AF313D08177B02A700478143 /* PermissionsTestApp.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; path = PermissionsTestApp.app; sourceTree = "<group>"; };
+		B215FB18143AD3C7003AC546 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SSZipArchiveTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		B215FB31143AD3C7003AC546 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		B215FB4E143AD460003AC546 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
+		B215FB4F143AD460003AC546 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
+		B215FB50143AD460003AC546 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
+		B215FB51143AD460003AC546 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
+		B215FB52143AD460003AC546 /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
+		B215FB53143AD460003AC546 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
+		B215FB54143AD460003AC546 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
+		B215FB55143AD460003AC546 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
+		B215FB56143AD460003AC546 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
+		B215FB57143AD460003AC546 /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSZipArchive.h; path = ../SSZipArchive.h; sourceTree = "<group>"; };
+		B215FB58143AD460003AC546 /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = ../SSZipArchive.m; sourceTree = "<group>"; };
+		B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SSZipArchiveTests-Info.plist"; sourceTree = "<group>"; };
+		B215FB61143AD514003AC546 /* SSZipArchiveTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchiveTests.m; sourceTree = "<group>"; };
+		B215FB64143AD527003AC546 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		B215FB6C143AD6FF003AC546 /* TestArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestArchive.zip; sourceTree = "<group>"; };
+		B2283D5C155AD80F00F9395A /* Unicode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = Unicode.zip; sourceTree = "<group>"; };
+		B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestPasswordArchive.zip; sourceTree = "<group>"; };
+		C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = IncorrectHeaders.zip; sourceTree = "<group>"; };
+		C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SymbolicLink.zip; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		B215FB2C143AD3C7003AC546 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B215FB65143AD527003AC546 /* libz.dylib in Frameworks */,
+				B215FB66143AD52D003AC546 /* Foundation.framework in Frameworks */,
+				B215FB32143AD3C7003AC546 /* SenTestingKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0472DD9B17AF617E007BDB8D /* multi_zip_test */ = {
+			isa = PBXGroup;
+			children = (
+				0472DD9C17AF617E007BDB8D /* 0.m4a */,
+				0472DD9D17AF617E007BDB8D /* 1.m4a */,
+				0472DD9E17AF617E007BDB8D /* 2.m4a */,
+				0472DD9F17AF617E007BDB8D /* 3.m4a */,
+				0472DDA017AF617E007BDB8D /* 4.m4a */,
+				0472DDA117AF617E007BDB8D /* 5.m4a */,
+				0472DDA217AF617E007BDB8D /* 6.m4a */,
+				0472DDA317AF617E007BDB8D /* 7.m4a */,
+			);
+			path = multi_zip_test;
+			sourceTree = "<group>";
+		};
+		B215FB04143AD3C7003AC546 = {
+			isa = PBXGroup;
+			children = (
+				B215FB4B143AD449003AC546 /* SSZipArchive */,
+				B215FB5E143AD505003AC546 /* SSZipArchiveTests */,
+				B215FB12143AD3C7003AC546 /* Frameworks */,
+				B215FB10143AD3C7003AC546 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		B215FB10143AD3C7003AC546 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		B215FB12143AD3C7003AC546 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				B215FB64143AD527003AC546 /* libz.dylib */,
+				B215FB31143AD3C7003AC546 /* SenTestingKit.framework */,
+				B215FB18143AD3C7003AC546 /* Foundation.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		B215FB4B143AD449003AC546 /* SSZipArchive */ = {
+			isa = PBXGroup;
+			children = (
+				B215FB57143AD460003AC546 /* SSZipArchive.h */,
+				B215FB58143AD460003AC546 /* SSZipArchive.m */,
+				B215FB4D143AD460003AC546 /* minizip */,
+			);
+			name = SSZipArchive;
+			sourceTree = "<group>";
+		};
+		B215FB4D143AD460003AC546 /* minizip */ = {
+			isa = PBXGroup;
+			children = (
+				B215FB4E143AD460003AC546 /* crypt.h */,
+				B215FB4F143AD460003AC546 /* ioapi.c */,
+				B215FB50143AD460003AC546 /* ioapi.h */,
+				B215FB51143AD460003AC546 /* mztools.c */,
+				B215FB52143AD460003AC546 /* mztools.h */,
+				B215FB53143AD460003AC546 /* unzip.c */,
+				B215FB54143AD460003AC546 /* unzip.h */,
+				B215FB55143AD460003AC546 /* zip.c */,
+				B215FB56143AD460003AC546 /* zip.h */,
+			);
+			name = minizip;
+			path = ../minizip;
+			sourceTree = "<group>";
+		};
+		B215FB5E143AD505003AC546 /* SSZipArchiveTests */ = {
+			isa = PBXGroup;
+			children = (
+				0472DD9B17AF617E007BDB8D /* multi_zip_test */,
+				AF313D08177B02A700478143 /* PermissionsTestApp.app */,
+				B2283D5C155AD80F00F9395A /* Unicode.zip */,
+				B215FB61143AD514003AC546 /* SSZipArchiveTests.m */,
+				B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */,
+				C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */,
+				B215FB6C143AD6FF003AC546 /* TestArchive.zip */,
+				B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */,
+				C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */,
+			);
+			name = SSZipArchiveTests;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		B215FB2F143AD3C7003AC546 /* SSZipArchiveTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B215FB44143AD3C7003AC546 /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */;
+			buildPhases = (
+				B215FB2B143AD3C7003AC546 /* Sources */,
+				B215FB2C143AD3C7003AC546 /* Frameworks */,
+				B215FB2D143AD3C7003AC546 /* Resources */,
+				B215FB2E143AD3C7003AC546 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SSZipArchiveTests;
+			productName = SSZipArchiveTests;
+			productReference = B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		B215FB06143AD3C7003AC546 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0440;
+				ORGANIZATIONNAME = "Sam Soffes";
+			};
+			buildConfigurationList = B215FB09143AD3C7003AC546 /* Build configuration list for PBXProject "SSZipArchive" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = B215FB04143AD3C7003AC546;
+			productRefGroup = B215FB10143AD3C7003AC546 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				B215FB2F143AD3C7003AC546 /* SSZipArchiveTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		B215FB2D143AD3C7003AC546 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */,
+				B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */,
+				AF313D09177B02A700478143 /* PermissionsTestApp.app in Resources */,
+				C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */,
+				C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */,
+				B2283D5D155AD80F00F9395A /* Unicode.zip in Resources */,
+				0472DDA417AF617E007BDB8D /* 0.m4a in Resources */,
+				0472DDA517AF617E007BDB8D /* 1.m4a in Resources */,
+				0472DDA617AF617E007BDB8D /* 2.m4a in Resources */,
+				0472DDA717AF617E007BDB8D /* 3.m4a in Resources */,
+				0472DDA817AF617E007BDB8D /* 4.m4a in Resources */,
+				0472DDA917AF617E007BDB8D /* 5.m4a in Resources */,
+				0472DDAA17AF617E007BDB8D /* 6.m4a in Resources */,
+				0472DDAB17AF617E007BDB8D /* 7.m4a in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		B215FB2E143AD3C7003AC546 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		B215FB2B143AD3C7003AC546 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B215FB63143AD514003AC546 /* SSZipArchiveTests.m in Sources */,
+				B215FB67143AD56D003AC546 /* SSZipArchive.m in Sources */,
+				B215FB68143AD576003AC546 /* ioapi.c in Sources */,
+				B215FB69143AD576003AC546 /* mztools.c in Sources */,
+				B215FB6A143AD576003AC546 /* unzip.c in Sources */,
+				B215FB6B143AD576003AC546 /* zip.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		B215FB3F143AD3C7003AC546 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		B215FB40143AD3C7003AC546 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		B215FB45143AD3C7003AC546 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		B215FB46143AD3C7003AC546 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B215FB09143AD3C7003AC546 /* Build configuration list for PBXProject "SSZipArchive" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B215FB3F143AD3C7003AC546 /* Debug */,
+				B215FB40143AD3C7003AC546 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		B215FB44143AD3C7003AC546 /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B215FB45143AD3C7003AC546 /* Debug */,
+				B215FB46143AD3C7003AC546 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = B215FB06143AD3C7003AC546 /* Project object */;
+}
--- a/Tests/SSZipArchiveTests.m
+++ b/Tests/SSZipArchiveTests.m
@@ -3,39 +3,75 @@
 //  SSZipArchiveTests
 //
 //  Created by Sam Soffes on 10/3/11.
-//  Copyright (c) 2011 Sam Soffes. All rights reserved.
+//  Copyright (c) 2011-2014 Sam Soffes. All rights reserved.
 //

 #import "SSZipArchive.h"
 #import <XCTest/XCTest.h>
+#import "CollectingDelegate.h"
+#import <XCTest/XCTest.h>
 #import <CommonCrypto/CommonDigest.h>

+@interface CancelDelegate : NSObject <SSZipArchiveDelegate>
+@property (nonatomic, assign) int numFilesUnzipped;
+@property (nonatomic, assign) int numFilesToUnzip;
+@property (nonatomic, assign) BOOL didUnzipArchive;
+@property (nonatomic, assign) int loaded;
+@property (nonatomic, assign) int total;
+@end
+
+@implementation CancelDelegate
+- (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo
+{
+    _numFilesUnzipped = fileIndex + 1;
+}
+- (BOOL)zipArchiveShouldUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo
+{
+    //return YES;
+    return _numFilesUnzipped < _numFilesToUnzip;
+}
+- (void)zipArchiveDidUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo unzippedPath:(NSString *)unzippedPath
+{
+    _didUnzipArchive = YES;
+}
+- (void)zipArchiveProgressEvent:(NSInteger)loaded total:(NSInteger)total
+{
+    _loaded = (int)loaded;
+    _total = (int)total;
+}
+@end
+
@interface SSZipArchiveTests : XCTestCase <SSZipArchiveDelegate>
@end

-@implementation SSZipArchiveTests
+@implementation SSZipArchiveTests {
+    NSMutableArray *progressEvents;
+}
+
+- (void)setUp {
+    [super setUp];
+    progressEvents = [NSMutableArray array];
+}

 - (void)tearDown {
-	[super tearDown];
-	[[NSFileManager defaultManager] removeItemAtPath:[self _cachesPath:nil] error:nil];
+    [super tearDown];
+    [[NSFileManager defaultManager] removeItemAtPath:[self _cachesPath:nil] error:nil];
 }


 - (void)testZipping {
    // use extracted files from [-testUnzipping]
-	NSString *inputPath = [self _cachesPath:@"Regular"];
-	NSArray *inputPaths = [NSArray arrayWithObjects:
-						   [inputPath stringByAppendingPathComponent:@"Readme.markdown"],
-						   [inputPath stringByAppendingPathComponent:@"LICENSE"],
-	nil];
+    NSString *inputPath = [self _cachesPath:@"Regular"];
+    NSArray *inputPaths = @[[inputPath stringByAppendingPathComponent:@"Readme.markdown"],
+                           [inputPath stringByAppendingPathComponent:@"LICENSE"]];
    
    NSString *outputPath = [self _cachesPath:@"Zipped"];
    
-	NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
-	[SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
-
-	// TODO: Make sure the files are actually unzipped. They are, but the test should be better.
-	XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Archive created");
+    NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
+    [SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
+    
+    // TODO: Make sure the files are actually unzipped. They are, but the test should be better.
+    XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Archive created");
 }


@@ -50,35 +86,92 @@
    XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Folder Archive created");
 }

+- (void)testMultipleZippping{
+    
+    NSArray *inputPaths = @[[[NSBundle mainBundle]pathForResource:@"0" ofType:@"m4a"],
+                            
+                            [[NSBundle mainBundle]pathForResource:@"1" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"2" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"3" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"4" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"5" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"6" ofType:@"m4a"],
+                            [[NSBundle mainBundle]pathForResource:@"7" ofType:@"m4a"]
+                            ];
+    NSString *outputPath = [self _cachesPath:@"Zipped"];
+    
+    // this is a monster
+    // if testing on iOS, within 30 loops it will fail; however, on OS X, it may take about 900 loops
+    for (int test = 0; test < 1000; test++)
+    {
+        // Zipping
+        NSString *archivePath = [outputPath stringByAppendingPathComponent:[NSString stringWithFormat:@"queue_test_%d.zip",test]];
+        
+        [SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
+        
+        long long threshold = 510000; // 510kB:size slightly smaller than a successful zip, but much larger than a failed one
+        long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:archivePath error:nil][NSFileSize] longLongValue];
+        //STAssertTrue(fileSize > threshold, @"zipping failed at %@!",fileSize,archivePath);
+    }
+    
+}

 - (void)testUnzipping {
-	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
-	NSString *outputPath = [self _cachesPath:@"Regular"];
-	
-	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
-	
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
-	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
-	
-	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
-	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+    NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
+    NSString *outputPath = [self _cachesPath:@"Regular"];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+    
+    testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+}
+- (void)testSmallFileUnzipping {
+    NSString *zipPath = [[NSBundle mainBundle] pathForResource:@"hello" ofType:@"zip"];
+    NSString *outputPath = [self _cachesPath:@"Regular"];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+    
+    testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+}
+- (void)testUnzippingProgress {
+    NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
+    NSString *outputPath = [self _cachesPath:@"Progress"];
+    
+    [progressEvents removeAllObjects];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    // 4 events: the first, then for each of the two files one, then the final event
+    XCTAssertTrue(4 == [progressEvents count], @"Expected 4 progress events");
+    XCTAssertTrue(0 == [progressEvents[0] intValue]);
+    XCTAssertTrue(619 == [progressEvents[1] intValue]);
+    XCTAssertTrue(1114 == [progressEvents[2] intValue]);
+    XCTAssertTrue(1436 == [progressEvents[3] intValue]);
 }


 - (void)testUnzippingWithPassword {
-	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestPasswordArchive" ofType:@"zip"];
-	NSString *outputPath = [self _cachesPath:@"Password"];
-	
-	NSError *error = nil;
-	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath overwrite:YES password:@"passw0rd" error:&error delegate:self];
-	
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
-	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
-	
-	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
-	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+    NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestPasswordArchive" ofType:@"zip"];
+    NSString *outputPath = [self _cachesPath:@"Password"];
+    
+    NSError *error = nil;
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath overwrite:YES password:@"passw0rd" error:&error delegate:self];
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+    
+    testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
+    XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
 }


@@ -120,6 +213,36 @@
    XCTAssertTrue(symbolicLinkToFilePersists && symbolicLinkToFolderPersists, @"Symbolic links should persist from the original archive to the outputted files.");
 }

+- (void)testUnzippingWithRelativeSymlink {
+    
+    NSString *resourceName = @"RelativeSymbolicLink";
+    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:resourceName ofType:@"zip"];
+    NSString* outputPath = [self _cachesPath:resourceName];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    // Determine where the symlinks are
+    NSString *subfolderName = @"symlinks";
+    NSString *testBasePath = [NSString pathWithComponents:@[outputPath]];
+    NSString *testSymlinkFolder = [NSString pathWithComponents:@[testBasePath, subfolderName, @"folderSymlink"]];
+    NSString *testSymlinkFile = [NSString pathWithComponents:@[testBasePath, subfolderName, @"fileSymlink"]];
+    
+    // Determine where the files they link to are
+    NSString *parentDir = @"../";
+    NSString *testSymlinkFolderTarget = [NSString pathWithComponents:@[parentDir, @"symlinkedFolder"]];
+    NSString *testSymlinkFileTarget = [NSString pathWithComponents:@[parentDir, @"symlinkedFile"]];
+    
+    NSError *error = nil;
+    NSString *symlinkFolderPath = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath:testSymlinkFolder error:&error];
+    bool symbolicLinkToFolderPersists = ((symlinkFolderPath != nil) && [symlinkFolderPath isEqualToString:testSymlinkFolderTarget]) && (error == nil);
+    
+    error = nil;
+    
+    NSString *symlinkFilePath = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath:testSymlinkFile error:&error];
+    bool symbolicLinkToFilePersists = ((symlinkFilePath != nil) && [symlinkFilePath isEqualToString:testSymlinkFileTarget]) && (error == nil);
+    
+    XCTAssertTrue(symbolicLinkToFilePersists && symbolicLinkToFolderPersists, @"Relative symbolic links should persist from the original archive to the outputted files (and also remain relative).");
+}

 - (void)testUnzippingWithUnicodeFilenameInside {
    
@@ -138,23 +261,21 @@


 - (void)testZippingAndUnzippingForDate {
-
-	NSString *inputPath = [self _cachesPath:@"Regular"];
-	NSArray *inputPaths = [NSArray arrayWithObjects:
-						   [inputPath stringByAppendingPathComponent:@"Readme.markdown"],
-						   nil];
    
-	NSDictionary *originalFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[inputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
-
+    NSString *inputPath = [self _cachesPath:@"Regular"];
+    NSArray *inputPaths = @[[inputPath stringByAppendingPathComponent:@"Readme.markdown"]];
+    
+    NSDictionary *originalFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[inputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
+    
    NSString *outputPath = [self _cachesPath:@"ZippedDate"];
-	NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
-	
-	[SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
-	[SSZipArchive unzipFileAtPath:archivePath toDestination:outputPath delegate:self];
-	
-	NSDictionary *createdFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[outputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
-
-	XCTAssertEqualObjects(originalFileAttributes[NSFileCreationDate], createdFileAttributes[@"NSFileCreationDate"], @"Orginal file creationDate should match created one");
+    NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
+    
+    [SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
+    [SSZipArchive unzipFileAtPath:archivePath toDestination:outputPath delegate:self];
+    
+    NSDictionary *createdFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[outputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
+    
+    XCTAssertEqualObjects(originalFileAttributes[NSFileCreationDate], createdFileAttributes[@"NSFileCreationDate"], @"Orginal file creationDate should match created one");
 }


@@ -167,7 +288,7 @@
    
    // The .app file we're going to zip up
    NSString *inputFile = [[NSBundle mainBundle] pathForResource:@"PermissionsTestApp" ofType:@"app"];
-
+    
    // The path to the target file in the app before zipping
    NSString *targetFilePreZipPath = [inputFile stringByAppendingPathComponent:targetFile];
    
@@ -198,66 +319,112 @@
    XCTAssertEqual(fileAttributes[NSFilePosixPermissions], preZipAttributes[NSFilePosixPermissions], @"File permissions should be retained during compression and de-compression");
 }

+- (void)testUnzippingWithCancel {
+    NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
+    NSString *outputPath = [self _cachesPath:@"Cancel1"];
+    
+    CancelDelegate *delegate = [[CancelDelegate alloc] init];
+    delegate.numFilesToUnzip = 1;
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:delegate];
+    
+    XCTAssertEqual(delegate.numFilesUnzipped, 1);
+    XCTAssertFalse(delegate.didUnzipArchive);
+    XCTAssertNotEqual(delegate.loaded, delegate.total);
+    
+    outputPath = [self _cachesPath:@"Cancel2"];
+    
+    delegate = [[CancelDelegate alloc] init];
+    delegate.numFilesToUnzip = 1000;
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:delegate];
+    
+    XCTAssertEqual(delegate.numFilesUnzipped, 2);
+    XCTAssertTrue(delegate.didUnzipArchive);
+    XCTAssertEqual(delegate.loaded, delegate.total);
+    
+}
+
 // Commented out to avoid checking in several gig file into the repository. Simply add a file named
 // `LargeArchive.zip` to the project and uncomment out these lines to test.
 //
 //- (void)testUnzippingLargeFiles {
 //	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"LargeArchive" ofType:@"zip"];
 //	NSString *outputPath = [self _cachesPath:@"Large"];
-//	
+//
 //	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath];
 //}

+-(void)testShouldProvidePathOfUnzippedFileInDelegateCallback {
+    CollectingDelegate *collector = [CollectingDelegate new];
+    NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
+   	NSString *outputPath = [self _cachesPath:@"Regular"];
+    
+   	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:collector];
+    
+    //    STAssertEqualObjects([collector.files objectAtIndex:0], @"LICENSE.txt", nil);
+    //    STAssertEqualObjects([collector.files objectAtIndex:1], @"README.md", nil);
+}

 #pragma mark - SSZipArchiveDelegate

 - (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo {
-	NSLog(@"*** zipArchiveWillUnzipArchiveAtPath: `%@` zipInfo:", path);
+    NSLog(@"*** zipArchiveWillUnzipArchiveAtPath: `%@` zipInfo:", path);
 }


 - (void)zipArchiveDidUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo unzippedPath:(NSString *)unzippedPath {
-	NSLog(@"*** zipArchiveDidUnzipArchiveAtPath: `%@` zipInfo: unzippedPath: `%@`", path, unzippedPath);
+    NSLog(@"*** zipArchiveDidUnzipArchiveAtPath: `%@` zipInfo: unzippedPath: `%@`", path, unzippedPath);
 }

+- (BOOL)zipArchiveShouldUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo
+{
+    NSLog(@"*** zipArchiveShouldUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", (int)fileIndex, (int)totalFiles, archivePath);
+    return YES;
+}

 - (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
-	NSLog(@"*** zipArchiveWillUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+    NSLog(@"*** zipArchiveWillUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", (int)fileIndex, (int)totalFiles, archivePath);
 }


 - (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
-	NSLog(@"*** zipArchiveDidUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+    NSLog(@"*** zipArchiveDidUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", (int)fileIndex, (int)totalFiles, archivePath);
+}
+
+- (void)zipArchiveProgressEvent:(NSInteger)loaded total:(NSInteger)total {
+    NSLog(@"*** zipArchiveProgressEvent: loaded: `%d` total: `%d`", (int)loaded, (int)total);
+    [progressEvents addObject:@(loaded)];
 }


 #pragma mark - Private

 - (NSString *)_cachesPath:(NSString *)directory {
-	NSString *path = [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject]
-					   stringByAppendingPathComponent:@"com.samsoffes.ssziparchive.tests"];
-	if (directory) {
-		path = [path stringByAppendingPathComponent:directory];
-	}
-	
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	if (![fileManager fileExistsAtPath:path]) {
-		[fileManager createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
-	}
-	
-	return path;
+    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject]
+                      stringByAppendingPathComponent:@"com.samsoffes.ssziparchive.tests"];
+    if (directory) {
+        path = [path stringByAppendingPathComponent:directory];
+    }
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if (![fileManager fileExistsAtPath:path]) {
+        [fileManager createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
+    }
+    
+    return path;
 }


 // Taken from https://github.com/samsoffes/sstoolkit/blob/master/SSToolkit/NSData+SSToolkitAdditions.m
 - (NSString *)_calculateMD5Digest:(NSData *)data {
-	unsigned char digest[CC_MD5_DIGEST_LENGTH], i;
-	CC_MD5(data.bytes, (unsigned int)data.length, digest);
-	NSMutableString *ms = [NSMutableString string];
-	for (i = 0; i < CC_MD5_DIGEST_LENGTH; i++) {
-		[ms appendFormat: @"%02x", (int)(digest[i])];
-	}
-	return [ms copy];
+    unsigned char digest[CC_MD5_DIGEST_LENGTH], i;
+    CC_MD5(data.bytes, (unsigned int)data.length, digest);
+    NSMutableString *ms = [NSMutableString string];
+    for (i = 0; i < CC_MD5_DIGEST_LENGTH; i++) {
+        [ms appendFormat: @"%02x", (int)(digest[i])];
+    }
+    return [ms copy];
 }

@end
Author	SHA1	Message	Date
Douglas Bumby	28be5a67ab	Add new name to README	2015-06-13 16:02:19 -07:00
Douglas Bumby	7ccc986657	Merge pull request #154 from dimohamdy/master Fix testCase and Apply modern Objc	2015-06-06 13:11:44 -07:00
Ahmed Hamdy	cfee6b5b89	Testing unzipping 5 bytes zipped file #87 bug it’s work	2015-06-06 21:03:19 +03:00
Ahmed Hamdy	676da25532	fix files not found reference	2015-06-06 20:51:51 +03:00
Ahmed Hamdy	8d2b39b5ec	Fix testCase and apply modern Objc	2015-06-06 20:43:47 +03:00
Douglas Bumby	af85bf97a9	Merge pull request #148 from caldofran/master fixed podspec pointing to non-existing tag in the main repo	2015-04-23 11:24:49 -04:00
Ruben Mendez	b07d0c5d51	fixed podspec pointing to non-existing tag in the main repo	2015-04-23 13:02:56 +02:00
Douglas Bumby	aab8d383b3	Merge pull request #147 from caldofran/master PodSpec update	2015-04-22 13:04:52 -04:00
Ruben Mendez	4c97093700	change to point to the right tag	2015-04-22 10:07:37 +02:00
Ruben Mendez	a1cc7c1654	pointint to tag	2015-04-22 10:04:40 +02:00
Ruben Mendez	7a6c677c17	pod pointint to master	2015-04-22 10:02:57 +02:00
Douglas Bumby	d607ba044b	Merge pull request #146 from iosphere/fix-shadowed-variable Avoid shadowing variable when extracting ZIP64 extra header fields	2015-04-14 16:34:39 -04:00
Lukas Mollidor	c39636b71b	Avoid shadowing variable when extracting ZIP64 extra header fields	2015-04-14 18:39:50 +02:00
Douglas Bumby	705a69840f	Merge pull request #145 from djbe/master Add delegate method with extracted file path	2015-04-09 14:37:38 -04:00
David Jennes	a9ece3bef7	Add delegate method with extracted file path	2015-04-09 20:07:03 +02:00
Douglas Bumby	fc61e0358d	Merge pull request #144 from padinger/master Fix calendar deprecation warning on OSX 10.10	2015-04-08 16:42:31 -04:00
Patrick Dinger	9761f045b2	Fix calendar deprecation warning on OSX 10.10	2015-04-08 14:44:43 +02:00
Douglas Bumby	2a1eee19b4	Merge pull request #139 from soffes/aceisScope-master Aceis scope master	2015-04-06 23:53:18 -04:00
Douglas Bumby	35b181504c	Merging in #138	2015-04-06 23:52:50 -04:00
Douglas Bumby	8be53bee68	Fix	2015-04-06 23:51:08 -04:00
Douglas Bumby	cc714460f9	Fix for #52	2015-04-06 23:43:15 -04:00
Douglas Bumby	88c2ab7516	Fixing issue #98	2015-04-06 23:39:19 -04:00
Douglas Bumby	c9d93d23e3	Change SSZipArchive to Tests	2015-04-06 19:17:27 -04:00
Douglas Bumby	bddefcebfe	Re-organise Xcode Project using Synx	2015-04-06 19:14:29 -04:00
Douglas Bumby	95d3d3544a	missed a spot	2015-04-06 17:18:40 -04:00
Douglas Bumby	4e3625684d	cleanup	2015-04-06 17:18:27 -04:00
Douglas Bumby	cc24921107	Copyright year + miscellaneous changes	2015-04-06 17:17:26 -04:00
Douglas Bumby	487093160b	Merge pull request #137 from soffes/TheRealKerni-patch-1 The real kerni patch 1	2015-04-06 17:08:51 -04:00
Douglas Bumby	dbc332ce70	#92	2015-04-06 17:08:24 -04:00
Douglas Bumby	cedaa5250c	Merge pull request #136 from soffes/basitali-master Basitali master	2015-04-06 17:06:13 -04:00
Douglas Bumby	938749897d	MERGE: Add writeFileAtPath:withFileName: in SSZipArchive.h so that it can be called.	2015-04-06 17:05:47 -04:00
Douglas Bumby	c881c8528f	Merge pull request #121 from rileytestut/master Added option to keep parent directory when compressing directory contents	2015-04-06 16:53:21 -04:00
Douglas Bumby	13e3ab93b4	Merge pull request #135 from DimonDeveloper/patch-2 Archive empty folder in other folder	2015-04-06 16:47:25 -04:00
DimonDeveloper	5492b7bcea	Archive empty folder in other folder	2015-04-06 23:39:15 +03:00
Douglas Bumby	8b046fc30b	Version changed	2015-04-06 15:55:52 -04:00
Douglas Bumby	ef396cbd52	Merge pull request #133 from soffes/955dreams-master 955dreams master	2015-04-06 15:51:28 -04:00
Douglas Bumby	4b4cce2666	Merging in some changes	2015-04-06 15:51:07 -04:00
Douglas Bumby	d8a7fd0e8c	Update README.md	2015-04-06 15:44:13 -04:00
Douglas Bumby	0b476953df	Make use of Objective-C .gitignore template	2015-04-06 15:25:08 -04:00
Douglas Bumby	056fe04808	Update and rename LICENSE to LICENSE.txt	2015-04-06 15:23:36 -04:00
Douglas Bumby	292d95e41a	Merge pull request #58 from mickrobk/master writeFileAtPath does not close file handle	2015-04-06 15:18:56 -04:00
Douglas Bumby	fede9541b4	Merge pull request #132 from soffes/Cpu86-master Cpu86 master	2015-04-06 15:13:48 -04:00
Douglas Bumby	ae50a6d40a	fix the merges	2015-04-06 15:13:07 -04:00
Douglas Bumby	a75d901a85	Merge pull request #112 from iosphere/fix-shadowed-variable Fix warning on shadowed variable when creating zip file	2015-04-06 15:00:27 -04:00
Douglas Bumby	cb037e1010	Merge pull request #113 from iosphere/zipArchiveProgressEvent-type Report file size as unsigned long long to delegate	2015-04-06 14:59:07 -04:00
Douglas Bumby	c119896966	Merge pull request #95 from vtourraine/patch-1 Fix implicit conversion warning	2015-04-06 14:57:25 -04:00
Douglas Bumby	bf55cb47b7	Merge pull request #108 from taberrr/patch-1 Update SSZipArchive.podspec	2015-04-06 14:10:42 -04:00
Douglas Bumby	801d1198b5	Merge pull request #122 from boherna/master Adds progress and completion handlers. Support for adding folders and subfolders to ZIP packages.	2015-04-06 14:09:09 -04:00
Douglas Bumby	94a6637002	Merge pull request #114 from xhacker/patch-1 Update Readme.markdown	2015-04-06 13:48:38 -04:00
Douglas Bumby	b37ab60ba0	Merge pull request #131 from soffes/zlandau-cancelunzip Zlandau cancelunzip	2015-04-06 13:44:27 -04:00
Douglas Bumby	a90b2a9611	Merge fixes	2015-04-06 13:42:48 -04:00
Douglas Bumby	7e44caef39	Merge pull request #130 from soffes/revert-129-master Revert "Add support for archives in folders"	2015-04-06 13:35:51 -04:00
Douglas Bumby	0c9aaee02b	Revert "Add support for archives in folders"	2015-04-06 13:35:21 -04:00
Douglas Bumby	bd02992224	Merge pull request #129 from Binauric/master Add support for archives in folders	2015-04-06 13:22:46 -04:00
Lars Immisch	9426653711	Add support for archives in folders	2015-03-27 10:53:38 +01:00
Riley Testut	33c7884202	Added option to keep parent directory when compressing directory contents	2014-12-21 18:02:19 -06:00
David Robles	67403e8a28	Update pod spec.	2014-11-05 15:40:12 -08:00
David Robles	74ce9fc2c7	Update Pod spec.	2014-11-05 15:34:55 -08:00
Bohdan Hernandez	553c4be486	Merge remote-tracking branch 'upstream/master' * upstream/master: Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Conflicts: SSZipArchive/minizip/ioapi.c	2014-11-05 20:51:56 +00:00
Sam Soffes	9f93d0c1b7	Merge pull request #120 from nicked/master Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warnings	2014-10-31 08:23:04 -07:00
nicked	55437a8b8e	Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning	2014-10-31 11:09:31 +01:00
nicked	d68c99b890	Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning	2014-10-31 11:08:04 +01:00
Bohdan Hernandez	e1bfb6e8ed	Merge remote-tracking branch 'upstream/master' * upstream/master: Change the CalendarUnit for iOS 8.0	2014-10-29 13:22:06 +00:00
Sam Soffes	874ebd8651	Merge pull request #119 from liufan321/master Change CalendarUnits for iOS 8.0	2014-10-26 21:48:47 -07:00
Fan Liu	a8f065f2a1	Change the CalendarUnit for iOS 8.0	2014-10-26 03:50:58 +08:00
Bohdan Hernandez	b89dfcf4fd	Merge branch 'master' of https://github.com/soffes/ssziparchive # By Adam Yanalunas (2) and Landon Fuller (1) # Via Adam Yanalunas * 'master' of https://github.com/soffes/ssziparchive: Updated podspec for v0.3.2 Relative symlink fixture for new symlink detection in #91 Replace symlink heuristic with a well-defined test.	2014-09-22 00:45:08 +01:00
LIU Dongyuan / 柳东原	b688b9859a	Update Readme.markdown createZipFileAtPath:withFilesAtPaths: creates an invalid zip for directory	2014-09-20 13:21:42 -07:00
Lukas Mollidor	54875c8192	Report file size as unsigned long long to delegate	2014-09-12 19:11:46 +02:00
Lukas Mollidor	df0d5536e8	Fix warning on shadowed variable when creating zip file	2014-09-12 18:44:36 +02:00
Adam Yanalunas	60f577ab9a	Updated podspec for v0.3.2	2014-09-08 11:39:44 -07:00
Adam Yanalunas	60312c173b	Merge pull request #111 from soffes/test/relative_path_fixture Relative symlink fixture for new symlink detection in #91	2014-09-08 11:26:13 -07:00
Adam Yanalunas	c363747a15	Merge pull request #91 from landonf/master Fix symlink detection	2014-09-08 11:26:01 -07:00
Adam Yanalunas	e29efca7bf	Relative symlink fixture for new symlink detection in #91	2014-09-05 13:19:30 -07:00
Taber Buhl	024241a3e0	Update SSZipArchive.podspec trying alternative source_files syntax	2014-08-01 17:22:06 -04:00
Bohdan Hernandez	47c50d0482	Adds progress and completion handlers.	2014-07-29 18:54:28 +01:00
Zacharyl Landau	2385ac9241	Add a delegate for cancelling unzips This adds a zipArchiveShouldUnzipFileAtIndex, which is called before each call to zipArchiveWillUnzipFileAtIndex, allowing a delegate to cancel the unzip progress.	2014-07-16 11:28:25 -07:00
Bohdan Hernandez	b91fe135e2	Removes some compile warnings.	2014-05-12 09:52:50 +01:00
Bohdan Hernandez	57b6018ca0	Merge branch 'master' of https://github.com/soffes/ssziparchive # By Andreas Dangel (2) and others # Via Erickson Pacioles (1) and Sam Soffes (1) * 'master' of https://github.com/soffes/ssziparchive: Fixed warnings from Xcode Analyzer Fix warnings on 64-bit Add a unit test for zipArchiveProgressEvent. Add a progress event while unzipping. The progress is determined by the compressed file size and zip entries.	2014-04-28 10:46:50 +01:00
Sam Soffes	89b32b9328	Merge pull request #99 from mr-fahrenheit/master Fixed warnings from Xcode Analyzer	2014-04-06 09:25:57 -04:00
Mr. Fahrenheit	1b2ec1a9ec	Fixed warnings from Xcode Analyzer	2014-04-06 19:42:33 +08:00
Sam Soffes	b4c9bde3fb	Fix warnings on 64-bit	2014-03-22 08:01:08 -07:00
Andreas Dangel	4fca963b62	Add a unit test for zipArchiveProgressEvent.	2014-03-22 03:56:37 +01:00
Andreas Dangel	281571d99f	Add a progress event while unzipping. The progress is determined by the compressed file size and zip entries.	2014-03-14 21:22:20 -04:00
Vincent Tourraine	47afe71fa2	Fix implicit conversion warning ``` SSZipArchive/minizip/ioapi.c:195:33: Implicit conversion loses integer precision: 'ZPOS64_T' (aka 'unsigned long long') to 'long' ```	2014-03-03 11:38:04 +01:00
Bohdan Hernandez	de0ffe7478	Support for adding folders and subfolders to ZIP packages.	2014-02-09 02:48:44 +00:00
Andreas Linde	e422866c97	Fix clang analyzer warning appearing in line 1534 Removing the clang analyzer silencer in these lines fixed another clang analyzer warning that appeared in line 1534. In addition these lines do not cause a static analyzer warning in latest Xcode any longer. Tested with Xcode 5.0.2	2014-01-17 12:47:36 +01:00
Landon Fuller	653caaa9b2	Replace symlink heuristic with a well-defined test. As per the PKWARE ZIP File Format Specification (6.3.2), this patch tests the file 'version made by' field for the UNIX (3) constant, and then interprets the external file attributes accordingly, assuming an st_mode field in the high 16 bits.	2014-01-16 11:53:45 -05:00
Sam Soffes	d3c40f0e95	Happy New Year 🎉	2014-01-01 11:00:26 -08:00
Sam Soffes	ebc0b248ef	Merge pull request #86 from dennda/master Issue #85: Keep relative symbolic links relative.	2013-11-08 11:52:25 -08:00
Christopher Denter	f89c159b2a	Issue #85 : Add test for relative symlink preservation patch. This test adds a fixture RelativeSymlinks.zip with the following structure: RelativeSymbolicLink ├── symlinkedFile ├── symlinkedFolder └── symlinks ├── fileSymlink -> ../symlinkedFile └── folderSymlink -> ../symlinkedFolder The test checks if both `fileSymlink` and `folderSymlink` still point to the respective files in the parent directory after the fixture has been unzipped.	2013-11-08 20:34:17 +01:00
Christopher Denter	a5de5b6bef	Issue #85 : Keep relative symbolic links relative. Before, the library resolved symbolic links that are relative into absolute paths, using the current working directory of the process that's doing the unzipping, which to me seems pretty wrong. This was due to using -[NSURL fileURLWithPath:], which transforms relative URLs to absolute URLs automatically. I don't see much of a reason to use NSFileManager here, so I made that use symlink() directly. Alternatively, one could also use -[NSURL URLWithString:]. This keeps relative symlinks relative after unzipping.	2013-11-08 19:04:42 +01:00
Sam Soffes	bf95dc2fd4	Fix	2013-09-11 08:56:12 -07:00
Sam Soffes	c2b33b42d0	There we go	2013-09-11 08:43:46 -07:00
Sam Soffes	b91252282e	Simplify project structure	2013-09-10 00:03:11 -07:00
Sam Soffes	1fefbc022f	Add shares scheme	2013-09-09 23:50:07 -07:00
Sam Soffes	273fc1b36e	Fix minizip path	2013-09-09 09:04:04 -07:00
Sam Soffes	164ae9bfd3	Move minizip up	2013-09-09 09:00:52 -07:00
David Robles	d30b543f34	forgot to end pod spec.	2013-08-20 11:52:03 -07:00
David Robles	ce6cbe1193	Update out of date pod spec.	2013-08-20 10:57:34 -07:00
aceisScope	4cd142a39c	fix bug of "fclose"; add test for zipping a large amount of files in sequence	2013-08-05 12:42:47 +08:00
Rob Mickle	45b93c037d	close loose file handle in writeFileAtPath	2013-06-24 15:39:17 -06:00
Basit Ali	362b011990	Add writeFileAtPath:withFileName: in SSZipArchive.h so that it can be called.	2013-04-15 17:29:01 +05:00
Cpu86	92f1142056	Folder and subfolder zip functionality Added functionality to zip folder and maintains subfolder tree	2013-03-30 19:50:50 +01:00
David Robles	a53f908392	Update pod spec to prevent *.podspec file from being included as a source file when the pod is installed.	2012-08-16 15:04:59 -07:00
Chris Stevenson	3e2424437f	Bump the pod version number	2012-08-01 15:06:50 -07:00
Chris Stevenson	713835cc28	Add a delegate method that will report the file names of files that were unzipped	2012-08-01 15:03:29 -07:00