Fixes to CLI

- return 0 for success in dump mode
- print progress of unzip mode
- print progress of zip mode
- fix execution description of zip mode
- fix single file zipping in zip mode

Author: NSProgrammer

ZipUtilities.xcodeproj/xcshareddata/xcschemes/noz -Release.xcscheme

@@ -61,6 +61,16 @@
             ReferencedContainer = "container:ZipUtilities.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-z -o /Users/nobrien/Doxygen.zip -i /Applications/Doxygen.app -m Brotli -l 12"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-z -o /Users/nobrien/Desktop/Doxygen.app.tar.zip -i /Users/nobrien/Desktop/Doxygen.app.tar -m Brotli -l 12"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

ZipUtilities.xcodeproj/xcshareddata/xcschemes/noz.xcscheme

@@ -66,6 +66,22 @@
             argument = "-A"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-z -i -m Brotli -l 12 /Applications/Doxygen.app -o /Users/nobrien/Doxygen.zip"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-z -o /Users/nobrien/Doxygen.zip -i -m Brotli -l 12 /Applications/Doxygen.app"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-z -o /Users/nobrien/Doxygen.zip -i /Applications/Doxygen.app -m Brotli -l 12"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-z -o /Users/nobrien/Desktop/Doxygen.app.tar.zip -i /Users/nobrien/Desktop/Doxygen.app.tar -m Brotli -l 12"
+            isEnabled = "NO">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "-D -L -i ~/Desktop/Maniac\ Mansion/Maniac_Mansion.zip"
             isEnabled = "NO">
@@ -76,7 +92,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-u"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-z -M Brotli 101 -c &quot;Encoded (101) using Brotli&quot; -o ~/Desktop/XC9.zip -i /Applications/Xcode_9_GM.app -m Brotli -l 10 "

noz/NOZCLIDumpMode.m

@@ -124,7 +124,7 @@ + (int)run:(NOZCLIDumpModeInfo *)info
         }];
     }
 
-    return 1;
+    return 0;
 }
 
 + (void)dumpCentralDirectory:(NOZCentralDirectory *)centralDirectory info:(NOZCLIDumpModeInfo *)info

noz/NOZCLIUnzipMode.m

@@ -201,15 +201,19 @@ + (int)run:(NOZCLIUnzipModeInfo *)info
         [op start]; // will run synchronously
         NOZDecompressResult *result = op.result;
         if (result.operationError) {
+            printf("\n");
             NOZCLI_printError(result.operationError);
             return -2;
         }
 
         if (!result.didSucceed) {
+            printf("\n");
             printf("FAILED!\n");
             return -2;
         }
 
+        fprintf(stdout, "\r");
+        fflush(stdout);
         printf("compression ratio: %f\n", result.compressionRatio);
         return 0;
     }
@@ -228,8 +232,9 @@ + (int)run:(NOZCLIUnzipModeInfo *)info
     }
 
     NOZProgressBlock progressBlock = ^(int64_t totalBytes, int64_t bytesComplete, int64_t bytesCompletedThisPass, BOOL *abort) {
-//        const double progress = (double)bytesComplete / (double)totalBytes;
-//        printf("%zi%%\n", (NSInteger)(progress * 100.));
+        const double progress = (double)bytesComplete / (double)totalBytes;
+        fprintf(stdout, "\r%li%%", (long)progress);
+        fflush(stdout);
     };
     NSFileManager *fm = [NSFileManager defaultManager];
     NSString *tmpDir = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSUUID UUID].UUIDString];
@@ -251,9 +256,12 @@ + (int)run:(NOZCLIUnzipModeInfo *)info
 
         if (![unzipper saveRecord:record toDirectory:tmpDir options:NOZUnzipperSaveRecordOptionIgnoreIntermediatePath progressBlock:progressBlock error:&error]) {
             [fm removeItemAtPath:tmpDir error:NULL];
+            printf("\n");
             NOZCLI_printError(error);
             return -2;
         }
+        fprintf(stdout, "\r");
+        fflush(stdout);
 
         NSString *tmpPath = [tmpDir stringByAppendingPathComponent:record.name.lastPathComponent];
         NSString *dstPath = entry.outputPath ?: [info.baseOutputPath stringByAppendingPathComponent:entry.entryName];
