From 3fa5b2793140440ffcab589a3beb4241931bf4b3 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Sun, 13 Jun 2021 17:00:56 +0200
Subject: [PATCH] Utilites: Implement `unzip -q`

---
 Userland/Utilities/unzip.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Userland/Utilities/unzip.cpp b/Userland/Utilities/unzip.cpp
index 640f821de9..50a2a0c327 100644
--- a/Userland/Utilities/unzip.cpp
+++ b/Userland/Utilities/unzip.cpp
@@ -14,14 +14,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-static bool unpack_zip_member(Archive::ZipMember zip_member)
+static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
 {
     if (zip_member.is_directory) {
         if (mkdir(zip_member.name.characters(), 0755) < 0) {
             perror("mkdir");
             return false;
         }
-        outln(" extracting: {}", zip_member.name);
+        if (!quiet)
+            outln(" extracting: {}", zip_member.name);
         return true;
     }
     auto new_file = Core::File::construct(zip_member.name);
@@ -30,7 +31,8 @@ static bool unpack_zip_member(Archive::ZipMember zip_member)
         return false;
     }
 
-    outln(" extracting: {}", zip_member.name);
+    if (!quiet)
+        outln(" extracting: {}", zip_member.name);
 
     // TODO: verify CRC32s match!
     switch (zip_member.compression_method) {
@@ -73,11 +75,13 @@ int main(int argc, char** argv)
 {
     const char* path;
     int map_size_limit = 32 * MiB;
+    bool quiet { false };
     String output_directory_path;
 
     Core::ArgsParser args_parser;
     args_parser.add_option(map_size_limit, "Maximum chunk size to map", "map-size-limit", 0, "size");
     args_parser.add_option(output_directory_path, "Directory to receive the archive content", "output-directory", 'd', "path");
+    args_parser.add_option(quiet, "Be less verbose", "quiet", 'q');
     args_parser.add_positional_argument(path, "File to unzip", "path", Core::ArgsParser::Required::Yes);
     args_parser.parse(argc, argv);
 
@@ -107,7 +111,8 @@ int main(int argc, char** argv)
     }
     auto& mapped_file = *file_or_error.value();
 
-    warnln("Archive: {}", zip_file_path);
+    if (!quiet)
+        warnln("Archive: {}", zip_file_path);
 
     auto zip_file = Archive::Zip::try_create(mapped_file.bytes());
     if (!zip_file.has_value()) {
@@ -130,7 +135,7 @@ int main(int argc, char** argv)
     }
 
     auto success = zip_file->for_each_member([&](auto zip_member) {
-        return unpack_zip_member(zip_member) ? IterationDecision::Continue : IterationDecision::Break;
+        return unpack_zip_member(zip_member, quiet) ? IterationDecision::Continue : IterationDecision::Break;
     });
 
     return success ? 0 : 1;