Skip to content

Added support for Arduino CLI 1.0.0 #189

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
Jun 14, 2024
Merged

Added support for Arduino CLI 1.0.0 #189

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddd1fa4
Get arduino-cli data dir using 'config get' command
cmaglie Jun 14, 2024
c1bbd41
Updated Arduino CLI gRPC API bindings to 1.0
cmaglie Jun 14, 2024
73dc342
Updated license cache
cmaglie Jun 14, 2024
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
Next Next commit
Get arduino-cli data dir using 'config get' command
  • Loading branch information
@cmaglie
cmaglie committed Jun 14, 2024
commit ddd1fa44576320e05bc4a49c812e8fca1c7b763c
18 changes: 5 additions & 13 deletions ls/ls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,9 +1455,8 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
} else {
args := []string{
"--config-file", ls.config.CliConfigPath.String(),
"config",
"dump",
"--format", "json",
"config", "get", "directories.data",
"--json",
}
cmd, err := paths.NewProcessFromPath(nil, ls.config.CliPath, args...)
if err != nil {
Expand All @@ -1470,20 +1469,13 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
return nil, errors.Errorf("running %s: %s", strings.Join(args, " "), err)
}

type cmdRes struct {
Config struct {
Directories struct {
Data string `json:"data"`
} `json:"directories"`
} `json:"config"`
}
var res cmdRes
var res string
if err := json.Unmarshal(cmdOutput.Bytes(), &res); err != nil {
return nil, errors.Errorf("parsing arduino-cli output: %s", err)
}
// Return only the build path
logger.Logf("Arduino Data Dir -> %s", res.Config.Directories.Data)
dataDir = res.Config.Directories.Data
logger.Logf("Arduino Data Dir -> %s", res)
dataDir = res
}

dataDirPath := paths.New(dataDir)
Expand Down