Merge pull request #6 from noahstreller/feature/status-command

internal/operations/git/status.go

@@ -0,0 +1,199 @@
+package git
+
+import (
+	"fmt"
+	"os/exec"
+	"sort"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/noahstreller/igitt/internal/utilities"
+	"github.com/noahstreller/igitt/internal/utilities/logger"
+)
+
+type FileStatus struct {
+	StatusLetter string
+	FileName     string
+}
+
+type ModifiedStatusInfo struct {
+	StatusColor  color.Attribute
+	StatusTitle  string
+	StatusLetter string
+}
+
+/*
+
+https://git-scm.com/docs/git-status#_short_format
+
+X          Y     Meaning
+-------------------------------------------------
+         [AMD]   not updated
+M        [ MTD]  updated in index
+T        [ MTD]  type changed in index
+A        [ MTD]  added to index
+D                deleted from index
+R        [ MTD]  renamed in index
+C        [ MTD]  copied in index
+[MTARC]          index and work tree matches
+[ MTARC]    M    work tree changed since index
+[ MTARC]    T    type changed in work tree since index
+[ MTARC]    D    deleted in work tree
+	          R    renamed in work tree
+	          C    copied in work tree
+-------------------------------------------------
+D           D    unmerged, both deleted
+A           U    unmerged, added by us
+U           D    unmerged, deleted by them
+U           A    unmerged, added by them
+D           U    unmerged, deleted by us
+A           A    unmerged, both added
+U           U    unmerged, both modified
+-------------------------------------------------
+?           ?    untracked
+!           !    ignored
+-------------------------------------------------
+
+*/
+
+var FileStatuses = []ModifiedStatusInfo{
+	// Basic States
+	{color.FgHiRed, "Deleted (staged)", "D "},
+	{color.FgHiGreen, "New (staged)", "A "},
+	{color.FgHiYellow, "Modified (staged)", "M "},
+	{color.FgHiBlue, "Renamed (staged)", "R "},
+	{color.FgHiCyan, "Copied (staged)", "C "},
+	{color.FgHiMagenta, "Type changed (staged)", "T "},
+
+	// Work Tree (Unstaged) States
+	{color.FgHiYellow, "Modified (unstaged)", " M"},
+	{color.FgHiMagenta, "Type changed (unstaged)", " T"},
+	{color.FgHiRed, "Deleted (unstaged)", " D"},
+	{color.FgHiBlue, "Renamed (unstaged)", " R"},
+
+	// Combined Staged and Unstaged States
+	{color.FgHiYellow, "Modified (staged & partially unstaged)", "MM"},
+	{color.FgHiMagenta, "Type changed (staged & unstaged)", "TT"},
+	{color.FgHiYellow, "New (staged), Modified (unstaged)", "AM"},
+	{color.FgHiYellow, "Renamed (staged), Modified (unstaged)", "RM"},
+	{color.FgHiYellow, "Copied (staged), Modified (unstaged)", "CM"},
+	{color.FgHiMagenta, "Modified (staged), Type changed (unstaged)", "MT"},
+	{color.FgHiRed, "Modified (staged), Deleted (unstaged)", "MD"},
+	{color.FgHiYellow, "Modified (staged), Renamed (unstaged)", "MR"},
+	{color.FgHiYellow, "Modified (staged), Copied (unstaged)", "MC"},
+	{color.FgHiRed, "Type changed (staged), Deleted (unstaged)", "TD"},
+	{color.FgHiMagenta, "Type changed (staged), Renamed (unstaged)", "TR"},
+	{color.FgHiMagenta, "Type changed (staged), Copied (unstaged)", "TC"},
+	{color.FgHiMagenta, "Renamed (staged), Type changed (unstaged)", "RT"},
+	{color.FgHiRed, "Renamed (staged), Deleted (unstaged)", "RD"},
+	{color.FgHiRed, "Copied (staged), Deleted (unstaged)", "CD"},
+	{color.FgHiCyan, "Copied (staged), Renamed (unstaged)", "CR"},
+
+	// Unmerged States
+	{color.FgHiRed, "Unmerged, Both Deleted", "DD"},
+	{color.FgHiGreen, "Unmerged, Added by Us", "AU"},
+	{color.FgHiYellow, "Unmerged, Deleted by Them", "UD"},
+	{color.FgHiGreen, "Unmerged, Added by Them", "UA"},
+	{color.FgHiYellow, "Unmerged, Deleted by Us", "DU"},
+	{color.FgHiGreen, "Unmerged, Both Added", "AA"},
+	{color.FgHiYellow, "Unmerged, Both Modified", "UU"},
+
+	// Other States
+	{color.FgHiBlack, "Untracked", "??"},
+	{color.FgHiBlack, "Ignored", "!!"},
+}
+
+func Status() {
+	modifications, err := getModifications()
+	if err != nil {
+		return
+	}
+
+	if len(modifications) == 0 {
+		fmt.Println("\n", color.HiGreenString("✓"), "Up to date.")
+		return
+	}
+
+	bold := color.New(color.Bold).SprintFunc()
+	fmt.Println(color.BlackString("==================="))
+	fmt.Println(bold("Files with changes:"))
+	fmt.Println(color.BlackString("==================="))
+
+	// Create a map for quick lookup of FileStatuses by StatusLetter
+	statusMap := make(map[string]ModifiedStatusInfo)
+	for _, status := range FileStatuses {
+		statusMap[status.StatusLetter] = status
+	}
+
+	maxWidth := 0
+
+	// Calculate maxWidth
+	for _, modification := range modifications {
+		if status, exists := statusMap[modification.StatusLetter]; exists {
+			color := color.New(status.StatusColor).SprintFunc()
+			coloredTitle := color(status.StatusTitle)
+			if len(coloredTitle) > maxWidth {
+				maxWidth = len(coloredTitle) + 4
+			}
+		}
+	}
+
+	// Print modifications with formatted output
+	for _, modification := range modifications {
+		if status, exists := statusMap[modification.StatusLetter]; exists {
+			color := color.New(status.StatusColor).SprintFunc()
+			coloredTitle := color(status.StatusTitle)
+			format := fmt.Sprintf("%%-%ds%%s\n", maxWidth)
+			fmt.Printf(format, coloredTitle, modification.FileName)
+		}
+	}
+}
+
+func getModifications() ([]FileStatus, error) {
+	var statuses []FileStatus
+
+	status, err := runGitStatus()
+	if err != nil {
+		logger.ErrorLogger.Println("Failed previous step, aborting: ", err)
+		return nil, err
+	}
+
+	statusWithoutEmptyLine := utilities.RemoveLastEmptyLine(status)
+	statusLines := strings.Split(statusWithoutEmptyLine, "\n")
+
+	if len(statusLines) == 0 {
+		return statuses, nil
+	}
+
+	if len(statusLines) == 1 {
+		if statusLines[0] == "" {
+			return []FileStatus{}, nil
+		}
+	}
+
+	for _, line := range statusLines {
+		statusLetter := string(line[0:2])
+		fileName := line[3:]
+
+		statuses = append(statuses, FileStatus{statusLetter, fileName})
+	}
+
+	statusTitleMap := make(map[string]string)
+	for _, status := range FileStatuses {
+		statusTitleMap[status.StatusLetter] = status.StatusTitle
+	}
+
+	sort.Slice(statuses, func(i, j int) bool {
+		// Sort by the status title using the map
+		return statusTitleMap[statuses[i].StatusLetter] < statusTitleMap[statuses[j].StatusLetter]
+	})
+
+	return statuses, nil
+
+}
+
+func runGitStatus() (string, error) {
+	byteOut, errOut := exec.Command("git", "status", "--porcelain").CombinedOutput()
+	logger.InfoLogger.Println("Fetching git status:", errOut, string(byteOut))
+	return string(byteOut), errOut
+}

