From b86fc071ec75a6d9ba2c7bad182bce5aea44eb1f Mon Sep 17 00:00:00 2001 From: Urko Date: Tue, 7 Mar 2023 23:07:20 +0100 Subject: [PATCH] fix bug missing " --- internal/switcher/switcher.go | 8 ++++---- main.go | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/switcher/switcher.go b/internal/switcher/switcher.go index 71feec5..71afdda 100644 --- a/internal/switcher/switcher.go +++ b/internal/switcher/switcher.go @@ -25,14 +25,14 @@ var ( wlanEnableID = "#wlanEnable" ) -func NewSwitcher(remoteControlBrowserUrl string, config *cfg.Config) *switcher { - return &switcher{ +func NewSwitcher(remoteControlBrowserUrl string, config *cfg.Config) switcher { + return switcher{ remoteControlBrowserUrl: remoteControlBrowserUrl, config: config, } } -func (s *switcher) SwitchWIFI() error { +func (s switcher) SwitchWIFI() error { browser := rod.New(). ControlURL(s.remoteControlBrowserUrl). MustConnect(). @@ -56,7 +56,7 @@ func (s *switcher) SwitchWIFI() error { userpassword.MustInput(s.config.Password) log.Println(userpasswordID, "DONE") - login, err := page.Element(`input[value=` + loginText + `"]`) + login, err := page.Element(`input[value="` + loginText + `"]`) if err != nil { return fmt.Errorf("page.Element %s: %s", loginText, err) } diff --git a/main.go b/main.go index 12324f4..0890192 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ import ( "github.com/ysmood/leakless" ) -var switcherIface pkgswitcher.SwitcherIface +var sw pkgswitcher.SwitcherIface func main() { envFile := "" @@ -40,6 +40,7 @@ func main() { var lc *launcher.Launcher var remoteControlBrowserURL string + config.Bin = "" if config.Bin != "" { lc = launcher.New().Bin(config.Bin) remoteControlBrowserURL = lc.MustLaunch() @@ -57,8 +58,9 @@ func main() { remoteControlBrowserURL = launcher.MustResolveURL(<-parser.URL) } - sw := switcher.NewSwitcher(remoteControlBrowserURL, config) + sw = switcher.NewSwitcher(remoteControlBrowserURL, config) if err := sw.SwitchWIFI(); err != nil { + log.Println("sw.SwitchWIFI", err) err := retry(5, time.Second*5, sw.SwitchWIFI) if err != nil { log.Fatalln("couldn't retry:", err)