Version 0.2.0

* Add ARC support
* Fixes: One of the bugs is that the file modification dates for files being unzipped were wrong. Apparently the code was taking the MS-DOS date and time and treating it as an NSTimeInterval since Jan 1, 1980. This is not correct and was resulting in modification dates for me in 2014. — Brant Sears
* Fixes: The second bug was that the file modification dates for folders were showing up as the current date/time, but when I unzip the same archive using Apple's implementation of zip, the file modification dates for those folders were set sometime in the past. — Brant Sears

Changelog.markdown

@@ -1,5 +1,13 @@
 # SSZipArchive Changelog
 
+### Version 0.2.0
+
+[Released May 7, 2012](https://github.com/samsoffes/sskeychain/tree/0.2.0)
+
+* Add unzipping delegate
+* Fix unzipping with passwords
+* Fix modified at dates
+
 ### Version 0.1.2
 
 [Released December 26, 2011](https://github.com/samsoffes/sskeychain/tree/0.1.2)

Readme.markdown

@@ -1,6 +1,6 @@
 # SSZipArchive
 
-SSZipArchive is a simple utility class for unzipping files originally based on [ZipArchive](http://code.google.com/p/ziparchive) by aish. Features:
+SSZipArchive is a simple utility class for zipping and unzipping files. Features:
 
 * Unzipping zip files
 * Unzipping password protected zip files
@@ -37,4 +37,4 @@ SSZipArchive is licensed under the [MIT license](https://github.com/samsoffes/ss
 
 ## Thanks
 
-Thanks [aish](http://code.google.com/p/ziparchive) for creating [ZipArchive](http://code.google.com/p/ziparchive), Johnnie Walker ([@randomsequence](https://github.com/randomsequence)) for implementing creation support, and John Engelhart ([@johnezang](https://github.com/johnezang)) for his help along the way.
+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.

SSZipArchive.h

@@ -7,7 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "minizip/zip.h"
+#include "minizip/unzip.h"
+
+@protocol SSZipArchiveDelegate;
 
 @interface SSZipArchive : NSObject
 
@@ -15,6 +17,9 @@
 + (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 delegate:(id<SSZipArchiveDelegate>)delegate;
+
 // Zip
 + (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)filenames;
 
@@ -25,3 +30,16 @@
 - (BOOL)close;
 
 @end
+
+
+@protocol SSZipArchiveDelegate <NSObject>
+
+@optional
+
+- (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo;
+- (void)zipArchiveDidUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo unzippedPath:(NSString *)unzippedPath;
+
+- (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;
+
+@end

SSZipArchive.m

@@ -8,14 +8,13 @@
 
 #import "SSZipArchive.h"
 #include "minizip/zip.h"
-#include "minizip/unzip.h"
 #import "zlib.h"
 #import "zconf.h"
 
 #define CHUNK 16384
 
 @interface SSZipArchive ()
-+ (NSDate *)_dateFor1980;
++ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime;
 @end
 
 
@@ -29,11 +28,21 @@
 #pragma mark - Unzipping
 
 + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination {
-	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil];
+	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 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 overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate {
 	// Begin opening
 	zipFile zip = unzOpen((const char*)[path UTF8String]);	
 	if (zip == NULL) {
@@ -57,11 +66,17 @@
 	}
 	
 	BOOL success = YES;
-	int ret;
+	int ret = 0;
 	unsigned char buffer[4096] = {0};
 	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSDate *nineteenEighty = [self _dateFor1980];
+	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
 	
+	// Message delegate
+	if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipArchiveAtPath:zipInfo:)]) {
+		[delegate zipArchiveWillUnzipArchiveAtPath:path zipInfo:globalInfo];
+	}
+	
+	NSInteger currentFileNumber = 0;
 	do {
 		if ([password length] == 0) {
 			ret = unzOpenCurrentFile(zip);
@@ -85,6 +100,12 @@
 			break;
 		}
 		
+		// Message delegate
+		if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
+			[delegate zipArchiveWillUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
+										 archivePath:path fileInfo:fileInfo];
+		}
+		
 		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';
@@ -102,15 +123,23 @@
 			strPath = [strPath stringByReplacingOccurrencesOfString:@"\\" withString:@"/"];
 		}
 		
-		NSString* fullPath = [destination stringByAppendingPathComponent:strPath];
+		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];
 		
 		if (isDirectory) {
-			[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:nil error:nil];
+			[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr  error:&err];
 		} else {
-			[fileManager createDirectoryAtPath:[fullPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:nil];
+			[fileManager createDirectoryAtPath:[fullPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:directoryAttr error:&err];
 		}
-		
-		if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
+        if (nil != err) {
+            NSLog(@"[SSZipArchive] Error: %@", err.localizedDescription);
+        }
+
+        [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
+
+        if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
 			unzCloseCurrentFile(zip);
 			ret = unzGoToNextFile(zip);
 			continue;
@@ -132,26 +161,55 @@
 			
 			// Set the original datetime property
 			if (fileInfo.dosDate != 0) {
-				NSDate *orgDate = [[NSDate alloc] initWithTimeInterval:(NSTimeInterval)fileInfo.dosDate  sinceDate:nineteenEighty];
+				NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
 				NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
 				
 				if (attr) {
 					if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
 						// Can't set attributes 
-						NSLog(@"Failed to set attributes");
+						NSLog(@"[SSZipArchive] Failed to set attributes");
 					}
 				}
-				[orgDate release];
 			}
 		}
 		
 		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];
+		}
+		
+		currentFileNumber++;
 	} while(ret == UNZ_OK && UNZ_OK != 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 (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];
+	}
+	
 	return success;
 }
 
@@ -167,7 +225,10 @@
 		}
 		success = [zipArchive close];        
 	}