@@ -392,7 +400,7 @@ - (NSString *)description
 
 @implementation NOZCLIUnzipDecompressDelegate
 {
-    NSInteger _lastProgress;
+    long _lastProgress;
 }
 
 - (void)decompressOperation:(NOZDecompressOperation *)op didCompleteWithResult:(NOZDecompressResult *)result
@@ -401,12 +409,13 @@ - (void)decompressOperation:(NOZDecompressOperation *)op didCompleteWithResult:(
 
 - (void)decompressOperation:(NOZDecompressOperation *)op didUpdateProgress:(float)progress
 {
-    const NSInteger progressInt = (NSInteger)(progress * 100.f);
+    const long progressInt = (long)(progress * 100.f);
     if (progressInt == _lastProgress) {
         return;
     }
     _lastProgress = progressInt;
-    // printf("%zi%%\n", progressInt);
+    fprintf(stdout, "\r%li%%", progressInt);
+    fflush(stdout);
 }
 
 - (BOOL)shouldDecompressOperation:(NOZDecompressOperation *)op overwriteFileAtPath:(NSString *)path

noz/NOZCLIZipMode.m

@@ -56,12 +56,12 @@ + (NSString *)modeFlag
 
 + (NSString *)modeName
 {
-    return @"Zip (NYI)";
+    return @"Zip";
 }
 
 + (NSString *)modeExecutionDescription
 {
-    return @"[zip_options] -o output_file -i [file_options] input_file1 [... [-i [file_options] intpu_fileN]]";
+    return @"[zip_options] -o output_file -i input_file1 [file_options] [... [-i intput_fileN [file_options]]]";
 }
 
 + (NSUInteger)modeExtraArgumentsSectionCount
@@ -200,13 +200,17 @@ + (int)run:(NOZCLIZipModeInfo *)info
         // TODO - support avoiding hidden files
 
         NSFileManager *fm = [NSFileManager defaultManager];
-        NSDirectoryEnumerator *enumerator = [fm enumeratorAtPath:entryInfo.entryPath];
-        if (!enumerator) {
+        BOOL entryIsDirectory = NO;
+        if (![fm fileExistsAtPath:entryInfo.entryPath isDirectory:&entryIsDirectory]) {
+            entryIsDirectory = NO;
+        }
+        if (!entryIsDirectory) {
             NOZFileZipEntry *entry = [[NOZFileZipEntry alloc] initWithFilePath:entryInfo.entryPath];
             if (![self _zip:zipper entry:entry methodInfo:methodInfo entryInfo:entryInfo method:overrideMethodNumber]) {
                 return -1;
             }
         } else {
+            NSDirectoryEnumerator *enumerator = [fm enumeratorAtPath:entryInfo.entryPath];
             NSString *filePath = nil;
             while (nil != (filePath = enumerator.nextObject)) {
                 NSString *fullPath = [entryInfo.entryPath stringByAppendingPathComponent:filePath];
@@ -236,11 +240,22 @@ + (BOOL)_zip:(NOZZipper *)zipper entry:(NOZFileZipEntry *)entry methodInfo:(Meth
     entry.comment = entryInfo.comment;
 
     printf("%s  ...\n", entry.filePath.UTF8String);
+    NOZProgressBlock progress = ^(int64_t totalBytes,
+                                  int64_t bytesComplete,
+                                  int64_t bytesCompletedThisPass,
+                                  BOOL * __nonnull abort) {
+        fprintf(stdout, "\r%%%li", (long)(100 * ((double)bytesComplete / (double)totalBytes)));
+        fflush(stdout);
+    };
+
     NSError *error;
-    if (![zipper addEntry:entry progressBlock:NULL error:&error]) {
+    if (![zipper addEntry:entry progressBlock:progress error:&error]) {
+        printf("\n");
         NOZCLI_printError(error);
         return NO;
     }
+    fprintf(stdout, "\r");
+    fflush(stdout);
     return YES;
 }
 
@@ -287,6 +302,8 @@ @implementation NOZCLIZipModeEntryInfo
                 printf("%s ", arg.UTF8String);
             }
             printf("\n");
+            fflush(stdout);
+            return nil;
         }
         [entries addObject:entry];
     }