mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-21 23:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refresh images upon receiving an event

Browse source
This commit is contained in:
Jesse Duffield 2022-05-10 23:14:46 +10:00
parent 56b3196ef9
commit 75ed6b12e5
6 changed files with 24 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/gui/containers_panel.go
View file

@ -461,16 +461,13 @@ func (gui *Gui) handleContainersRemoveMenu(g *gocui.Gui, v *gocui.View) error {
return gui.createConfirmationPanel(gui.g, v, gui.Tr.Confirm, gui.Tr.MustForceToRemoveContainer, func(g *gocui.Gui, v *gocui.View) error {
return gui.WithWaitingStatus(gui.Tr.RemovingStatus, func() error {
configOptions.Force = true
if err := container.Remove(configOptions); err != nil {
return err
}
return gui.refreshContainersAndServices()
return container.Remove(configOptions)
})
}, nil)
}
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices()
return nil
})
}
@ -489,7 +486,7 @@ func (gui *Gui) handleContainerStop(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices()
return nil
})
}, nil)
}
@ -505,7 +502,7 @@ func (gui *Gui) handleContainerRestart(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices()
return nil
})
}

33
pkg/gui/gui.go
View file

@ -183,16 +183,6 @@ func max(a, b int) int {
return b
}
func (gui *Gui) loadNewDirectory() error {
gui.waitForIntro.Done()
if err := gui.refreshSidePanels(gui.g); err != nil {
return err
}
return nil
}
func (gui *Gui) renderGlobalOptions() error {
return gui.renderOptionsMap(map[string]string{
"PgUp/PgDn": gui.Tr.Scroll,
@ -293,13 +283,22 @@ func (gui *Gui) rerenderContainersAndServices() error {
}
func (gui *Gui) refresh() {
gui.refreshProject()
if err := gui.refreshContainersAndServices(); err != nil {
gui.Log.Error(err)
}
if err := gui.refreshVolumes(); err != nil {
gui.Log.Error(err)
}
go gui.refreshProject()
go func() {
if err := gui.refreshContainersAndServices(); err != nil {
gui.Log.Error(err)
}
}()
go func() {
if err := gui.refreshVolumes(); err != nil {
gui.Log.Error(err)
}
}()
go func() {
if err := gui.refreshImages(); err != nil {
gui.Log.Error(err)
}
}()
}
func (gui *Gui) listenForEvents(finish chan struct{}, refresh func()) {

2
pkg/gui/images_panel.go
View file

@ -240,7 +240,7 @@ func (gui *Gui) handleImagesRemoveMenu(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, cerr.Error())
}
return gui.refreshImages()
return nil
}
return gui.createMenu("", options, len(options), handleMenuPress)

5
pkg/gui/layout.go
View file

@ -256,10 +256,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
return err
}
// doing this here because it'll only happen once
if err := gui.loadNewDirectory(); err != nil {
return err
}
gui.waitForIntro.Done()
}
if gui.g.CurrentView() == nil {

4
pkg/gui/services_panel.go
View file

@ -231,7 +231,7 @@ func (gui *Gui) handleServiceStop(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices()
return nil
})
}, nil)
}
@ -247,7 +247,7 @@ func (gui *Gui) handleServiceRestart(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices()
return nil
})
}

9
pkg/gui/view_helpers.go
View file

@ -10,15 +10,6 @@ import (
"github.com/spkg/bom"
)
func (gui *Gui) refreshSidePanels(g *gocui.Gui) error {
// not refreshing containers and services here given that we do it every few milliseconds anyway
if err := gui.refreshImages(); err != nil {
return err
}
return nil
}
func (gui *Gui) nextView(g *gocui.Gui, v *gocui.View) error {
var focusedViewName string
if v == nil || v.Name() == gui.CyclableViews[len(gui.CyclableViews)-1] {