refactor: remove old code, streamline errors

PThorpe92 · Apr 17, 2024 · cf8670e · cf8670e
1 parent 524398c
commit cf8670e
Show file tree

Hide file tree

Showing 11 changed files with 192 additions and 270 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -145,11 +145,11 @@ impl<'a> App<'a> {
                 self.selected = None;
                 return;
             }
-            Screen::SavedCommands(col_name) => {
+            Screen::SavedCommands { id, .. } => {
                 self.items = self
                     .db
                     .as_ref()
-                    .get_commands(*col_name)
+                    .get_commands(*id)
                     .unwrap_or_default()
                     .iter()
                     .map(|cmd| {
@@ -285,10 +285,10 @@ impl<'a> App<'a> {
                     .map(|x| x.to_string())
                     .collect::<Vec<String>>(),
             ),
-            Screen::SavedCommands(coll_id) => Some(
+            Screen::SavedCommands { id, .. } => Some(
                 self.db
                     .as_ref()
-                    .get_commands(coll_id)
+                    .get_commands(id)
                     .unwrap_or_default()
                     .into_iter()
                     .map(|x| format!("{:?}", x))

diff --git a/src/display/inputopt.rs b/src/display/inputopt.rs
@@ -1,5 +1,4 @@
-use crate::request::curl::Method;
-use crate::screens::auth::AuthType;
+use crate::request::curl::{AuthKind, Method};
 use std::fmt::Display;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -10,7 +9,7 @@ pub enum InputOpt {
     Output,
     Verbose,
     RequestBody,
-    Auth(AuthType),
+    Auth(AuthKind),
     VerifyPeer,
     Referrer,
     Execute,
@@ -30,8 +29,8 @@ pub enum InputOpt {
     ImportCollection,
     RenameCollection(i32),
     RequestError(String),
+    AlertMessage(String),
     Method(Method),
-    NewProtoFile,
 }
 
 impl InputOpt {
@@ -70,7 +69,7 @@ impl Display for InputOpt {
             InputOpt::RequestError(ref err) => write!(f, "| Error: {}", err),
             InputOpt::Method(method) => write!(f, "| Method: {}", method),
             InputOpt::CookieJar => write!(f, "| Cookie Jar"),
-            InputOpt::NewProtoFile => write!(f, "| New Proto File"),
+            InputOpt::AlertMessage(msg) => write!(f, "| Alert: {}", msg),
         }
     }
 }