From cd5d47f7fa77f403a47fcc5fa1536968c34c8f94 Mon Sep 17 00:00:00 2001
From: Marcus Crane <marcus@utf9k.net>
Date: Sat, 8 Jun 2024 15:28:47 +1200
Subject: [PATCH] Alter CLI to trigger on explicit subcommand for better compat

Signed-off-by: Marcus Crane <marcus@utf9k.net>
---
 cli/cli.go | 22 +++++++++++++++-------
 main.go    |  4 +---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cli/cli.go b/cli/cli.go
index 52d74c9..d80e894 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -24,8 +24,8 @@ func IsInvokedFromTerminal() bool {
 
 func Invoke(isPortable bool, version string) {
 	app := &cli.App{
-		Name:     "october",
-		HelpName: "october",
+		Name:     "october cli",
+		HelpName: "october cli",
 		Version:  version,
 		Authors: []*cli.Author{
 			{
@@ -35,10 +35,6 @@ func Invoke(isPortable bool, version string) {
 		},
 		Usage: "sync your kobo highlights to readwise from your terminal",
 		Commands: []*cli.Command{
-			{
-				Name:  "launch",
-				Usage: "skip cli tool and launch desktop ui",
-			},
 			{
 				Name:    "sync",
 				Aliases: []string{"s"},
@@ -71,7 +67,19 @@ func Invoke(isPortable bool, version string) {
 		},
 	}
 
-	err := app.Run(os.Args)
+	// We remove the cli command so that urfave/cli doesn't try to literally parse it
+	// but the help text of the cli tool still shows the user `october cli` so they don't
+	// get disoriented and know that we're juggling text under the hood
+	var args []string
+
+	for k, v := range os.Args {
+		if k == 1 && v == "cli" {
+			continue
+		}
+		args = append(args, v)
+	}
+
+	err := app.Run(args)
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/main.go b/main.go
index 4d15cf7..e6f8394 100644
--- a/main.go
+++ b/main.go
@@ -33,9 +33,7 @@ func main() {
 	isPortable := false
 	isPortable, _ = strconv.ParseBool(portablebuild)
 
-	skipCli := version == "DEV" || len(os.Args) == 2 && os.Args[1] == "launch"
-
-	if cli.IsInvokedFromTerminal() && !skipCli {
+	if len(os.Args) >= 2 && os.Args[1] == "cli" {
 		cli.Invoke(isPortable, version)
 		return
 	}