internal/operations/interactive/interactive.go

@@ -47,9 +47,9 @@ type CommandFlowResult struct {
 	GitAddArguments string
 }
 
-const iconWidth = 3
+const iconWidth = 4
 const shortcutsEnabled = false
-const iconVariant = NerdFont
+const iconVariant = Emoji
 
 func getTitle(command Command) string {
 	if iconVariant == Emoji {
@@ -152,7 +152,7 @@ func StartInteractive() {
 			}).
 			Value(&commandFlowResult.RepoUrlInput),
 		).WithHideFunc(func() bool {
-			return commandFlowResult.SelectedCommand.NextStep != "op-enter-repo-url"
+			return commandFlowResult.SelectedCommand.NextStep != "ns-enter-repo-url"
 		}),
 	).WithTheme(theme).Run()
 

internal/operations/interactive/operations.json

@@ -1,4 +1,15 @@
 [
+  {
+    "id": "op-status",
+    "name": "Status",
+    "shortcut": "s",
+    "description": "Show changed files in the working directory",
+    "icon": "⚆⚆",
+    "icon_emoji": "👀",
+    "icon_nerdfont": "",
+    "nextStep": "ns-stage-or-unstage-changes",
+    "nextStepTitle": "Add or remove changed files to/from the staging area"
+  },
   {
     "id": "op-clone",
     "name": "Clone",
@@ -7,7 +18,7 @@
     "icon": "⎘",
     "icon_emoji": "📂",
     "icon_nerdfont": "",
-    "nextStep": "op-enter-repo-url",
+    "nextStep": "ns-enter-repo-url",
     "nextStepTitle": "Enter remote repository URL"
   },
   {
@@ -27,7 +38,7 @@
     "shortcut": "cmt",
     "description": "Record changes to the repository",
     "icon": "✎",
-    "icon_emoji": "✏️",
+    "icon_emoji": "📝",
     "icon_nerdfont": "",
     "nextStep": "none",
     "nextStepTitle": "None"

internal/utilities/initialize/commands.go

@@ -75,6 +75,15 @@ func InitializeIgitt() {
 		},
 	}
 
+	var statusCmd = &cobra.Command{
+		Use:     "status",
+		Short:   "(s) Show changed files",
+		Aliases: []string{"s"},
+		Run: func(cmd *cobra.Command, args []string) {
+			git.Status()
+		},
+	}
+
 	var interactiveCmd = &cobra.Command{
 		Use:     "interactive",
 		Short:   "(i) Enter interactive mode",
@@ -107,6 +116,7 @@ func InitializeIgitt() {
 		gitAddCmd,
 		pullCmd,
 		pushCmd,
+		statusCmd,
 		commitCmd,
 		createAliasScripts,
 	)

internal/utilities/utils.go

@@ -0,0 +1,14 @@
+package utilities
+
+import "strings"
+
+func RemoveLastEmptyLine(text string) string {
+	lines := strings.Split(text, "\n")
+
+	// Remove the last empty line if it exists
+	if len(lines) > 0 && lines[len(lines)-1] == "" {
+		lines = lines[:len(lines)-1]
+	}
+
+	return strings.Join(lines, "\n")
+}