Merge pull request ZipArchive#398 from ZipArchive/nestedZip

support nested zip by calling fclose first

Author: Coeur

SSZipArchive/SSZipArchive.m

@@ -434,24 +434,23 @@ + (BOOL)unzipFileAtPath:(NSString *)path
  }
 
  if (fp) {
- if (nestedZipLevel && [fullPath.pathExtension.lowercaseString isEqualToString:@"zip"]) {
- if ([self unzipFileAtPath:fullPath
- toDestination:fullPath.stringByDeletingLastPathComponent
- preserveAttributes:preserveAttributes
- overwrite:overwrite
- nestedZipLevel:nestedZipLevel - 1
- password:password
- error:nil
- delegate:nil
- progressHandler:nil
- completionHandler:nil]) {
- [[NSFileManager defaultManager] removeItemAtPath:fullPath error:nil];
- }
- }
- 
  fclose(fp);
 
- if (preserveAttributes) {
+ if (nestedZipLevel
+ && [fullPath.pathExtension.lowercaseString isEqualToString:@"zip"]
+ && [self unzipFileAtPath:fullPath
+ toDestination:fullPath.stringByDeletingLastPathComponent
+ preserveAttributes:preserveAttributes
+ overwrite:overwrite
+ nestedZipLevel:nestedZipLevel - 1
+ password:password
+ error:nil
+ delegate:nil
+ progressHandler:nil
+ completionHandler:nil]) {
+ [directoriesModificationDates removeLastObject];
+ [[NSFileManager defaultManager] removeItemAtPath:fullPath error:nil];
+ } else if (preserveAttributes) {
 
  // Set the original datetime property
  if (fileInfo.dos_date != 0) {