From 7e4109e734f3b25eccfda6ea200aac8128a02d18 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Tue, 4 Mar 2025 21:04:29 -0500
Subject: [PATCH] wip: update the command syntax to be more future proof

---
 docs/command.md |  1 +
 src/book/mod.rs |  3 ++-
 src/ui/cmd.rs   | 14 +++++---------
 src/ui/mod.rs   |  2 +-
 src/ui/test.rs  |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/docs/command.md b/docs/command.md
index 921c735..a8a5058 100644
--- a/docs/command.md
+++ b/docs/command.md
@@ -12,6 +12,7 @@ The currently supported commands are:
 * `new-sheet [name]` Creates a new sheet. If the name is provided then uses that. If omitted then uses a default sheet name.
 * `select-sheet <name>` Select a sheet by name.
 * `edit <path>` Edit a new spreadsheet at the current path. `e` is a shorthand alias for this command. 
+* `export-csv <path>` Export the current sheet to a csv file at `<path>`.
 * `quit` Quits the application. `q` is a shorthand alias for this command.
 
 <aside>Note that in the case of `quit` and `edit` that we do not currently
diff --git a/src/book/mod.rs b/src/book/mod.rs
index 70bae2d..ea46357 100644
--- a/src/book/mod.rs
+++ b/src/book/mod.rs
@@ -120,7 +120,8 @@ impl Book {
     }
 
     pub fn csv_for_sheet<W>(&self, sheet: u32, sink: W) -> Result<()>
-        where W: std::io::Write,
+    where
+        W: std::io::Write,
     {
         let rows = self.get_export_rows_for_sheet(sheet)?;
         let mut writer = csv::Writer::from_writer(sink);
diff --git a/src/ui/cmd.rs b/src/ui/cmd.rs
index e5c7103..298a124 100644
--- a/src/ui/cmd.rs
+++ b/src/ui/cmd.rs
@@ -15,7 +15,7 @@ pub enum Cmd<'a> {
     SelectSheet(&'a str),
     Edit(&'a str),
     Help(Option<&'a str>),
-    Export(&'a str),
+    ExportCsv(&'a str),
     Quit,
 }
 
@@ -41,7 +41,7 @@ pub fn parse<'cmd, 'i: 'cmd>(input: &'i str) -> Result<Option<Cmd<'cmd>>, &'stat
         return Ok(Some(cmd));
     }
     // Try consume export
-    if let Some(cmd) = try_consume_export(cursor.clone())? {
+    if let Some(cmd) = try_consume_export_csv(cursor.clone())? {
         return Ok(Some(cmd));
     }
     // try consume edit command.
@@ -114,17 +114,13 @@ fn try_consume_write<'cmd, 'i: 'cmd>(
     })));
 }
 
-fn try_consume_export<'cmd, 'i: 'cmd>(
+fn try_consume_export_csv<'cmd, 'i: 'cmd>(
     mut input: StrCursor<'i>,
 ) -> Result<Option<Cmd<'cmd>>, &'static str> {
-    const SHORT: &'static str = "ex";
-    const LONG: &'static str = "export";
+    const LONG: &'static str = "export-csv";
 
     if compare(input.clone(), LONG) {
         input.seek(LONG.len());
-    } else if compare(input.clone(), SHORT) {
-        input.seek(SHORT.len());
-        // Should we check for whitespace?
     } else {
         return Ok(None);
     }
@@ -132,7 +128,7 @@ fn try_consume_export<'cmd, 'i: 'cmd>(
         return Err("Invalid command: Did you mean to type `export <path>`?");
     }
     let arg = input.span(0..).trim();
-    return Ok(Some(Cmd::Export(arg)));
+    return Ok(Some(Cmd::ExportCsv(arg)));
 }
 
 fn try_consume_new_sheet<'cmd, 'i: 'cmd>(
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index ccfda4a..604064a 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -425,7 +425,7 @@ impl<'ws> Workspace<'ws> {
                 }
                 Ok(None)
             }
-            Ok(Some(Cmd::Export(path))) => {
+            Ok(Some(Cmd::ExportCsv(path))) => {
                 self.book.save_sheet_to_csv(self.book.location.sheet, path)?;
                 Ok(None)
             }
diff --git a/src/ui/test.rs b/src/ui/test.rs
index b86e524..a00f3b1 100644
--- a/src/ui/test.rs
+++ b/src/ui/test.rs
@@ -219,7 +219,7 @@ fn test_cmd_new_sheet_with_name() {
 
 #[test]
 fn test_cmd_export() {
-    let input = "export test.csv";
+    let input = "export-csv test.csv";
     let result = parse(input);
     assert!(result.is_ok());
     let output = result.unwrap();