From 8edad826caf2fa48bfad33f9f8c4f3ba49a052da Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 30 Dec 2022 23:24:24 +1100 Subject: Begin refactoring gui This begins a big refactor of moving more code out of the Gui struct into contexts, controllers, and helpers. We also move some code into structs in the gui package purely for the sake of better encapsulation --- pkg/gui/updates.go | 85 ------------------------------------------------------ 1 file changed, 85 deletions(-) delete mode 100644 pkg/gui/updates.go (limited to 'pkg/gui/updates.go') diff --git a/pkg/gui/updates.go b/pkg/gui/updates.go deleted file mode 100644 index 93231e4f0..000000000 --- a/pkg/gui/updates.go +++ /dev/null @@ -1,85 +0,0 @@ -package gui - -import ( - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/utils" -) - -func (gui *Gui) showUpdatePrompt(newVersion string) error { - message := utils.ResolvePlaceholderString( - gui.Tr.UpdateAvailable, map[string]string{ - "newVersion": newVersion, - }, - ) - - return gui.c.Confirm(types.ConfirmOpts{ - Title: gui.Tr.UpdateAvailableTitle, - Prompt: message, - HandleConfirm: func() error { - gui.startUpdating(newVersion) - return nil - }, - }) -} - -func (gui *Gui) onUserUpdateCheckFinish(newVersion string, err error) error { - if err != nil { - return gui.c.Error(err) - } - if newVersion == "" { - return gui.c.ErrorMsg(gui.Tr.FailedToRetrieveLatestVersionErr) - } - return gui.showUpdatePrompt(newVersion) -} - -func (gui *Gui) onBackgroundUpdateCheckFinish(newVersion string, err error) error { - if err != nil { - // ignoring the error for now so that I'm not annoying users - gui.c.Log.Error(err.Error()) - return nil - } - if newVersion == "" { - return nil - } - if gui.c.UserConfig.Update.Method == "background" { - gui.startUpdating(newVersion) - return nil - } - return gui.showUpdatePrompt(newVersion) -} - -func (gui *Gui) startUpdating(newVersion string) { - gui.State.Updating = true - statusId := gui.statusManager.addWaitingStatus(gui.Tr.UpdateInProgressWaitingStatus) - gui.Updater.Update(newVersion, func(err error) error { return gui.onUpdateFinish(statusId, err) }) -} - -func (gui *Gui) onUpdateFinish(statusId int, err error) error { - gui.State.Updating = false - gui.statusManager.removeStatus(statusId) - gui.c.OnUIThread(func() error { - _ = gui.renderString(gui.Views.AppStatus, "") - if err != nil { - errMessage := utils.ResolvePlaceholderString( - gui.Tr.UpdateFailedErr, map[string]string{ - "errMessage": err.Error(), - }, - ) - return gui.c.ErrorMsg(errMessage) - } - return gui.c.Alert(gui.Tr.UpdateCompletedTitle, gui.Tr.UpdateCompleted) - }) - - return nil -} - -func (gui *Gui) createUpdateQuitConfirmation() error { - return gui.c.Confirm(types.ConfirmOpts{ - Title: gui.Tr.ConfirmQuitDuringUpdateTitle, - Prompt: gui.Tr.ConfirmQuitDuringUpdate, - HandleConfirm: func() error { - return gocui.ErrQuit - }, - }) -} -- cgit v1.2.3