go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

Extract WaitingStatusHandle

Browse Source
This commit is contained in:
Stefan Haller 2023-09-20 08:08:14 +02:00
parent 05c32e292e
commit c222a618a8
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/helpers/app_status_helper.go
View File

@ -36,9 +36,7 @@ func (self *AppStatusHelper) Toast(message string) {
// withWaitingStatus wraps a function and shows a waiting status while the function is still executing
func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task) error) {
self.c.OnWorker(func(task gocui.Task) {
self.statusMgr().WithWaitingStatus(message, func() {
self.renderAppStatus()
self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func() {
if err := f(task); err != nil {
self.c.OnUIThread(func() error {
return self.c.Error(err)

25
pkg/gui/status/status_manager.go
View File

@ -16,6 +16,24 @@ type StatusManager struct {
mutex deadlock.Mutex
}
// Can be used to manipulate a waiting status while it is running (e.g. pause
// and resume it)
type WaitingStatusHandle struct {
statusManager *StatusManager
message string
renderFunc func()
id int
}
func (self *WaitingStatusHandle) Show() {
self.id = self.statusManager.addStatus(self.message, "waiting")
self.renderFunc()
}
func (self *WaitingStatusHandle) Hide() {
self.statusManager.removeStatus(self.id)
}
type appStatus struct {
message string
statusType string
@ -26,12 +44,13 @@ func NewStatusManager() *StatusManager {
return &StatusManager{}
}
func (self *StatusManager) WithWaitingStatus(message string, f func()) {
id := self.addStatus(message, "waiting")
func (self *StatusManager) WithWaitingStatus(message string, renderFunc func(), f func()) {
handle := &WaitingStatusHandle{statusManager: self, message: message, renderFunc: renderFunc, id: -1}
handle.Show()
f()
self.removeStatus(id)
handle.Hide()
}
func (self *StatusManager) AddToastStatus(message string) int {