+	
+#if !__has_feature(objc_arc)
 	[zipArchive release];
+#endif
 
 	return success;
 }
@@ -181,10 +242,12 @@
 }
 
 
+#if !__has_feature(objc_arc)
 - (void)dealloc {
-	[_path release];
+    [_path release];
 	[super dealloc];
 }
+#endif
 
 
 - (BOOL)open {    
@@ -194,6 +257,19 @@
 }
 
 
+- (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date {
+    NSCalendar *currentCalendar = [NSCalendar currentCalendar];
+    uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
+    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;
+    zipInfo->tmz_date.tm_hour = (unsigned int)components.hour;
+    zipInfo->tmz_date.tm_mday = (unsigned int)components.day;
+    zipInfo->tmz_date.tm_mon = (unsigned int)components.month - 1;
+    zipInfo->tmz_date.tm_year = (unsigned int)components.year;
+}
+
+
 - (BOOL)writeFile:(NSString *)path {
 	NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
 
@@ -219,31 +295,26 @@
 
 
 - (BOOL)writeData:(NSData *)data filename:(NSString *)filename {
-	NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
-	NSAssert((data != NULL), @"Nil data");
+    if (!_zip) {
+		return NO;
+    }
+    if (!data) {
+		return NO;
+    }
+    zip_fileinfo zipInfo = {0};
+    [self zipInfo:&zipInfo setDate:[NSDate date]];
 
-	zipOpenNewFileInZip(_zip, [filename UTF8String], NULL, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
+	zipOpenNewFileInZip(_zip, [filename UTF8String], &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
 
-	void *buffer = malloc(CHUNK);
-	unsigned int offset = 0;
-	NSUInteger length = [data length];
-	unsigned int chunk_length = 0;
-
-	while (offset < length) { 
-		chunk_length = MIN(CHUNK, ((unsigned int) length)-offset);
-		[data getBytes:&buffer range:NSMakeRange(offset, chunk_length)];
-		zipWriteInFileInZip(_zip, buffer, chunk_length);
-		offset += chunk_length;
-	}
+    zipWriteInFileInZip(_zip, data.bytes, (unsigned int)data.length);
 
 	zipCloseFileInZip(_zip);
-	free(buffer);
 	return YES;
 }
 
 
 - (BOOL)close {    
-	NSAssert((_zip != NULL), @"Attempting to close an archive which was never opened");
+	NSAssert((_zip != NULL), @"[SSZipArchive] Attempting to close an archive which was never opened");
 	zipClose(_zip, NULL);
 	return YES;
 }
@@ -251,16 +322,40 @@
 
 #pragma mark - Private
 
-+ (NSDate *)_dateFor1980 {
-	NSDateComponents *comps = [[NSDateComponents alloc] init];
-	[comps setDay:1];
-	[comps setMonth:1];
-	[comps setYear:1980];
-	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-	NSDate *date = [gregorian dateFromComponents:comps];
+// Format from http://newsgroups.derkeiler.com/Archive/Comp/comp.os.msdos.programmer/2009-04/msg00060.html
+// Two consecutive words, or a longword, YYYYYYYMMMMDDDDD hhhhhmmmmmmsssss
+// YYYYYYY is years from 1980 = 0
+// sssss is (seconds/2).
+//
+// 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 {
+	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;
 	
-	[comps release];
+	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+    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)
 	[gregorian release];
+	[components release];
+#endif
+	
 	return date;
 }
 

Tests/SSZipArchive.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		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 */; };
+		B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -35,10 +36,10 @@
 		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>"; };
-		B215FB60143AD514003AC546 /* SSZipArchiveTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipArchiveTests.h; 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>"; };
+		B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestPasswordArchive.zip; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -113,10 +114,10 @@
 		B215FB5E143AD505003AC546 /* SSZipArchiveTests */ = {
 			isa = PBXGroup;
 			children = (
-				B215FB60143AD514003AC546 /* SSZipArchiveTests.h */,
 				B215FB61143AD514003AC546 /* SSZipArchiveTests.m */,
 				B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */,
 				B215FB6C143AD6FF003AC546 /* TestArchive.zip */,
+				B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */,
 			);
 			name = SSZipArchiveTests;
 			sourceTree = "<group>";
@@ -148,7 +149,7 @@
 		B215FB06143AD3C7003AC546 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0440;
 				ORGANIZATIONNAME = "Sam Soffes";
 			};
 			buildConfigurationList = B215FB09143AD3C7003AC546 /* Build configuration list for PBXProject "SSZipArchive" */;
@@ -174,6 +175,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */,
+				B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -217,6 +219,7 @@
 			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;
@@ -243,6 +246,7 @@
 			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;
@@ -263,7 +267,6 @@
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = octest;
 			};
@@ -275,7 +278,6 @@
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = octest;
 			};

