Add progress bar

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "merklemap-cli"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "MIT"
 description = "A CLI client for the merklemap.com API"
@@ -16,3 +16,4 @@ serde_json = "1.0"
 anyhow = "1.0"
 futures = "0.3.30"
 chrono = "0.4.38"
+indicatif = "0.17"

src/lib.rs

@@ -1,11 +1,7 @@
-//! MerkleMap CLI Library
-//!
-//! This library provides the core functionality for interacting with the [merklemap](https://www.merklemap.com/) API.
-//! It includes functions for searching subdomains and tailing live subdomain discoveries.
-
 use anyhow::Result;
 use chrono::{DateTime, TimeZone, Utc};
 use futures::StreamExt;
+use indicatif::{ProgressBar, ProgressStyle};
 use reqwest_eventsource::{Error as EventSourceError, Event, EventSource};
 use serde::Deserialize;
 
@@ -21,6 +17,11 @@ struct TailEntry {
     hostname: String,
 }
 
+#[derive(Debug, Deserialize)]
+struct ProgressEvent {
+    progress_percentage: f64,
+}
+
 trait Printable {
     fn print(&self);
 }
@@ -59,19 +60,27 @@ where
     T: for<'de> Deserialize<'de> + Printable,
 {
     let mut es = EventSource::get(url);
+    let pb = ProgressBar::new(100);
+    pb.set_style(ProgressStyle::default_bar()
+        .template("{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {percent}% ({eta})")?
+        .progress_chars("#>-"));
 
     while let Some(event) = es.next().await {
         match event {
             Ok(Event::Message(message)) => {
-                let entry = serde_json::from_str::<T>(&message.data)?;
-                entry.print();
+                if let Ok(progress) = serde_json::from_str::<ProgressEvent>(&message.data) {
+                    pb.set_position(progress.progress_percentage as u64);
+                } else if let Ok(entry) = serde_json::from_str::<T>(&message.data) {
+                    entry.print();
+                }
             }
             Ok(Event::Open) => {}
             Err(EventSourceError::StreamEnded) => break,
             Err(e) => eprintln!("Error: {:?}", e),
         }
     }
 
+    pb.finish_with_message("Done");
     Ok(())
 }
 
@@ -80,7 +89,7 @@ fn format_timestamp(timestamp: DateTime<Utc>) -> String {
 }
 
 pub async fn search(query: &str) -> Result<()> {
-    let url = format!("https://api.merklemap.com/search?query={}&stream=true", query);
+    let url = format!("https://api.merklemap.com/search?query={}&stream=true&stream_progress=true", query);
     process_event_stream::<Entry>(&url).await
 }