config toml is now fully split between command mode, read only mode and edit mode

client/src/modes/handlers/command_mode.rs

@@ -69,74 +69,143 @@ async fn process_command(
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<(bool, String, bool), Box<dyn std::error::Error>> {
-    let command = command_input.trim();
+    // Clone the trimmed command to avoid borrow issues
+    let command = command_input.trim().to_string();
     if command.is_empty() {
         *command_message = "Empty command".to_string();
         return Ok((false, command_message.clone(), false));
     }
 
-    let action = config.get_action_for_command(command)
+    // Get the action for the command (now checks global and common bindings too)
+    let action = config.get_action_for_command(&command)
         .unwrap_or("unknown");
 
-    if action == "save" {
-        let is_new = *current_position == total_count + 1;
+    // For debugging
+    eprintln!("Command: '{}', Action: '{}'", command, action);
 
-        let message = if is_new {
-            let post_request = PostAdresarRequest {
-                firma: form_state.values[0].clone(),
-                kz: form_state.values[1].clone(),
-                drc: form_state.values[2].clone(),
-                ulica: form_state.values[3].clone(),
-                psc: form_state.values[4].clone(),
-                mesto: form_state.values[5].clone(),
-                stat: form_state.values[6].clone(),
-                banka: form_state.values[7].clone(),
-                ucet: form_state.values[8].clone(),
-                skladm: form_state.values[9].clone(),
-                ico: form_state.values[10].clone(),
-                kontakt: form_state.values[11].clone(),
-                telefon: form_state.values[12].clone(),
-                skladu: form_state.values[13].clone(),
-                fax: form_state.values[14].clone(),
-            };
-            let response = app_terminal.post_adresar(post_request).await?;
-            let new_total = app_terminal.get_adresar_count().await?;
-            *current_position = new_total;
-            form_state.id = response.into_inner().id;
-            "New entry created".to_string()
-        } else {
-            let put_request = PutAdresarRequest {
-                id: form_state.id,
-                firma: form_state.values[0].clone(),
-                kz: form_state.values[1].clone(),
-                drc: form_state.values[2].clone(),
-                ulica: form_state.values[3].clone(),
-                psc: form_state.values[4].clone(),
-                mesto: form_state.values[5].clone(),
-                stat: form_state.values[6].clone(),
-                banka: form_state.values[7].clone(),
-                ucet: form_state.values[8].clone(),
-                skladm: form_state.values[9].clone(),
-                ico: form_state.values[10].clone(),
-                kontakt: form_state.values[11].clone(),
-                telefon: form_state.values[12].clone(),
-                skladu: form_state.values[13].clone(),
-                fax: form_state.values[14].clone(),
-            };
-            let _ = app_terminal.put_adresar(put_request).await?;
-            "Entry updated".to_string()
-        };
+    match action {
+        "save" => {
+            let is_new = *current_position == total_count + 1;
 
-        *is_saved = true;
-        form_state.has_unsaved_changes = false;
-        command_input.clear();
-        return Ok((false, message, true));
-    } else {
-        let (should_exit, message) = app_terminal
-            .handle_command(action, is_saved)
-            .await?;
-        *command_message = message;
-        command_input.clear();
-        return Ok((should_exit, command_message.clone(), true));
+            let message = if is_new {
+                let post_request = PostAdresarRequest {
+                    firma: form_state.values[0].clone(),
+                    kz: form_state.values[1].clone(),
+                    drc: form_state.values[2].clone(),
+                    ulica: form_state.values[3].clone(),
+                    psc: form_state.values[4].clone(),
+                    mesto: form_state.values[5].clone(),
+                    stat: form_state.values[6].clone(),
+                    banka: form_state.values[7].clone(),
+                    ucet: form_state.values[8].clone(),
+                    skladm: form_state.values[9].clone(),
+                    ico: form_state.values[10].clone(),
+                    kontakt: form_state.values[11].clone(),
+                    telefon: form_state.values[12].clone(),
+                    skladu: form_state.values[13].clone(),
+                    fax: form_state.values[14].clone(),
+                };
+                let response = app_terminal.post_adresar(post_request).await?;
+                let new_total = app_terminal.get_adresar_count().await?;
+                *current_position = new_total;
+                form_state.id = response.into_inner().id;
+                "New entry created".to_string()
+            } else {
+                let put_request = PutAdresarRequest {
+                    id: form_state.id,
+                    firma: form_state.values[0].clone(),
+                    kz: form_state.values[1].clone(),
+                    drc: form_state.values[2].clone(),
+                    ulica: form_state.values[3].clone(),
+                    psc: form_state.values[4].clone(),
+                    mesto: form_state.values[5].clone(),
+                    stat: form_state.values[6].clone(),
+                    banka: form_state.values[7].clone(),
+                    ucet: form_state.values[8].clone(),
+                    skladm: form_state.values[9].clone(),
+                    ico: form_state.values[10].clone(),
+                    kontakt: form_state.values[11].clone(),
+                    telefon: form_state.values[12].clone(),
+                    skladu: form_state.values[13].clone(),
+                    fax: form_state.values[14].clone(),
+                };
+                let _ = app_terminal.put_adresar(put_request).await?;
+                "Entry updated".to_string()
+            };
+
+            *is_saved = true;
+            form_state.has_unsaved_changes = false;
+            command_input.clear();
+            return Ok((false, message, true));
+        },
+        "quit" => {
+            if form_state.has_unsaved_changes {
+                command_input.clear();
+                return Ok((false, "Unsaved changes! Use :q! to force quit or :w to save".to_string(), true));
+            }
+            command_input.clear();
+            return Ok((true, "Exiting application".to_string(), true));
+        },
+        "force_quit" => {
+            command_input.clear();
+            return Ok((true, "Force quitting application".to_string(), true));
+        },
+        "save_and_quit" => {
+            let is_new = *current_position == total_count + 1;
+
+            if is_new {
+                let post_request = PostAdresarRequest {
+                    firma: form_state.values[0].clone(),
+                    kz: form_state.values[1].clone(),
+                    drc: form_state.values[2].clone(),
+                    ulica: form_state.values[3].clone(),
+                    psc: form_state.values[4].clone(),
+                    mesto: form_state.values[5].clone(),
+                    stat: form_state.values[6].clone(),
+                    banka: form_state.values[7].clone(),
+                    ucet: form_state.values[8].clone(),
+                    skladm: form_state.values[9].clone(),
+                    ico: form_state.values[10].clone(),
+                    kontakt: form_state.values[11].clone(),
+                    telefon: form_state.values[12].clone(),
+                    skladu: form_state.values[13].clone(),
+                    fax: form_state.values[14].clone(),
+                };
+                let _ = app_terminal.post_adresar(post_request).await?;
+            } else {
+                let put_request = PutAdresarRequest {
+                    id: form_state.id,
+                    firma: form_state.values[0].clone(),
+                    kz: form_state.values[1].clone(),
+                    drc: form_state.values[2].clone(),
+                    ulica: form_state.values[3].clone(),
+                    psc: form_state.values[4].clone(),
+                    mesto: form_state.values[5].clone(),
+                    stat: form_state.values[6].clone(),
+                    banka: form_state.values[7].clone(),
+                    ucet: form_state.values[8].clone(),
+                    skladm: form_state.values[9].clone(),
+                    ico: form_state.values[10].clone(),
+                    kontakt: form_state.values[11].clone(),
+                    telefon: form_state.values[12].clone(),
+                    skladu: form_state.values[13].clone(),
+                    fax: form_state.values[14].clone(),
+                };
+                let _ = app_terminal.put_adresar(put_request).await?;
+            }
+
+            command_input.clear();
+            return Ok((true, "Saved and exiting application".to_string(), true));
+        },
+        "unknown" => {
+            let message = format!("Unknown command: {}", command);
+            command_input.clear();
+            return Ok((false, message, true));
+        },
+        _ => {
+            let message = format!("Unhandled action: {}", action);
+            command_input.clear();
+            return Ok((false, message, true));
+        }
     }
 }