mirror of
https://github.com/taigrr/gico.git
synced 2026-04-02 03:09:07 -07:00
break out cli into ui subpackage
This commit is contained in:
21
ui/bb.go
21
ui/bb.go
@@ -1,21 +0,0 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/taigrr/gico/ui/graph"
|
||||
)
|
||||
|
||||
func InteractiveGraph() {
|
||||
m := graph.New()
|
||||
// df := lipgloss.NewDoeFoot()
|
||||
// m = m.UpdateDoeFoot(df)
|
||||
|
||||
p := tea.NewProgram(m)
|
||||
if err := p.Start(); err != nil {
|
||||
fmt.Printf("Error: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
137
ui/commitlog.go
Normal file
137
ui/commitlog.go
Normal file
@@ -0,0 +1,137 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
"github.com/charmbracelet/bubbles/table"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
"github.com/taigrr/gico/commits"
|
||||
"github.com/taigrr/gico/types"
|
||||
)
|
||||
|
||||
type (
|
||||
CommitLog struct {
|
||||
Year int
|
||||
YearDay int
|
||||
Commits [][]types.Commit
|
||||
Authors []string
|
||||
Repos []string
|
||||
Table table.Model
|
||||
}
|
||||
)
|
||||
|
||||
func (m CommitLog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
switch msg := msg.(type) {
|
||||
case tea.KeyMsg:
|
||||
switch msg.String() {
|
||||
case "j", "k", "b", "n", "pgdown", "pgup":
|
||||
default:
|
||||
mr := commits.RepoSet(m.Repos)
|
||||
cis, _ := mr.GetRepoCommits(m.Year, m.Authors)
|
||||
m.Commits = cis
|
||||
commits := m.Commits[m.YearDay]
|
||||
rows := []table.Row{}
|
||||
for _, c := range commits {
|
||||
repo := filepath.Base(c.Repo)
|
||||
r := table.Row{
|
||||
c.TimeStamp.Format("0" + time.Kitchen),
|
||||
repo,
|
||||
c.Author.Name,
|
||||
c.Message,
|
||||
}
|
||||
rows = append(rows, r)
|
||||
}
|
||||
m.Table.SetRows(rows)
|
||||
m.Table.SetCursor(0)
|
||||
}
|
||||
}
|
||||
var cmd tea.Cmd
|
||||
m.Table, cmd = m.Table.Update(msg)
|
||||
return m, cmd
|
||||
}
|
||||
|
||||
func newTable() table.Model {
|
||||
t := table.New()
|
||||
t.SetColumns([]table.Column{
|
||||
{Title: "Time", Width: 8},
|
||||
{Title: "Repository", Width: 20},
|
||||
{Title: "Author", Width: 15},
|
||||
{Title: "Message", Width: 40},
|
||||
})
|
||||
t.KeyMap.LineUp = key.NewBinding(key.WithKeys("k"),
|
||||
key.WithHelp("k", "move up one commit"))
|
||||
t.KeyMap.LineDown = key.NewBinding(key.WithKeys("j"),
|
||||
key.WithHelp("j", "move down one commit"))
|
||||
t.Focus()
|
||||
return t
|
||||
}
|
||||
|
||||
func (m CommitLog) Init() tea.Cmd {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m CommitLog) View() string {
|
||||
if len(m.Commits) == 0 {
|
||||
return "No commits to display"
|
||||
}
|
||||
|
||||
if len(m.Commits[m.YearDay]) == 0 {
|
||||
return "No commits to display"
|
||||
}
|
||||
var b strings.Builder
|
||||
b.WriteString("\nCommit Log\n\n")
|
||||
b.WriteString(m.Table.View())
|
||||
return b.String()
|
||||
// return fmt.Sprintf("This is the Commit Log, selected %v", "sd")
|
||||
}
|
||||
|
||||
func NewCommitLog() (CommitLog, error) {
|
||||
var m CommitLog
|
||||
now := time.Now()
|
||||
today := now.YearDay() - 1
|
||||
year := now.Year()
|
||||
aName, err := commits.GetAuthorName()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
aEmail, err := commits.GetAuthorEmail()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
mr, err := commits.GetMRRepos()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
m.Authors = []string{aName, aEmail}
|
||||
m.Repos = mr
|
||||
m.Year = year
|
||||
m.YearDay = today
|
||||
m.Table = newTable()
|
||||
{
|
||||
cis, _ := mr.GetRepoCommits(m.Year, m.Authors)
|
||||
m.Commits = cis
|
||||
commits := m.Commits[m.YearDay]
|
||||
rows := []table.Row{}
|
||||
for _, c := range commits {
|
||||
repo := filepath.Base(c.Repo)
|
||||
r := table.Row{
|
||||
c.TimeStamp.Format("0" + time.Kitchen),
|
||||
repo,
|
||||
c.Author.Name,
|
||||
c.Message,
|
||||
}
|
||||
rows = append(rows, r)
|
||||
}
|
||||
m.Table.SetRows(rows)
|
||||
}
|
||||
m.Commits, err = mr.GetRepoCommits(m.Year, m.Authors)
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
m.Table.SetCursor(0)
|
||||
return m, err
|
||||
}
|
||||
89
ui/graph.go
Normal file
89
ui/graph.go
Normal file
@@ -0,0 +1,89 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
"github.com/taigrr/gico/commits"
|
||||
)
|
||||
|
||||
type (
|
||||
Graph struct {
|
||||
Selected int
|
||||
Year int
|
||||
Repos []string
|
||||
Authors []string
|
||||
}
|
||||
)
|
||||
|
||||
func (m Graph) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
yearLen := YearLen(m.Year)
|
||||
prevYearLen := YearLen(m.Year - 1)
|
||||
switch msg := msg.(type) {
|
||||
case tea.KeyMsg:
|
||||
switch msg.String() {
|
||||
case "down":
|
||||
if m.Selected%7 != 6 {
|
||||
m.Selected++
|
||||
}
|
||||
case "up":
|
||||
if m.Selected%7 != 0 {
|
||||
m.Selected--
|
||||
}
|
||||
case "left":
|
||||
if m.Selected > 6 {
|
||||
m.Selected -= 7
|
||||
} else {
|
||||
// TODO calculate the square for this day last year
|
||||
m.Selected -= 7
|
||||
m.Selected += prevYearLen
|
||||
m.Year--
|
||||
go func() {
|
||||
mr := commits.RepoSet(m.Repos)
|
||||
mr.FrequencyChan(m.Year-1, m.Authors)
|
||||
}()
|
||||
}
|
||||
case "right":
|
||||
if m.Selected < yearLen-7 {
|
||||
m.Selected += 7
|
||||
} else {
|
||||
m.Selected += 7
|
||||
m.Selected -= yearLen
|
||||
m.Year++
|
||||
go func() {
|
||||
mr := commits.RepoSet(m.Repos)
|
||||
mr.FrequencyChan(m.Year+1, m.Authors)
|
||||
}()
|
||||
}
|
||||
}
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func NewGraph(authors, repos []string) (Graph, error) {
|
||||
var m Graph
|
||||
now := time.Now()
|
||||
today := now.YearDay() - 1
|
||||
year := now.Year()
|
||||
m.Repos = repos
|
||||
m.Authors = authors
|
||||
m.Year = year
|
||||
m.Selected = today
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m Graph) Init() tea.Cmd {
|
||||
go func() {
|
||||
mr := commits.RepoSet(m.Repos)
|
||||
mr.FrequencyChan(m.Year-1, m.Authors)
|
||||
mr.FrequencyChan(m.Year+1, m.Authors)
|
||||
}()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m Graph) View() string {
|
||||
mr := commits.RepoSet(m.Repos)
|
||||
gfreq, _ := mr.FrequencyChan(m.Year, m.Authors)
|
||||
return gfreq.StringSelected(m.Selected)
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package graph
|
||||
|
||||
import (
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/taigrr/gico/ui/graph/help"
|
||||
)
|
||||
|
||||
type Graph struct {
|
||||
Help help.Help
|
||||
// df lipgloss.DoeFoot
|
||||
}
|
||||
|
||||
func (g Graph) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
var cmd tea.Cmd
|
||||
switch msg := msg.(type) {
|
||||
case tea.WindowSizeMsg:
|
||||
h, _ := g.Help.Update(msg)
|
||||
t, _ := h.(help.Help)
|
||||
g.Help = t
|
||||
case tea.KeyMsg:
|
||||
switch msg.String() {
|
||||
case "ctrl+c", "q":
|
||||
return g, tea.Quit
|
||||
case "right", "l":
|
||||
case "up", "k":
|
||||
case "down", "j":
|
||||
case "left", "h":
|
||||
case "G":
|
||||
default:
|
||||
h, _ := g.Help.Update(msg)
|
||||
t, _ := h.(help.Help)
|
||||
g.Help = t
|
||||
}
|
||||
}
|
||||
return g, cmd
|
||||
}
|
||||
|
||||
func (g Graph) Init() tea.Cmd {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g Graph) View() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func New() Graph {
|
||||
var g Graph
|
||||
g.Help = help.New()
|
||||
return g
|
||||
}
|
||||
|
||||
//func (g Graph) UpdateDoeFoot(df lipgloss.DoeFoot) Graph {
|
||||
// g.df = df
|
||||
// g.Help = g.Help.UpdateDoeFoot(df)
|
||||
// return g
|
||||
//}
|
||||
@@ -1,30 +0,0 @@
|
||||
package help
|
||||
|
||||
import (
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
)
|
||||
|
||||
type Help struct {
|
||||
// df lipgloss.DoeFoot
|
||||
}
|
||||
|
||||
func (h Help) Update(m tea.Msg) (tea.Model, tea.Cmd) {
|
||||
return h, nil
|
||||
}
|
||||
|
||||
func (h Help) Init() tea.Cmd {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h Help) View() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func New() Help {
|
||||
return Help{}
|
||||
}
|
||||
|
||||
//func (h Help) UpdateDoeFoot(df lipgloss.DoeFoot) Help {
|
||||
// h.df = df
|
||||
// return h
|
||||
//}
|
||||
84
ui/settings.go
Normal file
84
ui/settings.go
Normal file
@@ -0,0 +1,84 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
"github.com/charmbracelet/bubbles/list"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
"github.com/taigrr/gico/commits"
|
||||
)
|
||||
|
||||
const (
|
||||
authors SettingsCursor = iota
|
||||
repos
|
||||
)
|
||||
|
||||
type (
|
||||
SettingsCursor int
|
||||
Settings struct {
|
||||
AllAuthors map[string]bool
|
||||
SelectedAuthors []string
|
||||
AllRepos map[string]bool
|
||||
SelectedRepos []string
|
||||
cursor SettingsCursor
|
||||
highlightedEntry int
|
||||
AuthorList list.Model
|
||||
RepoList list.Model
|
||||
}
|
||||
)
|
||||
|
||||
var settingsKey = key.NewBinding(
|
||||
key.WithKeys("ctrl+g"),
|
||||
key.WithHelp("", "press ctrl+g to open settings"),
|
||||
)
|
||||
|
||||
func (m Settings) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m Settings) Init() tea.Cmd {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m Settings) View() string {
|
||||
return fmt.Sprintf("This is the settings view %s", "fmt")
|
||||
}
|
||||
|
||||
func NewSettings() (Settings, error) {
|
||||
var m Settings
|
||||
var err error
|
||||
m.cursor = authors
|
||||
allRepos, err := commits.GetMRRepos()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
allAuthors, err := commits.RepoSet(allRepos).GetRepoAuthors()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
|
||||
m.AllRepos = make(map[string]bool)
|
||||
for _, v := range allRepos {
|
||||
m.AllRepos[v] = true
|
||||
}
|
||||
|
||||
m.AllAuthors = make(map[string]bool)
|
||||
for _, v := range allAuthors {
|
||||
m.AllAuthors[v] = false
|
||||
}
|
||||
m.SelectedRepos = allRepos
|
||||
email, _ := commits.GetAuthorEmail()
|
||||
if email != "" {
|
||||
m.SelectedAuthors = append(m.SelectedAuthors, email)
|
||||
}
|
||||
name, _ := commits.GetAuthorName()
|
||||
if name != "" {
|
||||
m.SelectedAuthors = append(m.SelectedAuthors, name)
|
||||
}
|
||||
for _, v := range m.SelectedRepos {
|
||||
m.AllAuthors[v] = true
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
154
ui/ui.go
Normal file
154
ui/ui.go
Normal file
@@ -0,0 +1,154 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/charmbracelet/bubbles/help"
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
)
|
||||
|
||||
const (
|
||||
settings Cursor = iota
|
||||
graph
|
||||
commitLog
|
||||
)
|
||||
|
||||
type (
|
||||
Cursor int
|
||||
errMsg error
|
||||
model struct {
|
||||
SettingsModel Settings
|
||||
GraphModel Graph
|
||||
CommitLogModel CommitLog
|
||||
HelpModel help.Model
|
||||
Bindings []key.Binding
|
||||
quitting bool
|
||||
cursor Cursor
|
||||
err error
|
||||
}
|
||||
)
|
||||
|
||||
var quitKeys = key.NewBinding(
|
||||
key.WithKeys("q", "esc", "ctrl+c"),
|
||||
key.WithHelp("", "press q to quit"),
|
||||
)
|
||||
|
||||
func InitialModel() (model, error) {
|
||||
var m model
|
||||
var err error
|
||||
m.SettingsModel, err = NewSettings()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
m.GraphModel, err = NewGraph(m.SettingsModel.SelectedAuthors, m.SettingsModel.SelectedRepos)
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
m.CommitLogModel, err = NewCommitLog()
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
m.cursor = graph
|
||||
m.HelpModel = help.New()
|
||||
m.Bindings = []key.Binding{
|
||||
quitKeys,
|
||||
settingsKey,
|
||||
m.CommitLogModel.Table.KeyMap.LineDown,
|
||||
m.CommitLogModel.Table.KeyMap.LineUp,
|
||||
m.CommitLogModel.Table.KeyMap.PageUp,
|
||||
m.CommitLogModel.Table.KeyMap.PageDown,
|
||||
}
|
||||
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m model) Init() tea.Cmd {
|
||||
return nil
|
||||
}
|
||||
|
||||
func YearLen(year int) int {
|
||||
yearLen := 365
|
||||
if year%4 == 0 {
|
||||
yearLen++
|
||||
}
|
||||
return yearLen
|
||||
}
|
||||
|
||||
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
switch cmd := msg.(type) {
|
||||
|
||||
case tea.KeyMsg:
|
||||
if key.Matches(cmd, settingsKey) {
|
||||
switch m.cursor {
|
||||
case settings:
|
||||
m.cursor = graph
|
||||
default:
|
||||
m.cursor = settings
|
||||
}
|
||||
}
|
||||
if key.Matches(cmd, quitKeys) {
|
||||
m.quitting = true
|
||||
return m, tea.Quit
|
||||
}
|
||||
case errMsg:
|
||||
m.err = cmd
|
||||
return m, nil
|
||||
|
||||
default:
|
||||
}
|
||||
switch m.cursor {
|
||||
// multiple cursors defined for extensibility, but only graph is used
|
||||
case graph, commitLog:
|
||||
m.GraphModel.Authors = m.SettingsModel.SelectedAuthors
|
||||
m.GraphModel.Repos = m.SettingsModel.SelectedRepos
|
||||
|
||||
m.CommitLogModel.Authors = m.SettingsModel.SelectedAuthors
|
||||
m.CommitLogModel.Repos = m.SettingsModel.SelectedRepos
|
||||
|
||||
tmp, _ := m.GraphModel.Update(msg)
|
||||
m.GraphModel, _ = tmp.(Graph)
|
||||
|
||||
m.CommitLogModel.Year = m.GraphModel.Year
|
||||
if m.CommitLogModel.YearDay != m.GraphModel.Selected {
|
||||
m.CommitLogModel.YearDay = m.GraphModel.Selected
|
||||
m.CommitLogModel.Table.SetCursor(0)
|
||||
}
|
||||
tmpC, cmd := m.CommitLogModel.Update(msg)
|
||||
m.CommitLogModel, _ = tmpC.(CommitLog)
|
||||
return m, cmd
|
||||
case settings:
|
||||
tmp, cmd := m.SettingsModel.Update(msg)
|
||||
m.SettingsModel, _ = tmp.(Settings)
|
||||
return m, cmd
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m model) View() string {
|
||||
if m.err != nil {
|
||||
return m.err.Error()
|
||||
}
|
||||
if m.quitting {
|
||||
return ""
|
||||
}
|
||||
mainView := lipgloss.JoinVertical(lipgloss.Top, m.GraphModel.View(), m.CommitLogModel.View(), m.HelpModel.ShortHelpView(m.Bindings))
|
||||
if m.cursor == settings {
|
||||
return lipgloss.JoinHorizontal(lipgloss.Left, m.SettingsModel.View(), mainView)
|
||||
}
|
||||
return mainView
|
||||
}
|
||||
|
||||
func main() {
|
||||
m, err := InitialModel()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
p := tea.NewProgram(m)
|
||||
if _, err := p.Run(); err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user