Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Config about 3rd party URLs is no more a singleton
  • Loading branch information
cmaglie committed Nov 8, 2018
1 parent 5a02ce4 commit a32d52f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 35 deletions.
2 changes: 1 addition & 1 deletion commands/commands.go
Expand Up @@ -90,7 +90,7 @@ func InitPackageManager() *packagemanager.PackageManager {
Config.DownloadsDir(),
Config.DataDir.Join("tmp"))

for _, URL := range configs.BoardManagerAdditionalUrls {
for _, URL := range Config.BoardManagerAdditionalUrls {
if err := pm.LoadPackageIndex(URL); err != nil {
formatter.PrintError(err, "Failed to load "+URL.String()+" package index.\n"+
"Try updating all indexes with `"+AppName+" core update-index`.")
Expand Down
3 changes: 1 addition & 2 deletions commands/core/update_index.go
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/arduino/arduino-cli/arduino/cores/packageindex"
"github.com/arduino/arduino-cli/commands"
"github.com/arduino/arduino-cli/common/formatter"
"github.com/arduino/arduino-cli/configs"
"github.com/arduino/go-paths-helper"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand All @@ -51,7 +50,7 @@ func runUpdateIndexCommand(cmd *cobra.Command, args []string) {
}

func updateIndexes() {
for _, URL := range configs.BoardManagerAdditionalUrls {
for _, URL := range commands.Config.BoardManagerAdditionalUrls {
updateIndex(URL)
}
}
Expand Down
25 changes: 0 additions & 25 deletions configs/boards_manager.go

This file was deleted.

13 changes: 10 additions & 3 deletions configs/configuration.go
Expand Up @@ -20,6 +20,7 @@ package configs

import (
"fmt"
"net/url"

"github.com/arduino/go-paths-helper"
)
Expand All @@ -42,8 +43,13 @@ type Configuration struct {
// the field is true if the CLI is bundled with the Arduino IDE, false if the CLI is running
// standalone or nil if the detection has not been performed.
IDEBundledCheckResult *bool

// BoardManagerAdditionalUrls contains the additional URL for 3rd party packages
BoardManagerAdditionalUrls []*url.URL
}

var defaultPackageIndexURL, _ = url.Parse("https://downloads.arduino.cc/packages/package_index.json")

// NewConfiguration returns a new Configuration with the default values
func NewConfiguration() (*Configuration, error) {
dataDir, err := getDefaultArduinoDataDir()
Expand All @@ -56,9 +62,10 @@ func NewConfiguration() (*Configuration, error) {
}

return &Configuration{
ConfigFile: getDefaultConfigFilePath(),
DataDir: dataDir,
SketchbookDir: sketchbookDir,
ConfigFile: getDefaultConfigFilePath(),
DataDir: dataDir,
SketchbookDir: sketchbookDir,
BoardManagerAdditionalUrls: []*url.URL{defaultPackageIndexURL},
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion configs/preferences_txt_serializer.go
Expand Up @@ -87,7 +87,7 @@ func (config *Configuration) LoadFromDesktopIDEPreferences() error {
if URLs, has := props.GetOk("boardsmanager.additional.urls"); has {
for _, URL := range strings.Split(URLs, ",") {
if newURL, err := url.Parse(URL); err == nil {
BoardManagerAdditionalUrls = append(BoardManagerAdditionalUrls, newURL)
config.BoardManagerAdditionalUrls = append(config.BoardManagerAdditionalUrls, newURL)
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions configs/yaml_serializer.go
Expand Up @@ -81,7 +81,7 @@ func (config *Configuration) LoadFromYAML(path *paths.Path) error {
logrus.WithError(err).Warn("Error parsing config")
continue
}
BoardManagerAdditionalUrls = append(BoardManagerAdditionalUrls, url)
config.BoardManagerAdditionalUrls = append(config.BoardManagerAdditionalUrls, url)
}
}
return nil
Expand All @@ -104,9 +104,9 @@ func (config *Configuration) SerializeToYAML() ([]byte, error) {
Password: ProxyPassword,
}
}
if len(BoardManagerAdditionalUrls) > 1 {
if len(config.BoardManagerAdditionalUrls) > 1 {
c.BoardsManager = &yamlBoardsManagerConfig{AdditionalURLS: []string{}}
for _, URL := range BoardManagerAdditionalUrls[1:] {
for _, URL := range config.BoardManagerAdditionalUrls[1:] {
c.BoardsManager.AdditionalURLS = append(c.BoardsManager.AdditionalURLS, URL.String())
}
}
Expand Down

0 comments on commit a32d52f

Please sign in to comment.