Merge pull request #16 from sreedevk/interactive-mode

Interactive mode

Cargo.lock

@@ -40,6 +40,18 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bstr"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.11.1"
@@ -223,6 +235,28 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "csv"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.85"
@@ -269,7 +303,7 @@ dependencies = [
 
 [[package]]
 name = "deduplicator"
-version = "0.0.5"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "chrono",
@@ -280,6 +314,7 @@ dependencies = [
  "glob",
  "humansize",
  "itertools",
+ "prettytable-rs",
  "rayon",
  "sqlite",
  "thiserror",
@@ -287,12 +322,39 @@ dependencies = [
  "tui",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "either"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -323,6 +385,17 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -417,6 +490,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
 [[package]]
 name = "js-sys"
 version = "0.3.60"
@@ -581,6 +660,20 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "prettytable-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
+dependencies = [
+ "csv",
+ "encode_unicode",
+ "is-terminal",
+ "lazy_static",
+ "term",
+ "unicode-width",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -654,6 +747,23 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "thiserror",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+
 [[package]]
 name = "rustix"
 version = "0.36.5"
@@ -668,6 +778,18 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+
+[[package]]
+name = "ryu"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -680,6 +802,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 
+[[package]]
+name = "serde"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.14"
@@ -773,6 +901,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deduplicator"
-version = "0.0.5"
+version = "0.0.7"
 edition = "2021"
 description = "find,filter,delete Duplicates"
 license = "MIT"
@@ -18,6 +18,7 @@ fxhash = "0.2.1"
 glob = "0.3.0"
 humansize = "2.1.2"
 itertools = "0.10.5"
+prettytable-rs = "0.10.0"
 rayon = "1.6.1"
 sqlite = "0.30.3"
 thiserror = "1.0.38"

README.md

@@ -42,4 +42,7 @@ cargo install deduplicator
   </p>
 <h2 align="center">Screenshots</h2>
 
-![_039](https://user-images.githubusercontent.com/36154121/210031222-d8b79143-5a1e-47ca-926e-8855d5bbab60.png)
+<p align="center">
+  <img align="center" src="https://user-images.githubusercontent.com/36154121/211458077-90092aa3-496c-492f-a061-618059890d5f.png" width="500" height="400" />
+</p>
+

src/app/file_manager.rs

@@ -0,0 +1,14 @@
+use crate::database::File;
+use anyhow::Result;
+use colored::Colorize;
+
+pub fn delete_files(files: Vec<File>) -> Result<()> {
+    files.into_iter().for_each(|file| {
+        match std::fs::remove_file(file.path.clone()) {
+            Ok(_) => println!("{}: {}", "DELETED".green(), file.path),
+            Err(e) => println!("{}: {}", "FAILED".red(), file.path)
+        }
+    });
+
+    Ok(())
+}

src/app/mod.rs

@@ -1,7 +1,10 @@
+#![allow(unused)]
+
 mod event_handler;
 mod events;
 mod formatter;
 mod ui;
+pub mod file_manager;
 
 use std::{io, thread, time::Duration};
 
@@ -32,7 +35,11 @@ impl App {
         // Self::init_render_loop(&mut term)?;
         // Self::cleanup(&mut term)?;
 
-        output::print(duplicates, app_args); /* TODO: APP TUI INIT FUNCTION */
+        match app_args.interactive {
+            true => output::interactive(duplicates, app_args),
+            false => output::print(duplicates, app_args) /* TODO: APP TUI INIT FUNCTION */
+        }
+        
         Ok(())
     }
 

src/output.rs

@@ -1,13 +1,17 @@
-use std::{collections::HashMap, fs};
+use std::{collections::HashMap, fs, io};
+use std::io::Write;
 
 use anyhow::Result;
 use chrono::offset::Utc;
 use chrono::DateTime;
 use colored::Colorize;
 use humansize::{format_size, DECIMAL};
+use itertools::Itertools;
 
+use crate::app::file_manager;
 use crate::database::File;
 use crate::params::Params;
+use prettytable::{format, row, Cell, Row, Table};
 
 fn format_path(path: &str, opts: &Params) -> Result<String> {
     let display_path = path.replace(&opts.get_directory()?, "");
@@ -21,12 +25,12 @@ fn format_path(path: &str, opts: &Params) -> Result<String> {
         display_path
     };
 
-    Ok(format!("...{}", display_range))
+    Ok(format!("...{:<32}", display_range))
 }
 
 fn file_size(path: &String) -> Result<String> {
     let mdata = fs::metadata(path)?;
-    let formatted_size = format_size(mdata.len(), DECIMAL);
+    let formatted_size = format!("{:>12}", format_size(mdata.len(), DECIMAL));
     Ok(formatted_size)
 }
 
@@ -37,37 +41,125 @@ fn modified_time(path: &String) -> Result<String> {
     Ok(modified_time.format("%Y-%m-%d %H:%M:%S").to_string())
 }
 
-fn print_divider() {
-    println!("-------------------+-------------------------------------+------------------+----------------------------------+");
-}
-
-pub fn print(duplicates: Vec<File>, opts: &Params) {
-    print_divider();
-    println!(
-        "| {0: <16} | {1: <35} | {2: <16} | {3: <32} |",
-        "hash", "filename", "size", "updated_at"
-    );
-    print_divider();
-
-    let mut dup_index: HashMap<String, Vec<File>> = HashMap::new();
-
+fn group_duplicates(duplicates: Vec<File>) -> HashMap<String, Vec<File>> {
+    let mut duplicate_mapper: HashMap<String, Vec<File>> = HashMap::new();
     duplicates.into_iter().for_each(|file| {
-        dup_index
+        duplicate_mapper
             .entry(file.hash.clone())
             .and_modify(|value| value.push(file.clone()))
             .or_insert_with(|| vec![file]);
     });
 
-    dup_index.iter().for_each(|(_, group)| {
-        group.iter().for_each(|file| {
-            println!(
-                "| {0: <16} | {1: <35} | {2: <16} | {3: <32} |",
-                file.hash.red(),
-                format_path(&file.path, opts).unwrap_or_default().yellow(),
-                file_size(&file.path).unwrap_or_default().blue(),
-                modified_time(&file.path).unwrap_or_default().blue()
-            );
+    duplicate_mapper
+}
+
+fn print_meta_info(duplicates: &Vec<File>, opts: &Params) {
+    println!("Deduplicator v{}", std::env!("CARGO_PKG_VERSION"));
+}
+
+fn scan_group_instruction() -> Result<String> {
+    println!("\nEnter the indices of the files you want to delete.");
+    println!("You can enter multiple files using commas to seperate file indices.");
+    println!("example: 1,2");
+    print!("\n> ");
+    std::io::stdout().flush()?;
+    let mut user_input = String::new();
+    io::stdin().read_line(&mut user_input)?;
+
+    Ok(user_input)
+}
+
+fn scan_group_confirmation() -> Result<bool> {
+    print!("\nconfirm? [Y/n]: ");
+    std::io::stdout().flush()?;
+    let mut user_input = String::new();
+    io::stdin().read_line(&mut user_input)?;
+
+    match user_input.trim() {
+        "Y" | "y" => Ok(true),
+        _ => Ok(false)
+    }
+}
+
+fn process_group_action(duplicates: &Vec<File>, dup_index: usize, dup_size: usize, table: Table) {
+    println!("\nDuplicate Set {} of {}\n", dup_index + 1, dup_size);
+    table.printstd();
+    let files_to_delete = scan_group_instruction().unwrap_or_default();
+    let parsed_file_indices = files_to_delete
+        .trim()
+        .split(',')
+        .filter(|element| !element.is_empty())
+        .map(|index| index.parse::<usize>().unwrap_or_default())
+        .collect_vec();
+
+    if parsed_file_indices
+        .clone()
+        .into_iter()
+        .any(|index| index > (duplicates.len() - 1))
+    {
+        println!("{}", "Err: File Index Out of Bounds!".red());
+        return process_group_action(duplicates, dup_index, dup_size, table);
+    }
+
+    print!("{esc}[2J{esc}[1;1H", esc = 27 as char);
+
+    if parsed_file_indices.is_empty() { return }
+
+    let files_to_delete = parsed_file_indices
+        .into_iter()
+        .map(|index| duplicates[index].clone());
+
+    println!("\n{}", "The following files will be deleted:".red());
+    files_to_delete.clone().enumerate().for_each(|(index, file)| {
+        println!("{}: {}", index.to_string().blue(), file.path);
+    });
+    
+    match scan_group_confirmation().unwrap() {
+        true => { file_manager::delete_files(files_to_delete.collect_vec()); },
+        false => println!("{}", "\nCancelled Delete Operation.".red())
+    }
+}
+
+pub fn interactive(duplicates: Vec<File>, opts: &Params) {
+    print_meta_info(&duplicates, opts);
+    let grouped_duplicates = group_duplicates(duplicates);
+
+    grouped_duplicates.iter().enumerate().for_each(|(gindex, (hash, group))| {
+        let mut itable = Table::new();
+        itable.set_format(*format::consts::FORMAT_NO_BORDER_LINE_SEPARATOR);
+        itable.set_titles(row!["index", "filename", "size", "updated_at"]);
+        group.iter().enumerate().for_each(|(index, file)| {
+            itable.add_row(row![
+                index,
+                format_path(&file.path, opts).unwrap_or_default().blue(),
+                file_size(&file.path).unwrap_or_default().red(),
+                modified_time(&file.path).unwrap_or_default().yellow()
+            ]);
         });
-        print_divider();
+
+        process_group_action(group, gindex, grouped_duplicates.len(), itable);
     });
 }
+
+pub fn print(duplicates: Vec<File>, opts: &Params) {
+    print_meta_info(&duplicates, opts);
+
+    let mut output_table = Table::new();
+    let grouped_duplicates: HashMap<String, Vec<File>> = group_duplicates(duplicates);
+
+    output_table.set_titles(row!["hash", "duplicates"]);
+    grouped_duplicates.iter().for_each(|(hash, group)| {
+        let mut inner_table = Table::new();
+        inner_table.set_format(*format::consts::FORMAT_NO_BORDER_LINE_SEPARATOR);
+        group.iter().for_each(|file| {
+            inner_table.add_row(row![
+                format_path(&file.path, opts).unwrap_or_default().blue(),
+                file_size(&file.path).unwrap_or_default().red(),
+                modified_time(&file.path).unwrap_or_default().yellow()
+            ]);
+        });
+        output_table.add_row(row![hash.green(), inner_table]);
+    });
+
+    output_table.printstd();
+}

src/params.rs

@@ -12,9 +12,12 @@ pub struct Params {
     /// Run Deduplicator on dir different from pwd
     #[arg(long)]
     pub dir: Option<PathBuf>,
-    /// Don't use cache for indexing files (default = true)
+    /// Don't use cache for indexing files (default = false)
     #[arg(long, short)]
     pub nocache: bool,
+    /// Delete files interactively
+    #[arg(long, short)]
+    pub interactive: bool
 }
 
 impl Params {