chore: update completions & help

Author: a3chron

README.md

@@ -183,6 +183,8 @@ For more info check out the [help articles](https://gith.featurebase.app/help).
 
   - [x] Change UI accent color
 
+  - [x] Change fetch behaviour on Init
+
 ## Contributing
 
 Contributions are welcome, please use [conventional commits](https://www.conventionalcommits.org/) for a constant commit message style.

completions/_gith

@@ -15,7 +15,8 @@ _gith() {
                     _arguments \
                         '1:subcommand:(show reset path update help tag)' \
                         '--flavor[Catppuccin flavor]:(latte frappe macchiato mocha)' \
-                        '--accent[Catppuccin accent]:(rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender)'
+                        '--accent[Catppuccin accent]:(rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender)' \
+                        '--initFetch[Init fetch behaviour]:(always quick never)'
                     ;;
                 add)
                     _arguments '1:subcommand:(remote)'

completions/gith.bash

@@ -46,6 +46,11 @@ _gith() {
             COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
             return 0
             ;;
+        --initFetch)
+            opts="always quick never"
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            return 0
+            ;;
     esac
 }
 complete -F _gith gith

completions/gith.fish

@@ -5,6 +5,7 @@ complete -c gith -n "__fish_seen_subcommand_from version" -a "check" -d "Check f
 complete -c gith -n "__fish_seen_subcommand_from config" -a "show reset path update help" -d "Config commands"
 complete -c gith -n "__fish_seen_subcommand_from config update" -l flavor -d "Catppuccin flavor" -a "latte frappe macchiato mocha"
 complete -c gith -n "__fish_seen_subcommand_from config update" -l accent -d "Catppuccin accent" -a "rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender gray"
+complete -c gith -n "__fish_seen_subcommand_from config update" -l initFetch -d "Init fetch behaviour" -a "always quick never"
 complete -c gith -n "__fish_seen_subcommand_from add" -a "remote" -d "Quick Select: Add Remote"
 complete -c gith -n "__fish_seen_subcommand_from push" -a "tag" -d "Quick Select: Push Tag"
 complete -c gith -n "__fish_seen_subcommand_from undo" -a "commit" -d "Quick Select: Status"

internal/utils.go

@@ -424,6 +424,7 @@ complete -c gith -n "__fish_seen_subcommand_from version" -a "check" -d "Check f
 complete -c gith -n "__fish_seen_subcommand_from config" -a "show reset path update help" -d "Config commands"
 complete -c gith -n "__fish_seen_subcommand_from config update" -l flavor -d "Catppuccin flavor" -a "latte frappe macchiato mocha"
 complete -c gith -n "__fish_seen_subcommand_from config update" -l accent -d "Catppuccin accent" -a "rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender gray"
+complete -c gith -n "__fish_seen_subcommand_from config update" -l initFetch -d "Init fetch behaviour" -a "always quick never"
 complete -c gith -n "__fish_seen_subcommand_from add" -a "remote" -d "Quick Select: Add Remote"
 complete -c gith -n "__fish_seen_subcommand_from push" -a "tag" -d "Quick Select: Push Tag"
 complete -c gith -n "__fish_seen_subcommand_from undo" -a "commit" -d "Quick Select: Status"
@@ -477,6 +478,11 @@ _gith() {
             COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
             return 0
             ;;
+		--initFetch)
+            opts="always quick never"
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            return 0
+            ;;
     esac
 }
 complete -F _gith gith
@@ -499,7 +505,8 @@ _gith() {
                     _arguments \
                         '1:subcommand:(show reset path update help tag)' \
                         '--flavor[Catppuccin flavor]:(latte frappe macchiato mocha)' \
-                        '--accent[Catppuccin accent]:(rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender)'
+                        '--accent[Catppuccin accent]:(rosewater flamingo pink mauve red maroon peach yellow green teal sky sapphire blue lavender)' \
+						'--initFetch[Init fetch behaviour]:(always quick never)'
                     ;;
                 add)
                     _arguments '1:subcommand:(remote)'

main.go

