From 70f0acfca76dcc820de4ab8b16e42f139c06b3b4 Mon Sep 17 00:00:00 2001
From: cohenarthur <arthur.cohen@epita.fr>
Date: Sat, 18 Apr 2020 16:27:21 +0200
Subject: [PATCH] args: Change quiet to verbose since default behavior is quiet

---
 src/args.rs     |  4 ++--
 src/logger.rs   | 13 +++++++++----
 src/scraper.rs  |  2 +-
 tests/speed.csv |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/args.rs b/src/args.rs
index 90daee2..cfe1f17 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -20,8 +20,8 @@ pub struct Args {
     #[structopt(short, long, default_value = "20")]
     pub tries: usize,
 
-    #[structopt(short, long, default_value = "true")]
-    pub quiet: bool,
+    #[structopt(short, long, parse(try_from_str), default_value = "false")]
+    pub verbose: bool,
 }
 
 impl Args {
diff --git a/src/logger.rs b/src/logger.rs
index 6f606f2..00cc77e 100644
--- a/src/logger.rs
+++ b/src/logger.rs
@@ -15,16 +15,21 @@ impl Logger {
         format!("{}", Local::now())
     }
 
-    /// Display an INFO message
-    pub fn info(message: String) {
+    /// Write a log message to stdout
+    fn write_log(header: ColoredString, message: String) {
         // Sadly we can't use a static format litteral so we have to retype
         // this for every function...
-        println!("{}: [{}] {}", Logger::get_timestamp(), "INFO".blue(), message);
+        println!("{}: [{}] {}", Logger::get_timestamp(), header, message);
+    }
+
+    /// Display an INFO message
+    pub fn info(message: String) {
+        Logger::write_log("INFO".blue(), message);
     }
 
     /// Display a WARNING message
     pub fn warn(message: String) {
-        println!("{}: [{}] {}", Logger::get_timestamp(), "WARN".yellow(), message);
+        Logger::write_log("WARN".yellow(), message);
     }
 
     /// Display an ERROR message
diff --git a/src/scraper.rs b/src/scraper.rs
index 77a99c4..9ee4742 100644
--- a/src/scraper.rs
+++ b/src/scraper.rs
@@ -110,7 +110,7 @@ impl Scraper {
 
         scraper.visited_urls.lock().unwrap().insert(url.to_string());
 
-        if !scraper.args.quiet {
+        if scraper.args.verbose {
             info!("Downloaded {}", url);
         }
     }
diff --git a/tests/speed.csv b/tests/speed.csv
index 13f42e6..c48e100 100644
--- a/tests/speed.csv
+++ b/tests/speed.csv
@@ -6,3 +6,4 @@
 94.91624474525452, 47.318924236297605, 38.720614719390866
 94.61654992103577, 57.59067335128784, 24.995196104049683
 95.28456358909607, 46.86330976486206, 24.708560609817503
+77.68792352676391, 39.08626494407654, 19.765260219573975