Fixes for unzipping modification dates and add ARC support

* 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

Author: soffes

SSZipArchive.h

@@ -7,7 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "SSZipArchiveDelegate.h"
+#include "minizip/unzip.h"
+
+@protocol SSZipArchiveDelegate;
 
 @interface SSZipArchive : NSObject
 
@@ -28,3 +30,14 @@
 - (BOOL)close;
 
 @end
+
+
+@protocol SSZipArchiveDelegate <NSObject>
+
+@optional
+
+- (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path globalInfo:(unz_global_info)globalInfo;
+- (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,7 +8,6 @@
 
 #import "SSZipArchive.h"
 #include "minizip/zip.h"
-#include "minizip/unzip.h"
 #import "zlib.h"
 #import "zconf.h"
 
@@ -67,13 +66,19 @@ + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination o
 	}
 
 	BOOL success = YES;
-	int ret;
+	int ret = 0;
 	unsigned char buffer[4096] = {0};
 	NSFileManager *fileManager = [NSFileManager defaultManager];
 	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
 	if([delegate respondsToSelector:@selector(zipArchiveWillUnzipFile:globalInfo:)])
 		[delegate zipArchiveWillUnzipFile:path globalInfo:globalInfo];
 
+	// Message delegate
+	if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipArchiveAtPath:globalInfo:)]) {
+		[delegate zipArchiveWillUnzipArchiveAtPath:path globalInfo:globalInfo];
+	}
+	
+	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
 	NSInteger currentFileNumber = 0;
 	do {
 		if ([password length] == 0) {
@@ -98,9 +103,11 @@ + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination o
 			break;
 		}
 
-		if([delegate respondsToSelector:@selector(zipArchiveWillUnzipFileNumber:outOf:fromFile:fileInfo:)])
-			[delegate zipArchiveWillUnzipFileNumber:currentFileNumber outOf:(NSInteger)globalInfo.number_entry
-										   fromFile:path fileInfo:fileInfo];
+		// 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);
@@ -132,10 +139,9 @@ + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination o
         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);
@@ -173,6 +179,12 @@ + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination o
 		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);
 
@@ -325,7 +337,7 @@ + (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime {
 
 	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)];

Tests/SSZipArchiveTests.m

@@ -9,7 +9,7 @@
 #import "SSZipArchiveTests.h"
 #import "SSZipArchive.h"
 
-@interface SSZipArchiveTests ()
+@interface SSZipArchiveTests () <SSZipArchiveDelegate>
 - (NSString *)_cachesPath;
 @end
 
@@ -33,9 +33,9 @@ - (void)testUnzipping {
 	NSString *zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestArchive" ofType:@"zip"];
 	NSString *outputPath = [self _cachesPath];
 
-	[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");
 
@@ -50,6 +50,23 @@ - (void)testUnzipping {
 }
 
 
+#pragma mark - Delegate
+
+- (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path globalInfo:(unz_global_info)globalInfo {
+	NSLog(@"zipArchiveWillUnzipArchiveAtPath: `%@` globalInfo:", path);
+}
+
+
+- (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
+	NSLog(@"zipArchiveWillUnzipFileAtIndex: `%ld` totalFiles: `%ld` unzippedPath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+}
+
+
+- (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
+	NSLog(@"zipArchiveDidUnzipFileAtIndex: `%ld` totalFiles: `%ld` unzippedPath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+}
+
+
 #pragma mark - Private
 
 - (NSString *)_cachesPath {