structopt get

1 files changed, 6 insertions, 8 deletions

diff --git a/src/actions/get.rs b/src/actions/get.rs
index 8877bb7..bba8a80 100644
--- a/src/actions/get.rs
+++ b/src/actions/get.rs
@@ -1,13 +1,10 @@
 use crate::calendars;
 use crate::KhResult;
+use crate::cli::{Get, GetArgs};
 
-pub fn action_get(args: &[&str]) -> KhResult<()> {
-  if args.is_empty() {
-    Err("get calendars")?;
-  }
-  match args[0] {
-    "calendars" => action_get_calendars(),
-    _ => Err("Unknown get parameter!")?
+pub fn action_get(args: &Get) -> KhResult<()> {
+  match args.query {
+    GetArgs::calendars => action_get_calendars(),
   }
 }
 
@@ -30,7 +27,8 @@ mod integration {
   fn test_get_calendars() {
     let _testdir = testutils::prepare_testdir("testdir_two_cals");
 
-    action_get(&["calendars"]).unwrap();
+    let args = Get { query: GetArgs::calendars };
+    action_get(&args).unwrap();
 
     assert_eq!("first\nsecond\nsecond/second_sub\n", stdioutils::test_stdout_clear());
   }