@@ -282,13 +282,33 @@ func handleConfigCommand() error {
 }
 
 func printConfigUsage() error {
-	fmt.Println("Config commands:")
-	fmt.Println("  gith config show   	- Show current configuration")
-	fmt.Println("  gith config reset  	- Reset configuration to defaults")
-	fmt.Println("  gith config path   	- Show configuration file path")
-	fmt.Println("  gith config update [--flavor=<flavor>] [--accent=<accent>]   - Update configuration")
-	fmt.Println("    <flavor> can be any of the catppuccin flavors (case insensitive)")
-	fmt.Println("    <accent> can be any of the catppuccin accents (case insensitive)")
+	helpText := `
+Config commands:
+  gith config show     - Show current configuration
+  gith config reset    - Reset configuration to defaults
+  gith config path     - Show configuration file path
+
+  gith config update [--flavor=<flavor>] [--accent=<accent>] [--initFetch=<initFetch>]
+    Update your configuration options. Flags are optional and can be combined.
+
+    --flavor=<flavor>
+        Set the Catppuccin flavor (case insensitive). Available options:
+        Latte, Frappe, Macchiato, Mocha
+
+    --accent=<accent>
+        Set the Catppuccin accent color (case insensitive). Available options:
+        Rosewater, Flamingo, Pink, Mauve, Red, Maroon, Peach, Yellow, Green,
+        Teal, Blue, Sapphire, Sky, Lavender, Gray
+
+    --initFetch=<initFetch>
+        Set fetch behavior on init. Available options:
+        always  - always fetch on init
+        quick   - fetch only for full load, skip for quick selects
+        never   - never fetch on init
+`
+
+	fmt.Println(helpText)
+
 	return nil
 }
 
@@ -299,8 +319,9 @@ func showConfig() error {
 	}
 
 	fmt.Printf("Current configuration:\n")
-	fmt.Printf("  Flavor: %s\n", cfg.Flavor)
-	fmt.Printf("  Accent: %s\n", cfg.Accent)
+	fmt.Printf("  Flavor:         %s\n", cfg.Flavor)
+	fmt.Printf("  Accent:         %s\n", cfg.Accent)
+	fmt.Printf("  Init Behaviour: %s\n", cfg.InitBehaviour)
 	return nil
 }
 
@@ -314,46 +335,35 @@ func updateConfig() error {
 		return fmt.Errorf("failed to load config: %w", err)
 	}
 
-	// TODO: when adding more to configure, make sure to handle this automatically
-
-	first := strings.ToLower(os.Args[3])
-	second := ""
-
-	if len(os.Args) >= 5 {
-		second = strings.ToLower(os.Args[4])
-	}
+	args := os.Args[3:]
+	for _, arg := range args {
+		arg = strings.ToLower(arg)
 
-	if flavor, found := strings.CutPrefix(first, "--flavor="); found {
-		if config.IsValidFlavor(flavor) {
-			cfg.Flavor = flavor
-		} else {
-			return fmt.Errorf("not a valid flavor: %s\nlist of valid flavors: %s", flavor, config.GetAvailableFlavors())
-		}
-	} else if accent, found := strings.CutPrefix(first, "--accent="); found {
-		if config.IsValidAccent(accent) {
-			cfg.Accent = accent
-		} else {
-			return fmt.Errorf("not a valid accent: %s\nlist of valid accent: %s", accent, config.GetAvailableAccents())
-		}
-	} else {
-		return fmt.Errorf("'%s' is not a valid flag\nRun 'gith config help' to see valid flags", strings.TrimPrefix(strings.Split(first, "=")[0], "--"))
-	}
+		switch {
+		case strings.HasPrefix(arg, "--flavor="):
+			val := strings.TrimPrefix(arg, "--flavor=")
+			if !config.IsValidFlavor(val) {
+				return fmt.Errorf("not a valid flavor: %s\nvalid flavors: %s", val, strings.Join(config.GetAvailableFlavors(), ", "))
+			}
+			cfg.Flavor = val
 
-	if second != "" {
-		if flavor, found := strings.CutPrefix(second, "--flavor="); found {
-			if config.IsValidFlavor(flavor) {
-				cfg.Flavor = flavor
-			} else {
-				return fmt.Errorf("not a valid flavor: %s\nlist of valid flavors: %s", flavor, config.GetAvailableFlavors())
+		case strings.HasPrefix(arg, "--accent="):
+			val := strings.TrimPrefix(arg, "--accent=")
+			if !config.IsValidAccent(val) {
+				return fmt.Errorf("not a valid accent: %s\nvalid accents: %s", val, strings.Join(config.GetAvailableAccents(), ", "))
 			}
-		} else if accent, found := strings.CutPrefix(second, "--accent="); found {
-			if config.IsValidAccent(accent) {
-				cfg.Accent = accent
-			} else {
-				return fmt.Errorf("not a valid accent: %s\nlist of valid accent: %s", accent, config.GetAvailableAccents())
+			cfg.Accent = val
+
+		case strings.HasPrefix(arg, "--initfetch="):
+			val := strings.TrimPrefix(arg, "--initfetch=")
+			valid := map[string]bool{"always": true, "quick": true, "never": true}
+			if !valid[val] {
+				return fmt.Errorf("not a valid initFetch: %s\nvalid options: always, quick, never", val)
 			}
-		} else {
-			return fmt.Errorf("'%s' is not a valid flag\nRun 'gith config help' to see valid flags", strings.TrimPrefix(strings.Split(first, "=")[0], "--"))
+			cfg.InitBehaviour = val
+
+		default:
+			return fmt.Errorf("'%s' is not a valid flag\nRun 'gith config help' to see valid flags", strings.Split(arg, "=")[0])
 		}
 	}