src/main.rs

@@ -89,59 +89,63 @@ fn run(
     let statuses = client.statuses(&acc.id, None)?;
 
     let regex = Regex::new(regex).unwrap();
-    let mut count = 0;
+    let mut results = Vec::new();
 
-    println!("\n\nResults:\n");
+    if verbose {
+        println!("Searching...");
+    }
 
     // Search through statuses
     for status in statuses.items_iter() {
         // Add it to results if it matches and it isn't a retoot
         // or if it matches and isn't a retoot
         if status_matches(&status, &regex) && (include_retoots || status.reblog.is_none()) {
-            print_status(&status, verbose);
-            count += 1;
+            results.push(status);
         }
 
         // If there's a limit of results, check it and exit
         if let Some(max) = max_statuses {
-            if count >= max {
+            if results.len() >= max {
                 break;
             }
         }
     }
 
-    println!("Found {} results", count);
+    println!("\n\nResults:\n");
 
-    Ok(())
-}
-
-fn print_status(status: &Status, verbose: bool) {
-    if !status.spoiler_text.is_empty() {
-        println!("CW: {}", status.spoiler_text);
-    }
-    println!("Content: {}", status.content);
-    // Print actual url if it's a retoot
-    if let Some(retoot) = &status.reblog {
-        if let Some(url) = &retoot.url {
+    // Print results
+    for status in &results {
+        if !status.spoiler_text.is_empty() {
+            println!("CW: {}", status.spoiler_text);
+        }
+        println!("Content: {}", status.content);
+        // Print actual url if it's a retoot
+        if let Some(retoot) = &status.reblog {
+            if let Some(url) = &retoot.url {
+                println!("Url: {}", url);
+            }
+        } else if let Some(url) = &status.url {
             println!("Url: {}", url);
         }
-    } else if let Some(url) = &status.url {
-        println!("Url: {}", url);
-    }
 
-    // Print some extra info
-    if verbose {
-        println!("Created at: {}", status.created_at);
-        if let Some(retoot) = &status.reblog {
-            println!("Is retoot: yes ({})", retoot.account.acct);
-        } else {
-            // We don't want to print these if it's a retoot
-            println!("Favs: {}", status.favourites_count);
-            println!("Retoots: {}", status.reblogs_count);
+        // Print some extra info
+        if verbose {
+            println!("Created at: {}", status.created_at);
+            if let Some(retoot) = &status.reblog {
+                println!("Is retoot: yes ({})", retoot.account.acct);
+            } else {
+                // We don't want to print these if it's a retoot
+                println!("Favs: {}", status.favourites_count);
+                println!("Retoots: {}", status.reblogs_count);
+            }
         }
+
+        println!();
     }
 
-    println!();
+    println!("Found {} results", results.len());
+
+    Ok(())
 }
 
 fn status_matches(status: &Status, regex: &Regex) -> bool {