diff options
| -rw-r--r-- | pkg/gui/gui.go | 6 | ||||
| -rw-r--r-- | pkg/gui/mainview.go | 12 | ||||
| -rw-r--r-- | pkg/gui/textstyle.go | 8 | ||||
| -rw-r--r-- | pkg/queue/queue.go (renamed from pkg/job/job.go) | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 5898cb1..ef3df9c 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/isacikgoz/gitbatch/pkg/git" - "github.com/isacikgoz/gitbatch/pkg/job" + "github.com/isacikgoz/gitbatch/pkg/queue" "github.com/jroimartin/gocui" ) @@ -22,7 +22,7 @@ type guiState struct { Repositories []*git.RepoEntity Directories []string Mode mode - Queue *job.JobQueue + Queue *queue.JobQueue } // this struct encapsulates the name and title of a view. the name of a view is @@ -70,7 +70,7 @@ func NewGui(directoies []string) (*Gui, error) { initialState := guiState{ Directories: directoies, Mode: fetchMode, - Queue: job.CreateJobQueue(), + Queue: queue.CreateJobQueue(), } gui := &Gui{ State: initialState, diff --git a/pkg/gui/mainview.go b/pkg/gui/mainview.go index e526f60..eb57526 100644 --- a/pkg/gui/mainview.go +++ b/pkg/gui/mainview.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/isacikgoz/gitbatch/pkg/git" - "github.com/isacikgoz/gitbatch/pkg/job" + "github.com/isacikgoz/gitbatch/pkg/queue" "github.com/jroimartin/gocui" ) @@ -106,18 +106,18 @@ func (gui *Gui) markRepository(g *gocui.Gui, v *gocui.View) error { return err } if r.State == git.Available || r.State == git.Success { - var jt job.JobType + var jt queue.JobType switch mode := gui.State.Mode.ModeID; mode { case FetchMode: - jt = job.Fetch + jt = queue.Fetch case PullMode: - jt = job.Pull + jt = queue.Pull case MergeMode: - jt = job.Merge + jt = queue.Merge default: return nil } - err := gui.State.Queue.AddJob(&job.Job{ + err := gui.State.Queue.AddJob(&queue.Job{ JobType: jt, Entity: r, }) diff --git a/pkg/gui/textstyle.go b/pkg/gui/textstyle.go index 1485572..07b71ea 100644 --- a/pkg/gui/textstyle.go +++ b/pkg/gui/textstyle.go @@ -5,7 +5,7 @@ import ( "github.com/fatih/color" "github.com/isacikgoz/gitbatch/pkg/git" - "github.com/isacikgoz/gitbatch/pkg/job" + "github.com/isacikgoz/gitbatch/pkg/queue" ) var ( @@ -77,11 +77,11 @@ func (gui *Gui) displayString(entity *git.RepoEntity) string { if entity.State == git.Queued { if inQueue, ty := gui.State.Queue.IsInTheQueue(entity); inQueue { switch mode := ty; mode { - case job.Fetch: + case queue.Fetch: suffix = blue.Sprint(queuedSymbol) - case job.Pull: + case queue.Pull: suffix = magenta.Sprint(queuedSymbol) - case job.Merge: + case queue.Merge: suffix = cyan.Sprint(queuedSymbol) default: suffix = green.Sprint(queuedSymbol) diff --git a/pkg/job/job.go b/pkg/queue/queue.go index 6ba2997..091fa84 100644 --- a/pkg/job/job.go +++ b/pkg/queue/queue.go @@ -1,4 +1,4 @@ -package job +package queue import ( "errors" |