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

more use of waiting statuses

Browse source
This commit is contained in:
Jesse Duffield 2019-06-03 20:08:42 +10:00
parent 1ed796eb32
commit 2f57561c40
4 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/commands/docker.go
View file

@ -330,11 +330,15 @@ func (c *DockerCommand) GetImages() ([]*Image, error) {
} }
nameParts := strings.Split(name, ":") nameParts := strings.Split(name, ":")
tag := ""
if len(nameParts) > 1 {
tag = nameParts[1]
}
ownImages[i] = &Image{ ownImages[i] = &Image{
ID: image.ID, ID: image.ID,
Name: nameParts[0], Name: nameParts[0],
Tag: nameParts[1], Tag: tag,
Image: image, Image: image,
Client: c.Client, Client: c.Client,
OSCommand: c.OSCommand, OSCommand: c.OSCommand,

40
pkg/gui/containers_panel.go
View file

@ -355,24 +355,30 @@ func (gui *Gui) handleContainersRemoveMenu(g *gocui.Gui, v *gocui.View) error {
return nil return nil
} }
configOptions := options[index].configOptions configOptions := options[index].configOptions
if cerr := container.Remove(configOptions); cerr != nil {
var originalErr commands.ComplexError
if xerrors.As(cerr, &originalErr) {
if originalErr.Code == commands.MustStopContainer {
return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("Confirm"), gui.Tr.SLocalize("mustForceToRemoveContainer"), func(g *gocui.Gui, v *gocui.View) error {
configOptions.Force = true
if err := container.Remove(configOptions); err != nil {
return err
}
return gui.refreshContainersAndServices()
}, nil)
}
} else {
return gui.createErrorPanel(gui.g, cerr.Error())
}
}
return gui.refreshContainersAndServices() return gui.WithWaitingStatus(gui.Tr.SLocalize("RemovingStatus"), func() error {
if cerr := container.Remove(configOptions); cerr != nil {
var originalErr commands.ComplexError
if xerrors.As(cerr, &originalErr) {
if originalErr.Code == commands.MustStopContainer {
return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("Confirm"), gui.Tr.SLocalize("mustForceToRemoveContainer"), func(g *gocui.Gui, v *gocui.View) error {
return gui.WithWaitingStatus(gui.Tr.SLocalize("RemovingStatus"), func() error {
configOptions.Force = true
if err := container.Remove(configOptions); err != nil {
return err
}
return gui.refreshContainersAndServices()
})
}, nil)
}
} else {
return gui.createErrorPanel(gui.g, cerr.Error())
}
}
return gui.refreshContainersAndServices()
})
} }
return gui.createMenu("", options, len(options), handleMenuPress) return gui.createMenu("", options, len(options), handleMenuPress)

10
pkg/gui/services_panel.go
View file

@ -219,11 +219,13 @@ func (gui *Gui) handleServiceRemoveMenu(g *gocui.Gui, v *gocui.View) error {
if options[index].command == "" { if options[index].command == "" {
return nil return nil
} }
if err := gui.OSCommand.RunCommand(options[index].command); err != nil { return gui.WithWaitingStatus(gui.Tr.SLocalize("RemovingStatus"), func() error {
return gui.createErrorPanel(gui.g, err.Error()) if err := gui.OSCommand.RunCommand(options[index].command); err != nil {
} return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshContainersAndServices() return gui.refreshContainersAndServices()
})
} }
return gui.createMenu("", options, len(options), handleMenuPress) return gui.createMenu("", options, len(options), handleMenuPress)

4
pkg/i18n/english.go
View file

@ -784,6 +784,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "StoppingStatus", ID: "StoppingStatus",
Other: "stopping", Other: "stopping",
}, },
&i18n.Message{
ID: "RemovingStatus",
Other: "removing",
},
&i18n.Message{ &i18n.Message{
ID: "remove", ID: "remove",
Other: "remove", Other: "remove",