tab completion, stubs for lock/unlock

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pw"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Oliver Jensen <[email protected]>"]
 
 [dependencies.rusqlite]

bash_completion

@@ -0,0 +1,28 @@
+_pw()
+{
+    local cur prev
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    commands="add edit delete list show copy lock unlock"
+
+    case "$prev" in
+        pw)
+            COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) )
+            return 0
+            ;;
+        edit|delete|show|copy)
+            COMPREPLY=( $(compgen -W "`pw --comp-name`" -- ${cur}) )
+            return 0
+            ;;
+        add|list)
+            COMPREPLY=( $(compgen -W "sections `pw --comp-sec`" -- ${cur}) )
+            return 0
+            ;;
+        *)
+        ;;
+    esac
+
+}
+complete -F _pw pw

readme.md

@@ -141,6 +141,8 @@ Make sure you have rust / cargo / etc. installed. Then:
 git clone [email protected]:ojensen5115/pw.git    # Clone the repo
 cd pw                                          # Enter the directory
 cargo install                                  # Copy the binary to your local path
+cat bash_completion >> ~/.bash_completion      # Set up bash completion
+source ~/.bash_completion                      # Get bash completion going in this shell
 ```
 
 ## Data Storage

src/main.rs

@@ -44,11 +44,14 @@ Usage:
   pw list <category>
   pw show <name>
   pw copy <name> (u|p)
+  pw (lock | unlock)
   pw [options]
 
 Options:
   -h --help     Show this screen.
   --version     Show version.
+  --comp-name   List credential names for tab completion
+  --comp-sec    List categories for tab completion
 ";
 
 #[derive(Debug, Deserialize)]
@@ -64,6 +67,12 @@ struct Args {
     cmd_u: bool,
     cmd_p: bool,
 
+    cmd_lock: bool,
+    cmd_unlock: bool,
+
+    flag_comp_name: bool,
+    flag_comp_sec: bool,
+
     arg_name: String,
     arg_category: Option<String>
 }
@@ -110,6 +119,18 @@ fn main() {
     else if args.cmd_delete {
         delete_credential(&conn, args.arg_name);
     }
+    else if args.cmd_lock {
+        println!("Not yet implemented");
+    }
+    else if args.cmd_unlock {
+        println!("Not yet implemented");
+    }
+    else if args.flag_comp_name {
+        completion_name(&conn);
+    }
+    else if args.flag_comp_sec {
+        completion_sec(&conn);
+    }
 
 }
 
@@ -118,6 +139,9 @@ fn new_credential(conn: &rusqlite::Connection, category: Option<String>, name: S
         Some(c) => c,
         None => "".to_string()
     };
+    // To make tab completion reasonable, we replace spaces with underscores in name and category
+    let name = name.replace(" ", "_");
+    let category = category.replace(" ", "_");
 
     if category == "categories" {
         println!("You cannot use the category 'categories'.");
@@ -185,6 +209,24 @@ fn list_credentials(conn: &rusqlite::Connection, category: Option<String>) {
     }
 }
 
+fn completion_name(conn: &rusqlite::Connection) {
+    let mut statement = conn.prepare("SELECT name FROM credentials").unwrap();
+    let mut rows = statement.query(&[]).unwrap();
+    while let Some(result_row) = rows.next() {
+        let entry: String = result_row.unwrap().get(0);
+        print!("{} ", entry);
+    }
+}
+
+fn completion_sec(conn: &rusqlite::Connection) {
+    let mut statement = conn.prepare("SELECT distinct(category) FROM credentials").unwrap();
+    let mut rows = statement.query(&[]).unwrap();
+    while let Some(result_row) = rows.next() {
+        let entry: String = result_row.unwrap().get(0);
+        print!("{} ", entry);
+    }
+}
+
 fn show_credential(conn: &rusqlite::Connection, name: String) {
     let credential = get_credential(conn, name);
     println!("{}:\n    {}\n    {}", credential.name, credential.username, credential.password);