feat: make things faster

hopinc · Oct 10, 2023 · bbed289 · bbed289
1 parent 8b73a0e
commit bbed289
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 33 deletions.
diff --git a/src/commands/webhooks/create.rs b/src/commands/webhooks/create.rs
@@ -1,8 +1,9 @@
 use anyhow::{Context, Result};
 use clap::Parser;
-use hop::webhooks::types::{PossibleEvents, EVENT_CATEGORIES, EVENT_NAMES};
+use hop::webhooks::types::{PossibleEvents, EVENT_NAMES};
 
 use super::utils::string_to_event;
+use crate::commands::webhooks::utils::get_formatted_events;
 use crate::state::State;
 use crate::utils::urlify;
 
@@ -30,23 +31,10 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
     let events = if !options.events.is_empty() {
         options.events
     } else {
-        let mut events = vec![];
-        let mut start_idx = 0usize;
-
-        for (name, end_idx) in EVENT_CATEGORIES {
-            let end_idx = end_idx as usize + start_idx;
-
-            for (_, event) in &EVENT_NAMES[start_idx..end_idx] {
-                events.push(format!("{name}: {event}"))
-            }
-
-            start_idx = end_idx;
-        }
-
         let dialoguer_events = loop {
             let test = dialoguer::MultiSelect::new()
                 .with_prompt("Select events")
-                .items(&events)
+                .items(&get_formatted_events()?)
                 .interact()?;
 
             if !test.is_empty() {

diff --git a/src/commands/webhooks/update.rs b/src/commands/webhooks/update.rs
@@ -1,9 +1,9 @@
 use anyhow::{Context, Result};
 use clap::Parser;
-use hop::webhooks::types::{PossibleEvents, EVENT_CATEGORIES, EVENT_NAMES};
+use hop::webhooks::types::{PossibleEvents, EVENT_NAMES};
 
 use super::utils::string_to_event;
-use crate::commands::webhooks::utils::format_webhooks;
+use crate::commands::webhooks::utils::{format_webhooks, get_formatted_events};
 use crate::state::State;
 
 #[derive(Debug, Parser)]
@@ -51,23 +51,10 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
     let events = if !options.events.is_empty() {
         options.events
     } else {
-        let mut events = vec![];
-        let mut start_idx = 0usize;
-
-        for (name, end_idx) in EVENT_CATEGORIES {
-            let end_idx = end_idx as usize + start_idx;
-
-            for (_, event) in &EVENT_NAMES[start_idx..end_idx] {
-                events.push(format!("{name}: {event}"))
-            }
-
-            start_idx = end_idx;
-        }
-
         let dialoguer_events = loop {
             let test = dialoguer::MultiSelect::new()
                 .with_prompt("Select events")
-                .items(&events)
+                .items(&get_formatted_events()?)
                 .defaults(&EVENT_NAMES.map(|(event, _)| old.events.contains(&event)))
                 .interact()?;
 
@@ -79,7 +66,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
         EVENT_NAMES
             .into_iter()
             .enumerate()
-            .filter(|(idx, _)| dialoguer_events.contains(idx))
+            .filter(|(idx, _)| dialoguer_events.binary_search(idx).is_ok())
             .map(|(_, (event, _))| event)
             .collect()
     };

diff --git a/src/commands/webhooks/utils.rs b/src/commands/webhooks/utils.rs
@@ -1,7 +1,7 @@
 use std::io::Write;
 
 use anyhow::Result;
-use hop::webhooks::types::{PossibleEvents, Webhook};
+use hop::webhooks::types::{PossibleEvents, Webhook, EVENT_CATEGORIES, EVENT_NAMES};
 use tabwriter::TabWriter;
 
 pub fn format_webhooks(webhooks: &[Webhook], title: bool) -> Vec<String> {
@@ -32,3 +32,21 @@ pub fn format_webhooks(webhooks: &[Webhook], title: bool) -> Vec<String> {
 pub fn string_to_event(string: &str) -> Result<PossibleEvents> {
     serde_json::from_str(string).map_err(|e| e.into())
 }
+
+pub fn get_formatted_events() -> Result<Vec<String>> {
+    let mut events = vec![];
+
+    let mut start_idx = 0usize;
+
+    for (name, end_idx) in EVENT_CATEGORIES {
+        let end_idx = end_idx as usize + start_idx;
+
+        for (_, event) in &EVENT_NAMES[start_idx..end_idx] {
+            events.push(format!("{name}: {event}"));
+        }
+
+        start_idx = end_idx;
+    }
+
+    Ok(events)
+}