RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/arduino/arduino-cli/commit/84fc413ad815397a5aa2bc2878f3d7ed523acf34 below:

Expose golang `fqbn` package for public use (#2768) · arduino/arduino-cli@84fc413 · GitHub

File tree Expand file treeCollapse file tree 72 files changed

+296

-215

lines changed

Filter options

Expand file treeCollapse file tree 72 files changed

+296

-215

lines changed Original file line number Diff line number Diff line change


 @@ -309,24 +309,24 @@ tasks:

309 309


 i18n:update:

310 310


 desc: Updates i18n files

311 311


 cmds:

312

-
 - go run ./internal/i18n/cmd/main.go catalog generate . > ./internal/i18n/data/en.po

312

+
 - go run ./internal/locales/cmd/main.go catalog generate . > ./internal/locales/data/en.po

313 313 314 314


 i18n:pull:

315 315


 desc: Pull i18n files from transifex

316 316


 cmds:

317

-
 - go run ./internal/i18n/cmd/main.go transifex pull ./internal/i18n/data

317

+
 - go run ./internal/locales/cmd/main.go transifex pull ./internal/locales/data

318 318 319 319


 i18n:push:

320 320


 desc: Push i18n files to transifex

321 321


 cmds:

322

-
 - go run ./internal/i18n/cmd/main.go transifex push ./internal/i18n/data

322

+
 - go run ./internal/locales/cmd/main.go transifex push ./internal/locales/data

323 323 324 324


 i18n:check:

325 325


 desc: Check if the i18n message catalog was updated

326 326


 cmds:

327 327


 - task: i18n:pull

328

-
 - git add -N ./internal/i18n/data

329

-
 - git diff --exit-code ./internal/i18n/data

328

+
 - git add -N ./internal/locales/data

329

+
 - git diff --exit-code ./internal/locales/data

330 330 331 331


 # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-mkdocs-task/Taskfile.yml

332 332


 website:check:

Original file line number Diff line number Diff line change


 @@ -38,6 +38,7 @@ import (

38 38


 "github.com/arduino/arduino-cli/internal/arduino/sketch"

39 39


 "github.com/arduino/arduino-cli/internal/arduino/utils"

40 40


 "github.com/arduino/arduino-cli/internal/i18n"

41

+
 "github.com/arduino/arduino-cli/internal/locales"

41 42


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

42 43


 paths "github.com/arduino/go-paths-helper"

43 44


 "github.com/sirupsen/logrus"


 @@ -420,7 +421,7 @@ func (s *arduinoCoreServerImpl) Init(req *rpc.InitRequest, stream rpc.ArduinoCor

420 421


 // language of the CLI if the locale is different

421 422


 // after started.

422 423


 if locale, ok, _ := s.settings.GetStringOk("locale"); ok {

423

-
 i18n.Init(locale)

424

+
 locales.Init(locale)

424 425

425 426 426 427


 return nil

Original file line number Diff line number Diff line change


 @@ -20,8 +20,8 @@ import (

20 20 21 21


 "github.com/arduino/arduino-cli/commands/cmderrors"

22 22


 "github.com/arduino/arduino-cli/commands/internal/instances"

23

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

24 23


 "github.com/arduino/arduino-cli/internal/arduino/utils"

24

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

25 25


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

26 26

27 27


 @@ -34,7 +34,7 @@ func (s *arduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.Board

34 34

35 35


 defer release()

36 36 37

-
 fqbn, err := cores.ParseFQBN(req.GetFqbn())

37

+
 fqbn, err := fqbn.Parse(req.GetFqbn())

38 38


 if err != nil {

39 39


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

40 40


 @@ -48,7 +48,7 @@ func (s *arduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.Board

48 48


 details.Name = board.Name()

49 49


 details.Fqbn = board.FQBN()

50 50


 details.PropertiesId = board.BoardID

51

-
 details.Official = fqbn.Package == "arduino"

51

+
 details.Official = fqbn.Packager == "arduino"

52 52


 details.Version = board.PlatformRelease.Version.String()

53 53


 details.IdentificationProperties = []*rpc.BoardIdentificationProperties{}

54 54


 for _, p := range board.GetIdentificationProperties() {

Original file line number Diff line number Diff line change


 @@ -30,11 +30,11 @@ import (

30 30


 "github.com/arduino/arduino-cli/commands/cmderrors"

31 31


 "github.com/arduino/arduino-cli/commands/internal/instances"

32 32


 f "github.com/arduino/arduino-cli/internal/algorithms"

33

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

34 33


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

35 34


 "github.com/arduino/arduino-cli/internal/cli/configuration"

36 35


 "github.com/arduino/arduino-cli/internal/i18n"

37 36


 "github.com/arduino/arduino-cli/internal/inventory"

37

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

38 38


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

39 39


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

40 40


 discovery "github.com/arduino/pluggable-discovery-protocol-handler/v2"


 @@ -148,7 +148,7 @@ func identify(pme *packagemanager.Explorer, port *discovery.Port, settings *conf

148 148


 // first query installed cores through the Package Manager

149 149


 logrus.Debug("Querying installed cores for board identification...")

150 150


 for _, board := range pme.IdentifyBoard(port.Properties) {

151

-
 fqbn, err := cores.ParseFQBN(board.FQBN())

151

+
 fqbn, err := fqbn.Parse(board.FQBN())

152 152


 if err != nil {

153 153


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

154 154


 @@ -210,10 +210,10 @@ func (s *arduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardLis

210 210

211 211


 defer release()

212 212 213

-
 var fqbnFilter *cores.FQBN

213

+
 var fqbnFilter *fqbn.FQBN

214 214


 if f := req.GetFqbn(); f != "" {

215 215


 var err error

216

-
 fqbnFilter, err = cores.ParseFQBN(f)

216

+
 fqbnFilter, err = fqbn.Parse(f)

217 217


 if err != nil {

218 218


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

219 219


 @@ -247,9 +247,9 @@ func (s *arduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardLis

247 247


 }, nil

248 248

249 249 250

-
 func hasMatchingBoard(b *rpc.DetectedPort, fqbnFilter *cores.FQBN) bool {

250

+
 func hasMatchingBoard(b *rpc.DetectedPort, fqbnFilter *fqbn.FQBN) bool {

251 251


 for _, detectedBoard := range b.GetMatchingBoards() {

252

-
 detectedFqbn, err := cores.ParseFQBN(detectedBoard.GetFqbn())

252

+
 detectedFqbn, err := fqbn.Parse(detectedBoard.GetFqbn())

253 253


 if err != nil {

254 254


 continue

255 255

Original file line number Diff line number Diff line change


 @@ -28,13 +28,13 @@ import (

28 28


 "github.com/arduino/arduino-cli/commands/cmderrors"

29 29


 "github.com/arduino/arduino-cli/commands/internal/instances"

30 30


 "github.com/arduino/arduino-cli/internal/arduino/builder"

31

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

32 31


 "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"

33 32


 "github.com/arduino/arduino-cli/internal/arduino/sketch"

34 33


 "github.com/arduino/arduino-cli/internal/arduino/utils"

35 34


 "github.com/arduino/arduino-cli/internal/buildcache"

36 35


 "github.com/arduino/arduino-cli/internal/i18n"

37 36


 "github.com/arduino/arduino-cli/internal/inventory"

37

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

38 38


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

39 39


 paths "github.com/arduino/go-paths-helper"

40 40


 "github.com/sirupsen/logrus"


 @@ -116,15 +116,15 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu

116 116


 return &cmderrors.MissingFQBNError{}

117 117

118 118 119

-
 fqbn, err := cores.ParseFQBN(fqbnIn)

119

+
 fqbn, err := fqbn.Parse(fqbnIn)

120 120


 if err != nil {

121 121


 return &cmderrors.InvalidFQBNError{Cause: err}

122 122

123 123


 _, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)

124 124


 if err != nil {

125 125


 if targetPlatform == nil {

126 126


 return &cmderrors.PlatformNotFoundError{

127

-
 Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch),

127

+
 Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),

128 128


 Cause: errors.New(i18n.Tr("platform not installed")),

129 129

130 130

Original file line number Diff line number Diff line change


 @@ -27,10 +27,10 @@ import (

27 27 28 28


 "github.com/arduino/arduino-cli/commands/cmderrors"

29 29


 "github.com/arduino/arduino-cli/commands/internal/instances"

30

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

31 30


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

32 31


 "github.com/arduino/arduino-cli/internal/arduino/sketch"

33 32


 "github.com/arduino/arduino-cli/internal/i18n"

33

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

34 34


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

35 35


 "github.com/arduino/go-paths-helper"

36 36


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


 @@ -76,7 +76,7 @@ func (s *arduinoCoreServerImpl) IsDebugSupported(ctx context.Context, req *rpc.I

76 76 77 77


 // Compute the minimum FQBN required to get the same debug configuration.

78 78


 // (i.e. the FQBN cleaned up of the options that do not affect the debugger configuration)

79

-
 minimumFQBN := cores.MustParseFQBN(req.GetFqbn())

79

+
 minimumFQBN := fqbn.MustParse(req.GetFqbn())

80 80


 for _, config := range minimumFQBN.Configs.Keys() {

81 81


 checkFQBN := minimumFQBN.Clone()

82 82


 checkFQBN.Configs.Remove(config)


 @@ -127,7 +127,7 @@ func (s *arduinoCoreServerImpl) getDebugProperties(req *rpc.GetDebugConfigReques

127 127


 if fqbnIn == "" {

128 128


 return nil, &cmderrors.MissingFQBNError{}

129 129

130

-
 fqbn, err := cores.ParseFQBN(fqbnIn)

130

+
 fqbn, err := fqbn.Parse(fqbnIn)

131 131


 if err != nil {

132 132


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

133 133

Original file line number Diff line number Diff line change


 @@ -21,12 +21,12 @@ import (

21 21 22 22


 "github.com/arduino/arduino-cli/commands/cmderrors"

23 23


 "github.com/arduino/arduino-cli/commands/internal/instances"

24

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

25 24


 "github.com/arduino/arduino-cli/internal/arduino/libraries"

26 25


 "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"

27 26


 "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"

28 27


 "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesresolver"

29 28


 "github.com/arduino/arduino-cli/internal/i18n"

29

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

30 30


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

31 31

32 32


 @@ -59,7 +59,7 @@ func (s *arduinoCoreServerImpl) LibraryList(ctx context.Context, req *rpc.Librar

59 59


 var allLibs []*installedLib

60 60


 if fqbnString := req.GetFqbn(); fqbnString != "" {

61 61


 allLibs = listLibraries(lme, li, req.GetUpdatable(), true)

62

-
 fqbn, err := cores.ParseFQBN(req.GetFqbn())

62

+
 fqbn, err := fqbn.Parse(req.GetFqbn())

63 63


 if err != nil {

64 64


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

65 65


 @@ -77,8 +77,8 @@ func (s *arduinoCoreServerImpl) LibraryList(ctx context.Context, req *rpc.Librar

77 77

78 78

79 79


 if latest, has := filteredRes[lib.Library.Name]; has {

80

-
 latestPriority := librariesresolver.ComputePriority(latest.Library, "", fqbn.PlatformArch)

81

-
 libPriority := librariesresolver.ComputePriority(lib.Library, "", fqbn.PlatformArch)

80

+
 latestPriority := librariesresolver.ComputePriority(latest.Library, "", fqbn.Architecture)

81

+
 libPriority := librariesresolver.ComputePriority(lib.Library, "", fqbn.Architecture)

82 82


 if latestPriority >= libPriority {

83 83


 // Pick library with the best priority

84 84


 continue


 @@ -87,7 +87,7 @@ func (s *arduinoCoreServerImpl) LibraryList(ctx context.Context, req *rpc.Librar

87 87 88 88


 // Check if library is compatible with board specified by FBQN

89 89


 lib.Library.CompatibleWith = map[string]bool{

90

-
 fqbnString: lib.Library.IsCompatibleWith(fqbn.PlatformArch),

90

+
 fqbnString: lib.Library.IsCompatibleWith(fqbn.Architecture),

91 91

92 92 93 93


 filteredRes[lib.Library.Name] = lib

Original file line number Diff line number Diff line change


 @@ -28,6 +28,7 @@ import (

28 28


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

29 29


 pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor"

30 30


 "github.com/arduino/arduino-cli/internal/i18n"

31

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

31 32


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

32 33


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

33 34


 "github.com/djherbis/buffer"


 @@ -237,7 +238,7 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer

237 238


 return nil

238 239

239 240 240

-
 func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, protocol, fqbn string) (*pluggableMonitor.PluggableMonitor, *properties.Map, error) {

241

+
 func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, protocol, fqbnIn string) (*pluggableMonitor.PluggableMonitor, *properties.Map, error) {

241 242


 if protocol == "" {

242 243


 return nil, nil, &cmderrors.MissingPortProtocolError{}

243 244


 @@ -246,8 +247,8 @@ func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, pro

246 247


 boardSettings := properties.NewMap()

247 248 248 249


 // If a board is specified search the monitor in the board package first

249

-
 if fqbn != "" {

250

-
 fqbn, err := cores.ParseFQBN(fqbn)

250

+
 if fqbnIn != "" {

251

+
 fqbn, err := fqbn.Parse(fqbnIn)

251 252


 if err != nil {

252 253


 return nil, nil, &cmderrors.InvalidFQBNError{Cause: err}

253 254

Original file line number Diff line number Diff line change


 @@ -32,6 +32,7 @@ import (

32 32


 "github.com/arduino/arduino-cli/internal/arduino/globals"

33 33


 "github.com/arduino/arduino-cli/internal/arduino/sketch"

34 34


 "github.com/arduino/arduino-cli/internal/i18n"

35

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

35 36


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

36 37


 paths "github.com/arduino/go-paths-helper"

37 38


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


 @@ -53,15 +54,15 @@ func (s *arduinoCoreServerImpl) SupportedUserFields(ctx context.Context, req *rp

53 54

54 55


 defer release()

55 56 56

-
 fqbn, err := cores.ParseFQBN(req.GetFqbn())

57

+
 fqbn, err := fqbn.Parse(req.GetFqbn())

57 58


 if err != nil {

58 59


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

59 60

60 61 61 62


 _, platformRelease, _, boardProperties, _, err := pme.ResolveFQBN(fqbn)

62 63


 if platformRelease == nil {

63 64


 return nil, &cmderrors.PlatformNotFoundError{

64

-
 Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch),

65

+
 Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),

65 66


 Cause: err,

66 67

67 68


 } else if err != nil {


 @@ -282,7 +283,7 @@ func (s *arduinoCoreServerImpl) runProgramAction(ctx context.Context, pme *packa

282 283


 return nil, &cmderrors.MissingProgrammerError{}

283 284

284 285 285

-
 fqbn, err := cores.ParseFQBN(fqbnIn)

286

+
 fqbn, err := fqbn.Parse(fqbnIn)

286 287


 if err != nil {

287 288


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

288 289


 @@ -292,7 +293,7 @@ func (s *arduinoCoreServerImpl) runProgramAction(ctx context.Context, pme *packa

292 293


 _, boardPlatform, board, boardProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)

293 294


 if boardPlatform == nil {

294 295


 return nil, &cmderrors.PlatformNotFoundError{

295

-
 Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch),

296

+
 Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),

296 297


 Cause: err,

297 298

298 299


 } else if err != nil {

Original file line number Diff line number Diff line change


 @@ -21,6 +21,7 @@ import (

21 21


 "github.com/arduino/arduino-cli/commands/cmderrors"

22 22


 "github.com/arduino/arduino-cli/commands/internal/instances"

23 23


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

24

+
 "github.com/arduino/arduino-cli/pkg/fqbn"

24 25


 rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"

25 26

26 27


 @@ -36,7 +37,7 @@ func (s *arduinoCoreServerImpl) ListProgrammersAvailableForUpload(ctx context.Co

36 37


 if fqbnIn == "" {

37 38


 return nil, &cmderrors.MissingFQBNError{}

38 39

39

-
 fqbn, err := cores.ParseFQBN(fqbnIn)

40

+
 fqbn, err := fqbn.Parse(fqbnIn)

40 41


 if err != nil {

41 42


 return nil, &cmderrors.InvalidFQBNError{Cause: err}

42 43

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4