more proper arg design for import cmd

jfding · Sep 17, 2024 · 6e9b7a9 · 6e9b7a9
1 parent 1e8e7b2
commit 6e9b7a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -85,8 +85,8 @@ pub enum Commands {
 
     /// -> import uncompeleted task in any markdown file to current
     Import{
-        #[arg(short, long)]
-        file: String,
+        #[arg(value_name = "markdown-file")]
+        file: Option<String>,
     },
 }
 

diff --git a/src/taskbox.rs b/src/taskbox.rs
@@ -7,6 +7,8 @@ use dirs;
 use chrono::*;
 use std::ops::*;
 
+use crate::util;
+
 const DATA_BASE : &str = ".local/share/todor";
 const INBOX_NAME :&str  = "INBOX";
 
@@ -358,7 +360,9 @@ impl TaskBox {
     }
 
     // specified markdown file -> cur
-    pub fn import(&mut self, mdfile: String) {
+    pub fn import(&mut self, file: Option<String>) {
+        let mdfile= file.unwrap_or(util::pick_file());
+
         let fpath = Path::new(&mdfile);
         if ! fpath.is_file() {
             eprintln!("not a file or not exists: {}", mdfile.red());

diff --git a/src/util.rs b/src/util.rs
@@ -37,3 +37,11 @@ pub fn edit_box(inbox_path: &Path, diffwith: Option<String>) {
         ).expect("cannot launch cli editor(vi?)")
     }
 }
+
+pub fn pick_file() -> String {
+    run_fun!(
+        ls | fzf;
+    ).ok().unwrap_or_else(||
+        std::process::exit(1)
+    )
+}