sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

standardise controller helper methods

Browse Source
This commit is contained in:
Jesse Duffield
2023-03-23 13:04:57 +11:00
parent fc91ef6a59
commit 711674f6cd
34 changed files with 262 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/gui/controllers/remotes_controller.go
View File

@ -14,7 +14,6 @@ import (
type RemotesController struct {
baseController
*controllerCommon
context *context.RemotesContext
setRemoteBranches func([]*models.RemoteBranch)
}
@ -28,7 +27,6 @@ func NewRemotesController(
return &RemotesController{
baseController: baseController{},
controllerCommon: common,
context: common.contexts.Remotes,
setRemoteBranches: setRemoteBranches,
}
}
@ -64,11 +62,19 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ
return bindings
}
func (self *RemotesController) Context() types.Context {
return self.context()
}
func (self *RemotesController) context() *context.RemotesContext {
return self.c.Contexts().Remotes
}
func (self *RemotesController) GetOnRenderToMain() func() error {
return func() error {
return self.helpers.Diff.WithDiffModeCheck(func() error {
var task types.UpdateTask
remote := self.context.GetSelected()
remote := self.context().GetSelected()
if remote == nil {
task = types.NewRenderStringTask("No remotes")
} else {
@ -98,14 +104,14 @@ func (self *RemotesController) enter(remote *models.Remote) error {
if len(remote.Branches) == 0 {
newSelectedLine = -1
}
self.contexts.RemoteBranches.SetSelectedLineIdx(newSelectedLine)
self.contexts.RemoteBranches.SetTitleRef(remote.Name)
self.c.Contexts().RemoteBranches.SetSelectedLineIdx(newSelectedLine)
self.c.Contexts().RemoteBranches.SetTitleRef(remote.Name)
if err := self.c.PostRefreshUpdate(self.contexts.RemoteBranches); err != nil {
if err := self.c.PostRefreshUpdate(self.c.Contexts().RemoteBranches); err != nil {
return err
}
return self.c.PushContext(self.contexts.RemoteBranches)
return self.c.PushContext(self.c.Contexts().RemoteBranches)
}
func (self *RemotesController) add() error {
@ -116,7 +122,7 @@ func (self *RemotesController) add() error {
Title: self.c.Tr.LcNewRemoteUrl,
HandleConfirm: func(remoteUrl string) error {
self.c.LogAction(self.c.Tr.Actions.AddRemote)
if err := self.git.Remote.AddRemote(remoteName, remoteUrl); err != nil {
if err := self.c.Git().Remote.AddRemote(remoteName, remoteUrl); err != nil {
return err
}
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.REMOTES}})
@ -132,7 +138,7 @@ func (self *RemotesController) remove(remote *models.Remote) error {
Prompt: self.c.Tr.LcRemoveRemotePrompt + " '" + remote.Name + "'?",
HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.RemoveRemote)
if err := self.git.Remote.RemoveRemote(remote.Name); err != nil {
if err := self.c.Git().Remote.RemoveRemote(remote.Name); err != nil {
return self.c.Error(err)
}
@ -155,7 +161,7 @@ func (self *RemotesController) edit(remote *models.Remote) error {
HandleConfirm: func(updatedRemoteName string) error {
if updatedRemoteName != remote.Name {
self.c.LogAction(self.c.Tr.Actions.UpdateRemote)
if err := self.git.Remote.RenameRemote(remote.Name, updatedRemoteName); err != nil {
if err := self.c.Git().Remote.RenameRemote(remote.Name, updatedRemoteName); err != nil {
return self.c.Error(err)
}
}
@ -178,7 +184,7 @@ func (self *RemotesController) edit(remote *models.Remote) error {
InitialContent: url,
HandleConfirm: func(updatedRemoteUrl string) error {
self.c.LogAction(self.c.Tr.Actions.UpdateRemote)
if err := self.git.Remote.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil {
if err := self.c.Git().Remote.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil {
return self.c.Error(err)
}
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}})
@ -190,7 +196,7 @@ func (self *RemotesController) edit(remote *models.Remote) error {
func (self *RemotesController) fetch(remote *models.Remote) error {
return self.c.WithWaitingStatus(self.c.Tr.FetchingRemoteStatus, func() error {
err := self.git.Sync.FetchRemote(remote.Name)
err := self.c.Git().Sync.FetchRemote(remote.Name)
if err != nil {
_ = self.c.Error(err)
}
@ -201,7 +207,7 @@ func (self *RemotesController) fetch(remote *models.Remote) error {
func (self *RemotesController) checkSelected(callback func(*models.Remote) error) func() error {
return func() error {
file := self.context.GetSelected()
file := self.context().GetSelected()
if file == nil {
return nil
}
@ -209,7 +215,3 @@ func (self *RemotesController) checkSelected(callback func(*models.Remote) error
return callback(file)
}
}
func (self *RemotesController) Context() types.Context {
return self.context
}