use vec instead of hashmap

NotThatRqd · Oct 29, 2023 · c617902 · c617902
1 parent fe51c1e
commit c617902
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "btnify"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/button.rs b/src/button.rs
@@ -37,7 +37,6 @@ use serde::{Deserialize, Serialize};
 pub struct Button<S: Send + Sync + 'static> {
     // todo: add "get_name" and "get_id" which return immutable str slice
     pub name: String,
-    pub id: String,
     pub handler: Box<dyn (Fn(&S) -> ButtonResponse) + Send + Sync>
 }
 
@@ -48,18 +47,18 @@ impl<S: Send + Sync + 'static> Button<S> {
     ///
     /// `Handler` is a function or closure that takes a reference to a user provided state (`S`) and
     /// returns `ButtonResponse`. It will be called whenever this button is pressed.
+    // todo: implement Button::from<&str>
     pub fn new<T: Send + Sync + Fn(&S) -> ButtonResponse + 'static>(name: &str, handler: T) -> Button<S> {
         Button {
             name: name.to_string(),
-            id: name.to_lowercase(),
             handler: Box::new(handler)
         }
     }
 }
 
 #[derive(Deserialize, Debug)]
 pub(crate) struct ButtonInfo {
-    pub id: String
+    pub id: usize
     // todo: allow any extra data to be sent
 }
 

diff --git a/src/html_utils.rs b/src/html_utils.rs
@@ -11,7 +11,6 @@ pub(super) fn create_page_html<'a, S: Send + Sync + 'static>(buttons: impl Itera
     </head>
     <body>
         {}
-        <button onclick="showMessage(prompt('enter id'))">other</button>
 
         <script>
             async function showMessage(id) {{
@@ -36,12 +35,13 @@ pub(super) fn create_page_html<'a, S: Send + Sync + 'static>(buttons: impl Itera
 
 fn create_buttons_html<'a, S: Send + Sync + 'static>(buttons: impl Iterator<Item = &'a Button<S>>) -> String {
     buttons
-        .map(create_button_html)
+        .enumerate()
+        .map(|(id, b)| create_button_html(b, id))
         .collect()
 }
 
-fn create_button_html<S: Send + Sync + 'static>(button: &Button<S>) -> String {
-    format!(r#"<button onclick="showMessage('{}')">{}</button>"#, button.id, button.name)
+fn create_button_html<S: Send + Sync + 'static>(button: &Button<S>, id: usize) -> String {
+    format!(r#"<button onclick="showMessage({})">{}</button>"#, id, button.name)
 }
 
 #[cfg(test)]
@@ -51,13 +51,13 @@ mod tests {
 
     /// Dummy function that can be used as a button handler
     fn dummy(_: &()) -> ButtonResponse {
-        todo!()
+        unimplemented!()
     }
 
     #[test]
     fn create_button_test() {
-        let button = create_button_html(&Button::new("Count", dummy));
-        assert_eq!(button, r#"<button onclick="showMessage('count')">Count</button>"#);
+        let button = create_button_html(&Button::new("Count", dummy), 0);
+        assert_eq!(button, r#"<button onclick="showMessage(0)">Count</button>"#);
     }
 
     #[test]
@@ -71,8 +71,8 @@ mod tests {
         let buttons_html = create_buttons_html(list.iter());
 
         // todo: make cleaner using raw string
-        assert_eq!(buttons_html, "<button onclick=\"showMessage('count')\">Count</button>\
-        <button onclick=\"showMessage('ping')\">Ping</button>\
-        <button onclick=\"showMessage('greet')\">Greet</button>");
+        assert_eq!(buttons_html, "<button onclick=\"showMessage(0)\">Count</button>\
+        <button onclick=\"showMessage(1)\">Ping</button>\
+        <button onclick=\"showMessage(2)\">Greet</button>");
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::Arc;
 use axum::{Json, Router};
@@ -17,13 +16,13 @@ pub mod button;
 pub async fn bind_server<S: Send + Sync + 'static>(addr: &SocketAddr, buttons: Vec<Button<S>>, user_state: S) {
     let page = Html(create_page_html(buttons.iter()));
 
-    // todo: what if two buttons have the same id?
-    let buttons_map = buttons.into_iter()
-        .map(|b| (b.id, b.handler))
+    let buttons_map = buttons
+        .into_iter()
+        .map(|b| b.handler)
         .collect();
 
     let btnify_state = Arc::new(BtnifyState {
-        buttons_map,
+        button_handlers: buttons_map,
         user_state,
         page
     });
@@ -44,7 +43,7 @@ async fn get_root<S: Send + Sync>(State(state): State<Arc<BtnifyState<S>>>) -> H
 }
 
 async fn post_root<S: Send + Sync>(State(state): State<Arc<BtnifyState<S>>>, Json(info): Json<ButtonInfo>) -> Json<ButtonResponse> {
-    let handler = state.buttons_map.get(&info.id);
+    let handler = state.button_handlers.get(info.id);
 
     let res = match handler {
         Some(handler) => handler(&state.user_state),
@@ -55,7 +54,7 @@ async fn post_root<S: Send + Sync>(State(state): State<Arc<BtnifyState<S>>>, Jso
 }
 
 struct BtnifyState<S> {
-    buttons_map: HashMap<String, Box<dyn (Fn(&S) -> ButtonResponse) + Send + Sync>>,
+    button_handlers: Vec<Box<dyn (Fn(&S) -> ButtonResponse) + Send + Sync>>,
     user_state: S,
     page: Html<String>
 }