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
parent 13e3ab93b4 33c7884202
commit c881c8528f
2 changed files with 10 additions and 0 deletions
@@ -383,6 +383,11 @@
 }

 + (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;
@@ -398,6 +403,10 @@
            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