From 7c6fa896e751cef5a68ae8541735f2ee0d15e435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <christina@cafkafk.com>
Date: Thu, 13 Jul 2023 07:23:01 +0200
Subject: [PATCH] fix(main,cli): naming was confusing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christina Sørensen <christina@cafkafk.com>
---
 src/cli.rs  |  2 +-
 src/main.rs | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index 38c4c3a..530303d 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -85,8 +85,8 @@ pub enum Commands {
     /// Do quick pull-commit-push with msg for commit
     #[command(visible_alias = "q")]
     Quick {
+        category: Option<String>,
         repo: Option<String>,
-        name: Option<String>,
         msg: Option<String>,
     },
 
diff --git a/src/main.rs b/src/main.rs
index 1905182..3393dc0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -77,7 +77,26 @@ fn main() {
         // NOTE: This implements "sub-subcommand"-like matching on repository,
         // name, and additional data for a subcommand
         // TODO: generalize for reuse by all commands that operate on repo->name->msg
-        Some(Commands::Quick { repo, name, msg }) => match (&repo, &name, &msg) {
+        //
+        // What we want:
+        // - gg quick
+        // - gg quick category
+        // - gg quick category repository
+        // - gg quick -m "message"
+        // - gg quick category -m "message"
+        // - gg quick category repo -m "hi"
+        //
+        // What we are implementing:
+        // - [x] gg quick
+        // - [ ] gg quick category
+        // - [ ] gg quick category repository
+        // - [ ] gg quick category repository "stuff"
+        Some(Commands::Quick {
+            category,
+            repo,
+            msg,
+        }) => match (&category, &repo, &msg) {
+            // - gg quick
             (None, None, None) => {
                 let s = Box::leak(
                     msg.as_mut()
@@ -87,19 +106,21 @@ fn main() {
                 );
                 config.quick(s);
             }
-            (repo, None, None) => {
-                println!("{}", repo.as_ref().unwrap());
+            // - [ ] gg quick category
+            (category, None, None) => {
+                println!("{}", category.as_ref().unwrap());
                 todo!();
             }
-            (repo, name, None) => {
-                println!("{} {}", repo.as_ref().unwrap(), name.as_ref().unwrap());
+            (category, repo, None) => {
+                println!("{} {}", category.as_ref().unwrap(), repo.as_ref().unwrap());
                 todo!();
             }
-            (repo, name, msg) => {
+            // - [ ] gg quick category categorysitory "stuff"
+            (category, repo, msg) => {
                 println!(
                     "{} {} {}",
+                    category.as_ref().unwrap(),
                     repo.as_ref().unwrap(),
-                    name.as_ref().unwrap(),
                     msg.as_ref().unwrap(),
                 );
                 todo!();