Tests/SSZipArchiveTests.h

@@ -1,16 +0,0 @@
-//
-//  SSZipArchiveTests.h
-//  SSZipArchiveTests
-//
-//  Created by Sam Soffes on 10/3/11.
-//  Copyright (c) 2011 Sam Soffes. All rights reserved.
-//
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface SSZipArchiveTests : SenTestCase
-
-- (void)testZipping;
-- (void)testUnzipping;
-
-@end

Tests/SSZipArchiveTests.m

@@ -6,17 +6,24 @@
 //  Copyright (c) 2011 Sam Soffes. All rights reserved.
 //
 
-#import "SSZipArchiveTests.h"
 #import "SSZipArchive.h"
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SSZipArchiveTests : SenTestCase <SSZipArchiveDelegate>
+
+- (NSString *)_cachesPath:(NSString *)directory;
 
-@interface SSZipArchiveTests ()
-- (NSString *)_cachesPath;
 @end
 
 @implementation SSZipArchiveTests
 
+- (void)setUp {
+	[[NSFileManager defaultManager] removeItemAtPath:[self _cachesPath:nil] error:nil];
+}
+
+
 - (void)testZipping {
-	NSString *outputPath = [self _cachesPath];
+	NSString *outputPath = [self _cachesPath:@"Zipped"];
 	NSArray *inputPaths = [NSArray arrayWithObjects:
 						   [outputPath stringByAppendingPathComponent:@"Readme.markdown"],
 						   [outputPath stringByAppendingPathComponent:@"LICENSE"],
@@ -31,30 +38,83 @@
 
 - (void)testUnzipping {
 	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
-	NSString *outputPath = [self _cachesPath];
+	NSString *outputPath = [self _cachesPath:@"Regular"];
 	
-	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath];
+	[SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
 	
-	NSFileManager *fileManager = [NSFileManager defaultManager];    
+	NSFileManager *fileManager = [NSFileManager defaultManager];
 	NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
 	STAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
 	
 	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
 	STAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+}
+
+
+- (void)testUnzippingWithPassword {
+	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestPasswordArchive" ofType:@"zip"];
+	NSString *outputPath = [self _cachesPath:@"Password"];
 	
-	// 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.
-//	zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"LargeArchive" ofType:@"zip"];
-//	outputPath = [[self _cachesPath] stringByAppendingPathComponent:@"large"];
+	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"];
+	STAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+	
+	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
+	STAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+}
+
+
+// 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];
+//}
+
+
+#pragma mark - SSZipArchiveDelegate
+
+- (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo {
+	NSLog(@"*** zipArchiveWillUnzipArchiveAtPath: `%@` zipInfo:", path);
+}
+
+
+- (void)zipArchiveDidUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo unzippedPath:(NSString *)unzippedPath {
+	NSLog(@"*** zipArchiveDidUnzipArchiveAtPath: `%@` zipInfo: unzippedPath: `%@`", path, unzippedPath);
+}
+
+
+- (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
+	NSLog(@"*** zipArchiveWillUnzipFileAtIndex: `%ld` totalFiles: `%ld` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+}
+
+
+- (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
+	NSLog(@"*** zipArchiveDidUnzipFileAtIndex: `%ld` totalFiles: `%ld` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
 }
 
 
 #pragma mark - Private
 
-- (NSString *)_cachesPath {
-	return [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject]
-			stringByAppendingPathComponent:@"com.samsoffes.ssziparchive.tests"];
+- (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;
 }
 
 @end

minizip/unzip.c

@@ -68,9 +68,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
+//#ifndef NOUNCRYPT
+//        #define NOUNCRYPT
+//#endif
 
 #include "zlib.h"
 #include "unzip.h"