Batching for open and read

Author: jaywonchung

src/cmd/open.rs

@@ -3,7 +3,7 @@ use std::process::{Command, Stdio};
 
 use crate::cmd::prelude::*;
 use crate::paper::PaperList;
-use crate::utils::{confirm, expand_tilde_string};
+use crate::utils::confirm;
 
 pub static MAN: &'static str = "Usage:
 1) alone: open [filter]
@@ -61,9 +61,10 @@ pub fn execute(
     // Some reports.
     let num_open = files.len();
     println!(
-        "Skipping papers without filepaths ({} out of {}).",
+        "{} {} selected. Skipping {} without file paths.",
+        num_papers,
+        if num_papers > 1 { "papers" } else { "paper" },
         num_papers - num_open,
-        num_papers
     );
 
     // Ask for confirmation.
@@ -72,37 +73,54 @@ pub fn execute(
     }
 
     // Open papers.
-    let mut selected = Vec::new();
     if config.output.viewer_batch {
-        // let command = build_viewer_command(files, config);
-        // spawn(command, // TODO: handle batched.
+        let (selected, files): (Vec<usize>, Vec<PathBuf>) = files.into_iter().unzip();
+        if spawn(build_viewer_command(files.as_ref(), config)) {
+            Ok(CommandOutput::Papers(PaperList(selected)))
+        } else {
+            Ok(CommandOutput::Papers(PaperList(Vec::new())))
+        }
     } else {
+        let mut selected = Vec::new();
         for (i, file) in files.into_iter() {
-            let command = build_viewer_command(&[file], config);
-            spawn(command, i, &mut selected);
+            if spawn(build_viewer_command(&[file], config)) {
+                selected.push(i);
+            }
         }
+        Ok(CommandOutput::Papers(PaperList(selected)))
     }
-
-    Ok(CommandOutput::Papers(PaperList(selected)))
 }
 
-fn spawn(mut command: Command, i: usize, selected: &mut Vec<usize>) {
+fn spawn(mut command: Command) -> bool {
     match command.spawn() {
-        Ok(_) => selected.push(i),
+        Ok(_) => true,
         Err(e) => {
             if matches!(e.kind(), std::io::ErrorKind::NotFound) {
                 println!("Invalid editor command: '{:?}'", e);
             } else {
                 println!("Failed to spawn subprocess: '{:?}'", e);
             }
+            false
         }
     }
 }
 
 fn build_viewer_command(files: &[PathBuf], config: &Config) -> Command {
-    let command = &config.output.viewer_command;
-    let mut ret = Command::new(&command[0]);
-    ret.args(&command[1..]).args(files);
-    ret.stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
+    let mut ret = Command::new(&config.output.viewer_command[0]);
+    let mut curly = false;
+    for command in &config.output.viewer_command[1..] {
+        if command == "{}" {
+            ret.args(files);
+            curly = true;
+        } else {
+            ret.arg(command);
+        }
+    }
+    if !curly {
+        ret.args(files);
+    }
+    ret.stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null());
     ret
 }

src/cmd/read.rs

@@ -70,7 +70,9 @@ pub fn execute(
 fn spawn(mut command: Command, block: bool) {
     match command.spawn() {
         Ok(mut handle) => {
-            if !block { return }
+            if !block {
+                return;
+            }
             if let Err(e) = handle.wait() {
                 println!("Failed to wait subprocess: {}", e);
             }

src/cmd/touch.rs

@@ -1,8 +1,5 @@
-use std::path::PathBuf;
-
 use crate::cmd::prelude::*;
 use crate::paper::{Paper, PaperList};
-use crate::utils::expand_tilde_string;
 
 pub static MAN: &'static str = "Usage: touch [paper]
 
@@ -34,12 +31,8 @@ pub fn execute(
     let paper = Paper::from_args(input.args)?;
 
     // Verify file path.
-    if let Some(filepath) = &paper.filepath {
-        if let Some(base) = &config.storage.file_base_dir {
-
-        }
-        let path = expand_tilde_string(&filepath)?;
-        if !PathBuf::from(path).exists() {
+    if let Some(filepath) = paper.abs_filepath(config)? {
+        if !filepath.exists() {
             return Err(Fallacy::PathDoesNotExist(filepath.to_owned()));
         }
     }

src/config.rs

@@ -40,7 +40,10 @@ with default settings.
    (default: ['title', 'first author', 'venue', 'year'])
 - viewer_command: Command to use for the viewer to open
   papers. It is assumed that the viewer program is a
-  non-command line program.
+  non-command line program. If you place a set of curly
+  braces ('{}') in the list, the path to the file(s) will
+  be substituted in that location. Otherwise, the path(s)
+  will be placed at the end.
    (default: ['zathura'])
 - viewer_batch: Whether to open multiple papers with a
   single invocation of the viewer command. If true, the
@@ -50,7 +53,10 @@ with default settings.
    (default: false)
 - editor_command: Command to use for the editor to edit
   notes. It is assumed that the editor is a command line
-  program.
+  program. If you place a set of curly braces ('{}') in
+  the list, the path to the file(s) will be substituted
+  in that location. Otherwise, the path(s) will be placed
+  at the end.
    (default: ['vim', '-p'])
 - editor_batch: Whether to open multiple notes with a
   single invocation of the editor command. If true, the
@@ -137,15 +143,19 @@ impl OutputConfig {
 
         // Check viewer command and expand tilde.
         if self.viewer_command.len() == 0 {
-            return Err(Fallacy::ConfigAuditError("Viewer command cannot be empty.".to_owned()));
+            return Err(Fallacy::ConfigAuditError(
+                "Viewer command cannot be empty.".to_owned(),
+            ));
         }
         for path in self.viewer_command.iter_mut() {
             *path = expand_tilde_string(path)?;
         }
 
         // Check editor command and expand tilde.
         if self.editor_command.len() == 0 {
-            return Err(Fallacy::ConfigAuditError("Editor command cannot be empty.".to_owned()));
+            return Err(Fallacy::ConfigAuditError(
+                "Editor command cannot be empty.".to_owned(),
+            ));
         }
         for path in self.editor_command.iter_mut() {
             *path = expand_tilde_string(path)?;

src/error.rs

@@ -45,11 +45,9 @@ pub enum Fallacy {
     PaperMissingFields(String),
     // path
     #[error("Specified file path does not exist: '{0}'")]
-    PathDoesNotExist(String),
+    PathDoesNotExist(PathBuf),
     #[error("Invalid UTF-8 character in path: '{0}'")]
     PathInvalidUTF8(PathBuf),
-    #[error("'{0}' is not executable.")]
-    PathNotExecutable(PathBuf),
     #[error("Cannot resolve relative path '{0}' because the base directory was not given. See 'base_dir' in `man config`.")]
     PathRelativeWithoutBase(PathBuf),
     // exit

src/utils.rs

@@ -1,6 +1,5 @@
 use std::io::Write;
 use std::path::PathBuf;
-use std::process::Command;
 
 use crate::error::Fallacy;