From 52fb944bfb345eceb236d55b45b0882984617134 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 26 Nov 2021 21:26:24 +1100 Subject: [PATCH] refactor --- pkg/gui/containers_panel.go | 5 +++++ pkg/gui/services_panel.go | 16 +--------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go index 25fb6770..7a0c8639 100644 --- a/pkg/gui/containers_panel.go +++ b/pkg/gui/containers_panel.go @@ -593,6 +593,11 @@ func (gui *Gui) handleContainersOpenInBrowserCommand(g *gocui.Gui, v *gocui.View if err != nil { return nil } + + return gui.openContainerInBrowser(container) +} + +func (gui *Gui) openContainerInBrowser(container *commands.Container) error { // skip if no any ports if len(container.Container.Ports) == 0 { return nil diff --git a/pkg/gui/services_panel.go b/pkg/gui/services_panel.go index 8ce15913..fd2bdd45 100644 --- a/pkg/gui/services_panel.go +++ b/pkg/gui/services_panel.go @@ -421,19 +421,5 @@ func (gui *Gui) handleServicesOpenInBrowserCommand(g *gocui.Gui, v *gocui.View) return gui.createErrorPanel(gui.g, gui.Tr.NoContainers) } - // skip if no any ports - if len(container.Container.Ports) == 0 { - return nil - } - // skip if the first port is not published - port := container.Container.Ports[0] - if port.IP == "" { - return nil - } - ip := port.IP - if ip == "0.0.0.0" { - ip = "localhost" - } - link := fmt.Sprintf("http://%s:%d/", ip, port.PublicPort) - return gui.OSCommand.OpenLink(link) + return gui.openContainerInBrowser(container) }