Skip to content

Commit 88e0ad6

Browse files
committed
Changed some packageindex structs visibility
1 parent 7e059cf commit 88e0ad6

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

arduino/cores/packageindex/index.go

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ import (
3030

3131
// Index represents Cores and Tools struct as seen from package_index.json file.
3232
type Index struct {
33-
Packages []*indexPackage `json:"packages"`
33+
Packages []*IndexPackage `json:"packages"`
3434
IsTrusted bool
3535
}
3636

37-
// indexPackage represents a single entry from package_index.json file.
38-
type indexPackage struct {
37+
// IndexPackage represents a single entry from package_index.json file.
38+
type IndexPackage struct {
3939
Name string `json:"name,required"`
4040
Maintainer string `json:"maintainer,required"`
4141
WebsiteURL string `json:"websiteUrl"`
4242
URL string `json:"Url"`
4343
Email string `json:"email"`
44-
Platforms []*indexPlatformRelease `json:"platforms,required"`
45-
Tools []*indexToolRelease `json:"tools,required"`
46-
Help indexHelp `json:"help,omitempty"`
44+
Platforms []*IndexPlatformRelease `json:"platforms,required"`
45+
Tools []*IndexToolRelease `json:"tools,required"`
46+
Help IndexHelp `json:"help,omitempty"`
4747
}
4848

49-
// indexPlatformRelease represents a single Core Platform from package_index.json file.
50-
type indexPlatformRelease struct {
49+
// IndexPlatformRelease represents a single Core Platform from package_index.json file.
50+
type IndexPlatformRelease struct {
5151
Name string `json:"name,required"`
5252
Architecture string `json:"architecture"`
5353
Version *semver.Version `json:"version,required"`
@@ -56,45 +56,46 @@ type indexPlatformRelease struct {
5656
ArchiveFileName string `json:"archiveFileName,required"`
5757
Checksum string `json:"checksum,required"`
5858
Size json.Number `json:"size,required"`
59-
Boards []indexBoard `json:"boards"`
60-
Help indexHelp `json:"help,omitempty"`
61-
ToolDependencies []indexToolDependency `json:"toolsDependencies,required"`
59+
Boards []IndexBoard `json:"boards"`
60+
Help IndexHelp `json:"help,omitempty"`
61+
ToolDependencies []IndexToolDependency `json:"toolsDependencies,required"`
6262
}
6363

64-
// indexToolDependency represents a single dependency of a core from a tool.
65-
type indexToolDependency struct {
64+
// IndexToolDependency represents a single dependency of a core from a tool.
65+
type IndexToolDependency struct {
6666
Packager string `json:"packager,required"`
6767
Name string `json:"name,required"`
6868
Version *semver.RelaxedVersion `json:"version,required"`
6969
}
7070

71-
// indexToolRelease represents a single Tool from package_index.json file.
72-
type indexToolRelease struct {
71+
// IndexToolRelease represents a single Tool from package_index.json file.
72+
type IndexToolRelease struct {
7373
Name string `json:"name,required"`
7474
Version *semver.RelaxedVersion `json:"version,required"`
75-
Systems []indexToolReleaseFlavour `json:"systems,required"`
75+
Systems []IndexToolReleaseFlavour `json:"systems,required"`
7676
}
7777

78-
// indexToolReleaseFlavour represents a single tool flavor in the package_index.json file.
79-
type indexToolReleaseFlavour struct {
78+
// IndexToolReleaseFlavour represents a single tool flavor in the package_index.json file.
79+
type IndexToolReleaseFlavour struct {
8080
OS string `json:"host,required"`
8181
URL string `json:"url,required"`
8282
ArchiveFileName string `json:"archiveFileName,required"`
8383
Size json.Number `json:"size,required"`
8484
Checksum string `json:"checksum,required"`
8585
}
8686

87-
// indexBoard represents a single Board as written in package_index.json file.
88-
type indexBoard struct {
87+
// IndexBoard represents a single Board as written in package_index.json file.
88+
type IndexBoard struct {
8989
Name string `json:"name"`
90-
ID []indexBoardID `json:"id"`
90+
ID []indexBoardID `json:"id,omitempty"`
9191
}
9292

9393
type indexBoardID struct {
9494
USB string `json:"usb"`
9595
}
9696

97-
type indexHelp struct {
97+
// IndexHelp represents the help URL
98+
type IndexHelp struct {
9899
Online string `json:"online,omitempty"`
99100
}
100101

@@ -106,7 +107,7 @@ func (index Index) MergeIntoPackages(outPackages cores.Packages) {
106107
}
107108
}
108109

109-
func (inPackage indexPackage) extractPackageIn(outPackages cores.Packages, trusted bool) {
110+
func (inPackage IndexPackage) extractPackageIn(outPackages cores.Packages, trusted bool) {
110111
outPackage := outPackages.GetOrCreatePackage(inPackage.Name)
111112
outPackage.Maintainer = inPackage.Maintainer
112113
outPackage.WebsiteURL = inPackage.WebsiteURL
@@ -123,7 +124,7 @@ func (inPackage indexPackage) extractPackageIn(outPackages cores.Packages, trust
123124
}
124125
}
125126

126-
func (inPlatformRelease indexPlatformRelease) extractPlatformIn(outPackage *cores.Package, trusted bool) error {
127+
func (inPlatformRelease IndexPlatformRelease) extractPlatformIn(outPackage *cores.Package, trusted bool) error {
127128
outPlatform := outPackage.GetOrCreatePlatform(inPlatformRelease.Architecture)
128129
// FIXME: shall we use the Name and Category of the latest release? or maybe move Name and Category in PlatformRelease?
129130
outPlatform.Name = inPlatformRelease.Name
@@ -164,7 +165,7 @@ func (inPlatformRelease indexPlatformRelease) extractPlatformIn(outPackage *core
164165
return nil
165166
}
166167

167-
func (inPlatformRelease indexPlatformRelease) extractDeps() (cores.ToolDependencies, error) {
168+
func (inPlatformRelease IndexPlatformRelease) extractDeps() (cores.ToolDependencies, error) {
168169
ret := make(cores.ToolDependencies, len(inPlatformRelease.ToolDependencies))
169170
for i, dep := range inPlatformRelease.ToolDependencies {
170171
ret[i] = &cores.ToolDependency{
@@ -176,7 +177,7 @@ func (inPlatformRelease indexPlatformRelease) extractDeps() (cores.ToolDependenc
176177
return ret, nil
177178
}
178179

179-
func (inPlatformRelease indexPlatformRelease) extractBoardsManifest() []*cores.BoardManifest {
180+
func (inPlatformRelease IndexPlatformRelease) extractBoardsManifest() []*cores.BoardManifest {
180181
boards := make([]*cores.BoardManifest, len(inPlatformRelease.Boards))
181182
for i, board := range inPlatformRelease.Boards {
182183
manifest := &cores.BoardManifest{Name: board.Name}
@@ -190,15 +191,15 @@ func (inPlatformRelease indexPlatformRelease) extractBoardsManifest() []*cores.B
190191
return boards
191192
}
192193

193-
func (inToolRelease indexToolRelease) extractToolIn(outPackage *cores.Package) {
194+
func (inToolRelease IndexToolRelease) extractToolIn(outPackage *cores.Package) {
194195
outTool := outPackage.GetOrCreateTool(inToolRelease.Name)
195196

196197
outToolRelease := outTool.GetOrCreateRelease(inToolRelease.Version)
197198
outToolRelease.Flavors = inToolRelease.extractFlavours()
198199
}
199200

200-
// extractFlavours extracts a map[OS]Flavor object from an indexToolRelease entry.
201-
func (inToolRelease indexToolRelease) extractFlavours() []*cores.Flavor {
201+
// extractFlavours extracts a map[OS]Flavor object from an IndexToolRelease entry.
202+
func (inToolRelease IndexToolRelease) extractFlavours() []*cores.Flavor {
202203
ret := make([]*cores.Flavor, len(inToolRelease.Systems))
203204
for i, flavour := range inToolRelease.Systems {
204205
size, _ := flavour.Size.Int64()

0 commit comments

Comments
 (0)