Compare commits

..

3 Commits

Author SHA1 Message Date
1dc6ce6e5e fix: type conversion 2023-12-27 07:42:38 +01:00
69389d030b refactor: parameterize submit delay 2023-12-27 07:38:48 +01:00
cc7a59c109 feat triple c lick on save button archer 2023-07-04 16:42:46 +02:00
6 changed files with 29 additions and 16 deletions

View File

@@ -13,6 +13,7 @@ type Config struct {
Password string `required:"true" split_words:"true"` Password string `required:"true" split_words:"true"`
LogFile bool `required:"true" split_words:"true"` LogFile bool `required:"true" split_words:"true"`
Bin string `required:"true" split_words:"true"` Bin string `required:"true" split_words:"true"`
SubmitDelay int `default:"7500" required:"false" split_words:"true"`
} }
func NewConfig(envFilePath string) *Config { func NewConfig(envFilePath string) *Config {

View File

@@ -5,6 +5,7 @@ import (
"log" "log"
"time" "time"
"gitea.urkob.com/urko/go-wifi-switcher/pkg/provider"
"github.com/go-rod/rod" "github.com/go-rod/rod"
) )
@@ -42,7 +43,7 @@ func (p ArcherAx50) Login(user, pass string) error {
}`, }`,
}) })
time.Sleep(time.Millisecond * 250) time.Sleep(time.Millisecond * 550)
log.Println(p.passwordID, "DONE") log.Println(p.passwordID, "DONE")
@@ -52,12 +53,11 @@ func (p ArcherAx50) Login(user, pass string) error {
} }
login.MustClick() login.MustClick()
log.Println(p.loginButtonID, "DONE") log.Println(p.loginButtonID, "DONE")
time.Sleep(time.Millisecond * 1550) time.Sleep(time.Millisecond * 4550)
return nil return nil
} }
func (p ArcherAx50) SwitchWIFI() error { func (p ArcherAx50) SwitchWIFI(cfg provider.SwitchConfig) error {
time.Sleep(time.Millisecond * 1850)
pageURL := p.page.MustInfo().URL pageURL := p.page.MustInfo().URL
log.Println("p.page.MustInfo().URL", pageURL) log.Println("p.page.MustInfo().URL", pageURL)
@@ -84,16 +84,18 @@ func (p ArcherAx50) SwitchWIFI() error {
}`, }`,
}) })
time.Sleep(time.Millisecond * 150) time.Sleep(time.Millisecond * 550)
log.Println(p.chkWifi2gID, "DONE") log.Println(p.chkWifi2gID, "DONE")
saveButton, err := p.page.Element(p.saveButtonID) saveButton, err := p.page.Element(p.saveButtonID)
if err != nil { if err != nil {
return fmt.Errorf("page.Element %s: %s", p.saveButtonID, err) return fmt.Errorf("page.Element %s: %s", p.saveButtonID, err)
} }
saveButton.MustClick() saveButton.MustClick()
saveButton.MustClick()
saveButton.MustClick()
log.Println(p.saveButtonID, "DONE") log.Println(p.saveButtonID, "DONE")
time.Sleep(time.Millisecond * 5500) time.Sleep(time.Millisecond * time.Duration(cfg.SubmitDelay))
return nil return nil
} }

View File

@@ -5,6 +5,7 @@ import (
"log" "log"
"time" "time"
"gitea.urkob.com/urko/go-wifi-switcher/pkg/provider"
"github.com/go-rod/rod" "github.com/go-rod/rod"
) )
@@ -66,7 +67,7 @@ func (p Huawei) Login(user, pass string) error {
return nil return nil
} }
func (p Huawei) SwitchWIFI() error { func (p Huawei) SwitchWIFI(cfg provider.SwitchConfig) error {
net, err := p.page.Element(p.netID) net, err := p.page.Element(p.netID)
if err != nil { if err != nil {
return fmt.Errorf("page.Element %s: %s", p.netID, err) return fmt.Errorf("page.Element %s: %s", p.netID, err)

View File

@@ -5,6 +5,7 @@ import (
"log" "log"
"time" "time"
"gitea.urkob.com/urko/go-wifi-switcher/pkg/provider"
"github.com/go-rod/rod" "github.com/go-rod/rod"
) )
@@ -62,7 +63,7 @@ func (p Nucom) Login(user, pass string) error {
return nil return nil
} }
func (p Nucom) SwitchWIFI() error { func (p Nucom) SwitchWIFI(cfg provider.SwitchConfig) error {
wirelessMenu, err := p.page.Element(`a[id="` + p.wirelessTabID + `"]`) wirelessMenu, err := p.page.Element(`a[id="` + p.wirelessTabID + `"]`)
if err != nil { if err != nil {
return fmt.Errorf("page.Element %s: %s", p.wirelessTabID, err) return fmt.Errorf("page.Element %s: %s", p.wirelessTabID, err)

View File

@@ -37,7 +37,11 @@ func (s Switcher) SwitchWIFI(prv provider.ProviderIface) error {
return fmt.Errorf("prv.Login %w", err) return fmt.Errorf("prv.Login %w", err)
} }
if err := prv.SwitchWIFI(); err != nil { switchConfig := provider.SwitchConfig{
SubmitDelay: s.config.SubmitDelay,
}
if err := prv.SwitchWIFI(switchConfig); err != nil {
return fmt.Errorf("prv.SwitchWIFI %w", err) return fmt.Errorf("prv.SwitchWIFI %w", err)
} }

View File

@@ -1,6 +1,10 @@
package provider package provider
type ProviderIface interface { type ProviderIface interface {
Login(user, pass string) error Login(string, string) error
SwitchWIFI() error SwitchWIFI(SwitchConfig) error
}
type SwitchConfig struct {
SubmitDelay int
} }