no-exec

Author: gert7

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "simagef"
 description = "CLI tool for finding similar images"
-version = "1.3.5"
+version = "1.3.6"
 edition = "2021"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/gert7/simagef"
@@ -33,6 +33,7 @@ num = "0.4.3"
 pixel = ["image-compare"]
 avif = ["image/avif-native"]
 instrumentation = []
+no-exec = []
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

Cargo.toml

@@ -107,6 +107,14 @@ subsequent runs in the default mode. Signatures will be stored in your cache
 directory in a SQLite database file named `simagef`. You can disable this with
 the `--no-database` option.
 
+### Feature flags
+
+- `avif` - Enables AVIF support. Requires [libdav1d](https://github.com/videolan/dav1d).
+
+- `no-exec` - Disables the `exec` option.
+
+- `pixel` - Enables the old pixel algorithm.
+
 ## Caveats
 
 - The groups are created using a recursive graph algorithm.

README.md

@@ -48,6 +48,7 @@ pub struct Cli {
     /// The program to launch when the comparisons are finished.
     /// The program will be launched for each pair or grouping, one after another.
     #[arg(short('e'), long)]
+    #[cfg(not(feature = "no-exec"))]
     pub exec: Option<String>,
     /// If set, will only present the matched images in pairs rather than groups.
     #[arg(short('p'), long, default_value_t = false)]

src/cli.rs

@@ -28,7 +28,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use rusqlite::Connection;
 
 use crate::{
-    cli::Fmt, database::InsertionMessage, formatting::print_fmt, open_image::open_image_path,
+    cli::Fmt, database::InsertionMessage, formatting::print_fmt, open_image::open_image_path, shared::get_executable,
 };
 
 struct SignatureToCompare {
@@ -110,6 +110,7 @@ fn make_groups_and_exec<P>(
             .map(|index| name_map[*index].as_ref())
             .collect();
         print_fmt(&name_group, fmt);
+        #[cfg(not(feature = "no-exec"))]
         if let Some((program, args)) = &executable {
             Command::new(program)
                 .args(args)
@@ -390,6 +391,7 @@ fn spawn_cosine_threads(threshold: f64, task_rx: Receiver<CompareTask>, pair_tx:
 fn main_signatures(cli: Cli) {
     let db_path = cli
         .database_file
+        .as_ref()
         .map(|path| PathBuf::from(path))
         .or_else(|| platform_dirs::AppDirs::new(Some("simagef"), false).map(|v| v.cache_dir));
 
@@ -527,14 +529,7 @@ fn main_signatures(cli: Cli) {
 
     let mut pairings = Vec::new();
 
-    let executable = {
-        cli.exec.as_ref().map(|exec| {
-            let mut split = exec.split(" ");
-            let command = split.next().expect("Command for exec not provided");
-            let rest: Vec<&str> = split.collect();
-            (command, rest)
-        })
-    };
+    let executable = get_executable(&cli);
 
     while let Ok(pair) = pair_rx.recv() {
         // If we use pairs, we execute for each pair right away.
@@ -544,6 +539,7 @@ fn main_signatures(cli: Cli) {
             let filename1 = &image1.path;
             let filename2 = &image2.path;
             print_fmt(&vec![filename1, filename2], cli.format);
+            #[cfg(not(feature = "no-exec"))]
             if let Some((program, args)) = &executable {
                 Command::new(program)
                     .args(args)

src/main.rs

@@ -12,9 +12,9 @@ use image_compare::BlendInput;
 
 use crate::{
     cli::Cli,
-    open_image::{open_image, resize_as_needed, IBoft, SingleImage},
-    shared::{make_groups_and_exec, CompareTask, Pairing},
     formatting::print_fmt,
+    open_image::{open_image, resize_as_needed, IBoft, SingleImage},
+    shared::{get_executable, make_groups_and_exec, CompareTask, Pairing},
 };
 struct ImageToCompare {
     path: String,
@@ -41,7 +41,7 @@ fn image_maker_loop(
                     Ok(image) => {
                         let image = resize_as_needed(image, width, height);
                         tx.send(ImageToCompare {
-                            path: filename,
+                            path: filename.to_string(),
                             image,
                         })
                         .expect("Unable to send image to channel");
@@ -89,12 +89,12 @@ pub fn main_images(cli: Cli) {
         exit(1);
     }
 
-    for arg_filename in cli.files {
+    for arg_filename in &cli.files {
         if arg_filename == "-" {
             dash_mode = true;
         } else {
             filename_tx
-                .send(arg_filename)
+                .send(arg_filename.clone())
                 .expect("Unable to send filename to channel");
         }
     }
@@ -241,14 +241,7 @@ pub fn main_images(cli: Cli) {
 
     let mut pairings = Vec::new();
 
-    let executable = {
-        cli.exec.as_ref().map(|exec| {
-            let mut split = exec.split(" ");
-            let command = split.next().expect("Command for exec not provided");
-            let rest: Vec<&str> = split.collect();
-            (command, rest)
-        })
-    };
+    let executable = get_executable(&cli);
 
     // If we use pairs, we execute for each pair right away.
     while let Ok(pair) = pair_rx.recv() {
@@ -259,6 +252,7 @@ pub fn main_images(cli: Cli) {
             let filename1 = bundle.image_map[pair.index1].path.clone();
             let filename2 = bundle.image_map[pair.index2].path.clone();
             print_fmt(&vec![&filename1, &filename2], cli.format);
+            #[cfg(not(feature = "no-exec"))]
             if let Some((program, args)) = &executable {
                 Command::new(program)
                     .args(args)

src/main_image.rs

@@ -3,6 +3,8 @@ use std::{
     process::Command,
 };
 
+use crate::cli::Cli;
+
 #[derive(Debug)]
 pub struct CompareTask {
     pub index1: usize,
@@ -23,11 +25,10 @@ pub fn make_groups_and_exec(
 ) {
     let groups = make_groups(pairings);
     for group in groups {
-        let name_group: Vec<String> = group.iter().map(|index| {
-            name_map[*index].clone()
-        }).collect();
+        let name_group: Vec<String> = group.iter().map(|index| name_map[*index].clone()).collect();
         let line = name_group.join(" ");
         println!("{}", line);
+        #[cfg(not(feature = "no-exec"))]
         if let Some((program, args)) = &executable {
             Command::new(program)
                 .args(args)
@@ -82,3 +83,18 @@ pub fn make_groups(pairs: Vec<Pairing>) -> Vec<Vec<usize>> {
 
     groups
 }
+
+#[cfg(not(feature = "no-exec"))]
+pub fn get_executable(cli: &Cli) -> Option<(&str, Vec<&str>)> {
+    cli.exec.as_ref().map(|exec| {
+        let mut split = exec.split(" ");
+        let command = split.next().expect("Command for exec not provided");
+        let rest: Vec<&str> = split.collect();
+        (command, rest)
+    })
+}
+
+#[cfg(feature = "no-exec")]
+pub fn get_executable(cli: &Cli) -> Option<(&str, Vec<&str>)> {
+    None
+}