crabmail

commit be406ae9c04cb5ae6b8f2d1fcc91f5ede5a4cae0
parent 43cd6be007b265108eb5f40956c1f01c27e556df
Author: alex wennerberg <alex@alexwennerberg.com>
Date:   Sun, 16 Jan 2022 11:28:37 -0800

refactor args

Diffstat:
M
src/arg.rs
 | 
35
++++++++++++++++++-----------------

1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/arg.rs b/src/arg.rs
@@ -42,6 +42,8 @@ ARGS:
     );
     exit(1)
 }
+
+#[derive(Default)]
 pub struct Args {
     pub maildir: String,
     pub config: PathBuf,
@@ -51,14 +53,16 @@ pub struct Args {
 
 impl Args {
     pub fn from_env() -> Self {
-        // Modify as needed
-        let mut flags = String::new();
-        let mut maildir: Option<String> = None;
-        let mut out_dir = "site".into();
-        let mut config = "crabmail.conf".into();
+        // Modify as neede
+        let mut out = Args {
+            out_dir: "site".into(),
+            config: "crabmail.conf".into(),
+            ..Default::default()
+        };
 
         let mut args = env::args().skip(1);
 
+        let mut maildir = None;
         // Doesn't support non-UTF-8 paths TODO: solution?
         // See https://github.com/RazrFalcon/pico-args/issues/2
         let parsenext =
@@ -66,27 +70,24 @@ impl Args {
 
         while let Some(arg) = args.next() {
             let mut chars = arg.chars();
+            // Positional args
             if chars.next() != Some('-') {
                 maildir = Some(arg);
                 continue;
             }
             chars.for_each(|m| match m {
-                'c' => config = parsenext(args.next()),
-                'd' => out_dir = parsenext(args.next()),
-                'r' | 'R' => flags.push(m),
+                'c' => out.config = parsenext(args.next()),
+                'd' => out.out_dir = parsenext(args.next()),
+                'r' | 'R' => out.flags.push(m),
                 _ => {
                     usage();
                 }
             })
         }
-        Self {
-            config,
-            maildir: match maildir {
-                Some(m) => m.into(),
-                None => usage(),
-            },
-            out_dir,
-            flags,
-        }
+        out.maildir = match maildir {
+            Some(m) => m.into(),
+            None => usage(),
+        };
+        out
     }
 }