Skip to content

Allow case-insensitive ok or OK replies from pluggable discoveries and monitors #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 24, 2022
Merged

Allow case-insensitive ok or OK replies from pluggable discoveries and monitors #1633

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3751896
Allow case-insensitive 'ok'/'OK' replies from discoveries and monitors
cmaglie Jan 24, 2022
2fabff9
Factor the same messages to reduce translations strings
cmaglie Jan 24, 2022
87665c9
Better error messages for discoveries and monitor
cmaglie Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Factor the same messages to reduce translations strings
  • Loading branch information
@cmaglie
cmaglie committed Jan 24, 2022
commit 2fabff9ea2479cb5c8c32ea10d47cd6b8b3a916f
12 changes: 6 additions & 6 deletions arduino/discovery/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (disc *PluggableDiscovery) Run() (err error) {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return fmt.Errorf(tr("calling %[1]s: %[2]w"), "HELLO", err)
} else if msg.EventType != "hello" {
return errors.Errorf(tr("communication out of sync, expected 'hello', received '%s'"), msg.EventType)
return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "hello", msg.EventType)
} else if strings.ToUpper(msg.Message) != "OK" || msg.Error {
return errors.Errorf(tr("command failed: %s"), msg.Message)
} else if msg.ProtocolVersion > 1 {
Expand All @@ -332,7 +332,7 @@ func (disc *PluggableDiscovery) Start() error {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return fmt.Errorf(tr("calling %[1]s: %[2]w"), "START", err)
} else if msg.EventType != "start" {
return errors.Errorf(tr("communication out of sync, expected 'start', received '%s'"), msg.EventType)
return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "start", msg.EventType)
} else if strings.ToUpper(msg.Message) != "OK" || msg.Error {
return errors.Errorf(tr("command failed: %s"), msg.Message)
}
Expand All @@ -352,7 +352,7 @@ func (disc *PluggableDiscovery) Stop() error {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return fmt.Errorf(tr("calling %[1]s: %[2]w"), "STOP", err)
} else if msg.EventType != "stop" {
return errors.Errorf(tr("communication out of sync, expected 'stop', received '%s'"), msg.EventType)
return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "stop", msg.EventType)
} else if strings.ToUpper(msg.Message) != "OK" || msg.Error {
return errors.Errorf(tr("command failed: %s"), msg.Message)
}
Expand All @@ -375,7 +375,7 @@ func (disc *PluggableDiscovery) Quit() error {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return fmt.Errorf(tr("calling %[1]s: %[2]w"), "QUIT", err)
} else if msg.EventType != "quit" {
return errors.Errorf(tr("communication out of sync, expected 'quit', received '%s'"), msg.EventType)
return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "quit", msg.EventType)
} else if strings.ToUpper(msg.Message) != "OK" || msg.Error {
return errors.Errorf(tr("command failed: %s"), msg.Message)
}
Expand All @@ -392,7 +392,7 @@ func (disc *PluggableDiscovery) List() ([]*Port, error) {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return nil, fmt.Errorf(tr("calling %[1]s: %[2]w"), "LIST", err)
} else if msg.EventType != "list" {
return nil, errors.Errorf(tr("communication out of sync, expected 'list', received '%s'"), msg.EventType)
return nil, errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "list", msg.EventType)
} else if msg.Error {
return nil, errors.Errorf(tr("command failed: %s"), msg.Message)
} else {
Expand All @@ -415,7 +415,7 @@ func (disc *PluggableDiscovery) StartSync(size int) (<-chan *Event, error) {
if msg, err := disc.waitMessage(time.Second * 10); err != nil {
return nil, fmt.Errorf(tr("calling %[1]s: %[2]w"), "START_SYNC", err)
} else if msg.EventType != "start_sync" {
return nil, errors.Errorf(tr("communication out of sync, expected 'start_sync', received '%s'"), msg.EventType)
return nil, errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "start_sync", msg.EventType)
} else if strings.ToUpper(msg.Message) != "OK" || msg.Error {
return nil, errors.Errorf(tr("command failed: %s"), msg.Message)
}
Expand Down