Skip to content

Pluggable discovery (WIP) #109

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

Closed
wants to merge 12 commits into from
Closed

Pluggable discovery (WIP) #109

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bfa02dd
Use PlatformRelease.IsInstalled() method when appropriate
cmaglie Jan 7, 2019
50ab64f
Added methods to cycle on all installed platforms or boards
cmaglie Jan 7, 2019
09b4da6
board list: reduced timeout to 1s
cmaglie Jan 7, 2019
7662cfa
discovery: first implementation (WIP)
cmaglie Jan 2, 2019
289f6d5
discovery: Do not start process on Discovery creation
cmaglie Jan 2, 2019
e50f391
discovery: added timeout on LIST command
cmaglie Jan 2, 2019
4a84564
discovery: Timeout is now configurable
cmaglie Jan 7, 2019
e95a6da
discovery: Added method to retrieve all installed discoveries
cmaglie Jan 7, 2019
093b044
discovery: Added method to identify boards from BoardPort identificat…
cmaglie Jan 7, 2019
916bc3e
board list command now uses pluggable-discoveries
cmaglie Jan 7, 2019
7b6a23b
discovery: serial-discovery is now downloaded automatically
cmaglie Jan 7, 2019
74a04db
Removed direct dependency (to make dep check happy)
cmaglie Jan 7, 2019
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
discovery: added timeout on LIST command
  • Loading branch information
@cmaglie
cmaglie committed Jan 7, 2019
commit e50f3913ec2824e425f1dd9dadc59daa61292b2c
17 changes: 17 additions & 0 deletions arduino/discovery/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import (
"fmt"
"io"
"os/exec"
"time"

"github.com/arduino/arduino-cli/arduino/cores/packagemanager"

properties "github.com/arduino/go-properties-orderedmap"

Expand Down Expand Up @@ -87,9 +90,23 @@ func (d *Discovery) List() ([]*BoardPort, error) {
return nil, fmt.Errorf("sending LIST command to discovery: %s", err)
}
var event eventJSON
done := make(chan bool)
timeout := false
go func() {
select {
case <-done:
case <-time.After(5 * time.Second):
timeout = true
d.Close()
}
}()
if err := d.outJSON.Decode(&event); err != nil {
if timeout {
return nil, fmt.Errorf("decoding LIST command: timeout")
}
return nil, fmt.Errorf("decoding LIST command: %s", err)
}
done <- true
return event.Ports, nil
}

Expand Down