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

Changing SortContainersByName to LegacySortContainers

Browse source 
LegacySortContainers will default to legacy behaviour.
New behaviour will sort by status followed by name.
This commit is contained in:
lpessoa 2022-01-17 19:58:51 -03:00
parent a78b5af56b
commit cbacd32a68
No known key found for this signature in database
GPG key ID: EE95569A130570F0
3 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/commands/docker.go
View file

@ -278,13 +278,18 @@ func (c *DockerCommand) filterOutExited(containers []*Container) []*Container {
// sortedContainers returns containers sorted by state if c.SortContainersByState is true (follows 1- running, 2- exited, 3- created)
// and sorted by name if c.SortContainersByState is false
func (c *DockerCommand) sortedContainers(containers []*Container) []*Container {
if !c.Config.UserConfig.Gui.SortContainersByName {
if !c.Config.UserConfig.Gui.LegacySortContainers {
states := map[string]int{
"running": 1,
"exited": 2,
"created": 3,
}
sort.Slice(containers, func(i, j int) bool {
stateLeft := states[containers[i].Container.State]
stateRight := states[containers[j].Container.State]
if stateLeft == stateRight {
return containers[i].Name < containers[j].Name
}
return states[containers[i].Container.State] < states[containers[j].Container.State]
})
}

28
pkg/commands/sort_container_test.go
View file

@ -11,6 +11,7 @@ func sampleContainers(userConfig *config.AppConfig) []*Container {
return []*Container{
{
ID: "1",
Name:"1",
Container: types.Container{
State: "exited",
},
@ -18,6 +19,7 @@ func sampleContainers(userConfig *config.AppConfig) []*Container {
},
{
ID: "2",
Name:"2",
Container: types.Container{
State: "running",
},
@ -25,6 +27,7 @@ func sampleContainers(userConfig *config.AppConfig) []*Container {
},
{
ID: "3",
Name:"3",
Container: types.Container{
State: "running",
},
@ -32,6 +35,7 @@ func sampleContainers(userConfig *config.AppConfig) []*Container {
},
{
ID: "4",
Name:"4",
Container: types.Container{
State: "created",
},
@ -44,6 +48,7 @@ func expectedPerStatusContainers(appConfig *config.AppConfig) []*Container {
return []*Container{
{
ID: "2",
Name:"2",
Container: types.Container{
State: "running",
},
@ -51,6 +56,7 @@ func expectedPerStatusContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "3",
Name:"3",
Container: types.Container{
State: "running",
},
@ -58,6 +64,7 @@ func expectedPerStatusContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "1",
Name:"1",
Container: types.Container{
State: "exited",
},
@ -65,6 +72,7 @@ func expectedPerStatusContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "4",
Name:"4",
Container: types.Container{
State: "created",
},
@ -77,6 +85,7 @@ func expectedLegacySortedContainers(appConfig *config.AppConfig) []*Container {
return []*Container{
{
ID: "1",
Name:"1",
Container: types.Container{
State: "exited",
},
@ -84,6 +93,7 @@ func expectedLegacySortedContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "2",
Name:"2",
Container: types.Container{
State: "running",
},
@ -91,6 +101,7 @@ func expectedLegacySortedContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "3",
Name:"3",
Container: types.Container{
State: "running",
},
@ -98,6 +109,7 @@ func expectedLegacySortedContainers(appConfig *config.AppConfig) []*Container {
},
{
ID: "4",
Name:"4",
Container: types.Container{
State: "created",
},
@ -106,11 +118,17 @@ func expectedLegacySortedContainers(appConfig *config.AppConfig) []*Container {
}
}
func assertEqualContainers(t *testing.T, left *Container, right *Container) {
assert.Equal(t, left.Container.State, right.Container.State)
assert.Equal(t, left.Container.ID, right.Container.ID)
assert.Equal(t, left.Name, right.Name)
}
func TestSortContainers(t *testing.T) {
appConfig := NewDummyAppConfig()
appConfig.UserConfig = &config.UserConfig{
Gui: config.GuiConfig{
SortContainersByName: false,
LegacySortContainers: false,
},
}
command := &DockerCommand{
@ -126,8 +144,7 @@ func TestSortContainers(t *testing.T) {
assert.Equal(t, len(ct), len(sorted))
for i := 0; i < len(ct); i++ {
assert.Equal(t, ct[i].Container.State, sorted[i].Container.State)
assert.Equal(t, ct[i].Container.ID, sorted[i].Container.ID)
assertEqualContainers(t, sorted[i], ct[i])
}
}
@ -135,7 +152,7 @@ func TestLegacySortedContainers(t *testing.T) {
appConfig := NewDummyAppConfig()
appConfig.UserConfig = &config.UserConfig{
Gui: config.GuiConfig{
SortContainersByName: true,
LegacySortContainers: true,
},
}
command := &DockerCommand{
@ -149,7 +166,6 @@ func TestLegacySortedContainers(t *testing.T) {
ct := command.sortedContainers(containers)
for i := 0; i < len(ct); i++ {
assert.Equal(t, sorted[i].Container.State, ct[i].Container.State)
assert.Equal(t, sorted[i].Container.ID, ct[i].Container.ID)
assertEqualContainers(t, sorted[i], ct[i])
}
}

6
pkg/config/app_config.go
View file

@ -113,10 +113,10 @@ type GuiConfig struct {
// WrapMainPanel determines whether we use word wrap on the main panel
WrapMainPanel bool `yaml:"wrapMainPanel,omitempty"`
// SortContainersByName determines if containers should be sorted by name.
// LegacySortContainers determines if containers should be sorted using legacy approach.
// By default, containers are now sorted by status. This setting allows users to
// use legacy behaviour instead.
SortContainersByName bool `yaml:"sortContainersByName,omitempty"`
LegacySortContainers bool `yaml:"legacySortContainers,omitempty"`
}
// CommandTemplatesConfig determines what commands actually get called when we
@ -330,7 +330,7 @@ func GetDefaultConfig() UserConfig {
ShowAllContainers: false,
ReturnImmediately: false,
WrapMainPanel: false,
SortContainersByName: false,
LegacySortContainers: false,
},
Reporting: "undetermined",
ConfirmOnQuit: false,