Actually toggle projects

Author: LauJosefsen

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"gitte/config"
+	"gitte/internal"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -55,6 +56,14 @@ Gitte also contain other sub commands for utilities managing such a setup.
 			return fmt.Errorf("error loading gitte config: %w", err)
 		}
 
+		// if attribute filter-toggles is not set to "false", we filter the toggles based on the toggle file
+		if val, ok := cmd.Annotations["filter-toggles"]; !ok || val != "false" {
+			toggledProjects, err := internal.ReadToggledProjects(cwd)
+			if err != nil {
+				return fmt.Errorf("error reading toggled projects: %w", err)
+			}
+			gitteConfig.FilterToggles(toggledProjects)
+		}
 		cmd.SetContext(config.ContextWithConfig(ctx, gitteConfig))
 
 		return nil

cmd/toggle.go

@@ -11,7 +11,8 @@ import (
 var toggleCmd = &cobra.Command{
 	Use: "toggle",
 	Annotations: map[string]string{
-		"need-config": "true",
+		"need-config":    "true",
+		"filter-toggles": "false",
 	},
 	Short: "Toggle projects on/off with an interactive TUI. Navigate with arrow keys and toggle with space.",
 	Long: `Opens an interactive terminal UI where you can:

config/config.go

@@ -1,6 +1,8 @@
 package config
 
-import "context"
+import (
+	"context"
+)
 
 type GitteConfig struct {
 	StartupChecks   StartupCheckMap           `yaml:"startup,omitempty"`
@@ -59,3 +61,27 @@ func CwdFromContext(ctx context.Context) string {
 func ContextWithCwd(ctx context.Context, cwd string) context.Context {
 	return context.WithValue(ctx, cwdContextKey, cwd)
 }
+
+// ToggledProjects contain a map of project keys that have been explicitly toggled.
+type ToggledProjects = map[string]bool
+
+// FilterToggles filters the projects in the GitteConfig based on the provided toggled projects.
+// It removes projects that are default disabled and not toggled on,
+// as well as projects that are default enabled and toggled off.
+func (cfg *GitteConfig) FilterToggles(toggledProjects ToggledProjects) {
+	filteredProjects := make(map[string]ProjectConfig)
+	for key, project := range cfg.Projects {
+		enabled, isToggled := toggledProjects[key]
+		if project.DefaultDisabled {
+			if isToggled && enabled {
+				filteredProjects[key] = project
+			}
+		} else {
+			if !isToggled || enabled {
+				filteredProjects[key] = project
+			}
+		}
+	}
+
+	cfg.Projects = filteredProjects
+}

internal/actions-tui.go

@@ -0,0 +1,20 @@
+package internal
+
+import (
+	"context"
+	"fmt"
+	"gitte/executor"
+)
+
+type actionOutputHandler struct {
+}
+
+func NewActionOutputHandler() *actionOutputHandler {
+	return &actionOutputHandler{}
+}
+
+func (oh *actionOutputHandler) HandleOutput(ctx context.Context, output executor.Output) error {
+	prefix := fmt.Sprintf("[%s][%s]: ", output.CmdName, output.Stream)
+	fmt.Printf("%s%s", prefix, string(output.Output))
+	return nil
+}

internal/toggle.go

@@ -1,17 +1,15 @@
 package internal
 
 import (
+	"gitte/config"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-// ToggledProjects contain a map of project keys that have been explicitly toggled.
-type ToggledProjects = map[string]bool
-
 const toggleFileName = ".gitte-projects-toggled"
 
-func SaveToggledProjects(cwd string, toggledProjects ToggledProjects) error {
+func SaveToggledProjects(cwd string, toggledProjects config.ToggledProjects) error {
 	var lines []string
 	for project, toggled := range toggledProjects {
 		line := project + ":"
@@ -31,27 +29,27 @@ func getToggleFilePath(cwd string) string {
 	return filepath.Join(cwd, toggleFileName)
 }
 
-func ReadToggledProjects(cwd string) (ToggledProjects, error) {
+func ReadToggledProjects(cwd string) (config.ToggledProjects, error) {
 
 	filePath := getToggleFilePath(cwd)
 	return parseToggleFile(filePath)
 }
 
-func parseToggleFile(filePath string) (ToggledProjects, error) {
+func parseToggleFile(filePath string) (config.ToggledProjects, error) {
 	content, err := os.ReadFile(filePath)
 
 	if err != nil {
 		if os.IsNotExist(err) {
-			return ToggledProjects{}, nil
+			return config.ToggledProjects{}, nil
 		}
 		return nil, err
 	}
 
 	return parseToggleFileContent(content)
 }
 
-func parseToggleFileContent(content []byte) (ToggledProjects, error) {
-	toggledProjects := make(ToggledProjects)
+func parseToggleFileContent(content []byte) (config.ToggledProjects, error) {
+	toggledProjects := make(config.ToggledProjects)
 	// The file is parsed a each newline being project:(true|false)
 	// for example my-project:true
 	lines := strings.Split(string(content), "\n")

internal/toggle_tui.go

@@ -23,37 +23,37 @@ type toggleModel struct {
 	cursor          int
 	viewportOffset  int // For scrolling large lists
 	cwd             string
-	toggledProjects ToggledProjects
+	toggledProjects config.ToggledProjects
 	cfg             *config.GitteConfig
 	width           int
 	height          int
 }
 
 var (
 	titleStyle = lipgloss.NewStyle().
-		Bold(true).
-		Foreground(lipgloss.Color("170")).
-		MarginBottom(1)
+			Bold(true).
+			Foreground(lipgloss.Color("170")).
+			MarginBottom(1)
 
 	selectedStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("170")).
-		Bold(true)
+			Foreground(lipgloss.Color("170")).
+			Bold(true)
 
 	cursorStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("170"))
+			Foreground(lipgloss.Color("170"))
 
 	enabledStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("42"))
+			Foreground(lipgloss.Color("42"))
 
 	disabledStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("196"))
+			Foreground(lipgloss.Color("196"))
 
 	customStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("226"))
+			Foreground(lipgloss.Color("226"))
 
 	helpStyle = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("241")).
-		MarginTop(1)
+			Foreground(lipgloss.Color("241")).
+			MarginTop(1)
 )
 
 func newToggleModel(cfg *config.GitteConfig, cwd string) (*toggleModel, error) {
@@ -342,7 +342,7 @@ func (m *toggleModel) resetAllProjects() {
 		proj.CurrentState = proj.DefaultState
 		proj.IsCustom = false
 	}
-	m.toggledProjects = make(ToggledProjects)
+	m.toggledProjects = make(config.ToggledProjects)
 }
 
 // updateViewport adjusts the viewport offset to keep the cursor visible