Add tqdm to display progress bar

Author: dormant-user

Cargo.toml

@@ -34,3 +34,4 @@ plist = "1.7.0"
 threadpool = "1.8.1"
 log = "0.4.25"
 chrono = "0.4.39"
+tqdm = "0.7.0"

src/dbutil.rs

@@ -0,0 +1,48 @@
+use rusqlite::Connection;
+use std::path::Path;
+
+#[allow(dead_code)]
+fn get_columns(manifest_db_path: &Path) -> rusqlite::Result<(), Box<dyn std::error::Error>> {
+    let conn = Connection::open(manifest_db_path)?;
+    let mut col_smt = conn.prepare("PRAGMA table_info(Files)")?;
+    let columns: Vec<String> = col_smt
+        .query_map([], |row| {
+            // The column name is in the second column (index 1)
+            let col_name: String = row.get(1)?;
+            Ok(col_name)
+        })?
+        .collect::<Result<Vec<String>, _>>()?;
+    for col in columns {
+        println!("{}", col);
+    }
+    Ok(())
+}
+
+#[allow(dead_code)]
+fn get_table(
+    manifest_db_path: &Path,
+    limit: Option<usize>,
+) -> rusqlite::Result<(), Box<dyn std::error::Error>> {
+    let conn = Connection::open(manifest_db_path)?;
+    let statement = if limit.is_some() {
+        format!("SELECT * FROM Files LIMIT {}", limit.unwrap())
+    } else {
+        "SELECT * FROM Files".to_string()
+    };
+    let mut col_smt = conn.prepare(&statement)?;
+    let columns: Vec<String> = col_smt
+        .column_names()
+        .iter()
+        .map(|&s| s.to_string())
+        .collect();
+    let mut rows = col_smt.query([])?;
+    println!("{:<20} {:<50}", "Column Name", "Value");
+    while let Some(row) = rows.next()? {
+        for (i, col_name) in columns.iter().enumerate() {
+            let value: String = row.get::<_, String>(i).unwrap_or_default();
+            println!("{:<20} {:<50}", col_name, value);
+        }
+        println!();
+    }
+    Ok(())
+}

src/fileio.rs

@@ -6,7 +6,9 @@ use std::fs::{create_dir_all, File};
 use std::io::copy;
 use std::path::Path;
 use std::sync::mpsc::channel;
+use std::sync::{Arc, Mutex};
 use threadpool::ThreadPool;
+use tqdm::{pbar, Pbar};
 
 /// Function to retrieve the value of a key from a plist file
 ///
@@ -53,6 +55,14 @@ pub fn parse_manifest_db(
     arguments: &parser::ArgConfig,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let conn = Connection::open(manifest_db_path)?;
+
+    // Get count to update progress bar
+    let mut count_stmt = conn.prepare(
+        "SELECT COUNT(*) FROM Files WHERE relativePath LIKE '%DCIM/%' OR relativePath LIKE '%PhotoData/%'"
+    )?;
+    let count: usize = count_stmt.query_row([], |row| row.get(0))?;
+    let progress_bar_base: Arc<Mutex<Pbar>> = Arc::new(Mutex::new(pbar(Some(count))));
+
     let mut stmt = conn.prepare("SELECT fileID, relativePath FROM Files WHERE relativePath LIKE '%DCIM/%' OR relativePath LIKE '%PhotoData/%'")?;
     let rows = stmt.query_map([], |row| {
         let file_id: String = row.get(0)?;
@@ -70,10 +80,14 @@ pub fn parse_manifest_db(
                 let backup_cloned = backup.path.clone();
                 let output_dir_cloned = arguments.output_dir.clone();
                 let sender_cloned = sender.clone();
+                let progress_bar = Arc::clone(&progress_bar_base);
                 pool.execute(move || {
                     let result =
                         extract_files(&backup_cloned, &output_dir_cloned, file_id, relative_path);
                     sender_cloned.send(result).expect("Failed to send result");
+                    // Safely update progress bar
+                    let mut progress = progress_bar.lock().unwrap();
+                    progress.update(1).unwrap();
                 });
             }
             Err(err) => {
@@ -83,6 +97,7 @@ pub fn parse_manifest_db(
     }
     // Wait for all tasks to complete
     drop(sender); // Close the sending side of the channel
+    pool.join();
     for result in receiver {
         if let Err(err) = result {
             log::error!("Error processing files: {:?}", err);

src/lib.rs

@@ -13,6 +13,7 @@ pub mod logger;
 pub mod parser;
 /// Module for helper functions
 pub mod squire;
+mod dbutil;
 
 use rusqlite::Result;