Skip to content

Commit 63289ba

Browse files
cmagliecmaglie
authored
[skip-changelog] Small cosmetic fix (#1105)
* Removed unused return error in cores.Platform.GetOrCreateRelease * cosmetic: renamed variables in commands/bundled_tools_serial_discovery.go * fixed typo * Renamed mutex -> listBoardMutex
1 parent 0ccf27f commit 63289ba

File tree

5 files changed

+31
-39
lines changed

5 files changed

+31
-39
lines changed

‎arduino/cores/cores.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ func (dep *ToolDependency) String() string {
112112

113113
// GetOrCreateRelease returns the specified release corresponding the provided version,
114114
// or creates a new one if not found.
115-
func (platform *Platform) GetOrCreateRelease(version *semver.Version) (*PlatformRelease, error) {
115+
func (platform *Platform) GetOrCreateRelease(version *semver.Version) *PlatformRelease {
116116
tag := ""
117117
if version != nil {
118118
tag = version.String()
119119
}
120120
if release, ok := platform.Releases[tag]; ok {
121-
return release, nil
121+
return release
122122
}
123123
release := &PlatformRelease{
124124
Version: version,
@@ -128,7 +128,7 @@ func (platform *Platform) GetOrCreateRelease(version *semver.Version) (*Platform
128128
Platform: platform,
129129
}
130130
platform.Releases[tag] = release
131-
return release, nil
131+
return release
132132
}
133133

134134
// FindReleaseWithVersion returns the specified release corresponding the provided version,

‎arduino/cores/packageindex/index.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,7 @@ func (inPlatformRelease indexPlatformRelease) extractPlatformIn(outPackage *core
210210
if err != nil {
211211
return fmt.Errorf("invalid platform archive size: %s", err)
212212
}
213-
outPlatformRelease, err := outPlatform.GetOrCreateRelease(inPlatformRelease.Version)
214-
if err != nil {
215-
return fmt.Errorf("creating release: %s", err)
216-
}
213+
outPlatformRelease := outPlatform.GetOrCreateRelease(inPlatformRelease.Version)
217214
outPlatformRelease.IsTrusted = trusted
218215
outPlatformRelease.Resource = &resources.DownloadResource{
219216
ArchiveFileName: inPlatformRelease.ArchiveFileName,

‎arduino/cores/packagemanager/loader.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
210210
}
211211

212212
platform := targetPackage.GetOrCreatePlatform(architecture)
213-
release, err := platform.GetOrCreateRelease(version)
214-
if err != nil {
215-
return fmt.Errorf("loading platform release: %s", err)
216-
}
213+
release := platform.GetOrCreateRelease(version)
217214
release.IsIDEBundled = isIDEBundled
218215
if isIDEBundled {
219216
pm.Log.Infof("Package is built-in")
@@ -246,10 +243,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
246243
if err != nil {
247244
return fmt.Errorf("invalid version dir %s: %s", versionDir, err)
248245
}
249-
release, err := platform.GetOrCreateRelease(version)
250-
if err != nil {
251-
return fmt.Errorf("loading platform release %s: %s", versionDir, err)
252-
}
246+
release := platform.GetOrCreateRelease(version)
253247
if err := pm.loadPlatformRelease(release, versionDir); err != nil {
254248
return fmt.Errorf("loading platform release %s: %s", versionDir, err)
255249
}

‎commands/bundled_tools_serial_discovery.go

+24-23
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ import (
3232
)
3333

3434
var (
35-
mutex = sync.Mutex{}
36-
sdVersion = semver.ParseRelaxed("1.1.0")
37-
flavors = []*cores.Flavor{
35+
serialDiscoveryVersion = semver.ParseRelaxed("1.1.0")
36+
serialDiscoveryFlavors = []*cores.Flavor{
3837
{
3938
OS: "i686-pc-linux-gnu",
4039
Resource: &resources.DownloadResource{
41-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_32bit.tar.bz2", sdVersion),
42-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_32bit.tar.bz2", sdVersion),
40+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_32bit.tar.bz2", serialDiscoveryVersion),
41+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_32bit.tar.bz2", serialDiscoveryVersion),
4342
Size: 1589443,
4443
Checksum: "SHA-256:e60fa16da2735f80410c636234a405bd1cc9306090cab4e312c4189e38f93f72",
4544
CachePath: "tools",
@@ -48,8 +47,8 @@ var (
4847
{
4948
OS: "x86_64-pc-linux-gnu",
5049
Resource: &resources.DownloadResource{
51-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_64bit.tar.bz2", sdVersion),
52-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_64bit.tar.bz2", sdVersion),
50+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_64bit.tar.bz2", serialDiscoveryVersion),
51+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_64bit.tar.bz2", serialDiscoveryVersion),
5352
Size: 1611875,
5453
Checksum: "SHA-256:6232f852543094e9f73e1994e6888646fdcd24eca15fd4e5bde716a8e23046dc",
5554
CachePath: "tools",
@@ -58,8 +57,8 @@ var (
5857
{
5958
OS: "i686-mingw32",
6059
Resource: &resources.DownloadResource{
61-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Windows_32bit.zip", sdVersion),
62-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Windows_32bit.zip", sdVersion),
60+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Windows_32bit.zip", serialDiscoveryVersion),
61+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Windows_32bit.zip", serialDiscoveryVersion),
6362
Size: 1719070,
6463
Checksum: "SHA-256:3efdc744a0ca11c5f9088525eb4363e90e2b6a43a0db23c5c6975a10d739c7cb",
6564
CachePath: "tools",
@@ -68,8 +67,8 @@ var (
6867
{
6968
OS: "x86_64-mingw32",
7069
Resource: &resources.DownloadResource{
71-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Windows_64bit.zip", sdVersion),
72-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Windows_64bit.zip", sdVersion),
70+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Windows_64bit.zip", serialDiscoveryVersion),
71+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Windows_64bit.zip", serialDiscoveryVersion),
7372
Size: 1683799,
7473
Checksum: "SHA-256:c6296b92459160f4c0bf7d2e1234cd53fd64f44cb3fa8c3a4b10dd6670466c69",
7574
CachePath: "tools",
@@ -78,8 +77,8 @@ var (
7877
{
7978
OS: "x86_64-apple-darwin",
8079
Resource: &resources.DownloadResource{
81-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_macOS_64bit.tar.bz2", sdVersion),
82-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_macOS_64bit.tar.bz2", sdVersion),
80+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_macOS_64bit.tar.bz2", serialDiscoveryVersion),
81+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_macOS_64bit.tar.bz2", serialDiscoveryVersion),
8382
Size: 1620346,
8483
Checksum: "SHA-256:4052a64dd68090726247dea7f03656eae951549df9878362dcedfcef116a9e9f",
8584
CachePath: "tools",
@@ -88,8 +87,8 @@ var (
8887
{
8988
OS: "arm-linux-gnueabihf",
9089
Resource: &resources.DownloadResource{
91-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_ARM.tar.bz2", sdVersion),
92-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_ARM.tar.bz2", sdVersion),
90+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_ARM.tar.bz2", serialDiscoveryVersion),
91+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_ARM.tar.bz2", serialDiscoveryVersion),
9392
Size: 1511104,
9493
Checksum: "SHA-256:fe68fd5abdfebe0f01c48c3eac16d27af46ec2391da87de44571e6ea2dab31e7",
9594
CachePath: "tools",
@@ -98,8 +97,8 @@ var (
9897
{
9998
OS: "arm64-linux-gnueabihf",
10099
Resource: &resources.DownloadResource{
101-
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_ARM64.tar.bz2", sdVersion),
102-
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_ARM64.tar.bz2", sdVersion),
100+
ArchiveFileName: fmt.Sprintf("serial-discovery_v%s_Linux_ARM64.tar.bz2", serialDiscoveryVersion),
101+
URL: fmt.Sprintf("https://downloads.arduino.cc/tools/serial-discovery_v%s_Linux_ARM64.tar.bz2", serialDiscoveryVersion),
103102
Size: 1500998,
104103
Checksum: "SHA-256:1e6bcb6b7790d38863df15395c96baba239cb56233d7ef2d78bcb2b3efb1bc5d",
105104
CachePath: "tools",
@@ -123,12 +122,14 @@ type eventJSON struct {
123122
Ports []*BoardPort `json:"ports"`
124123
}
125124

125+
var listBoardMutex sync.Mutex
126+
126127
// ListBoards foo
127128
func ListBoards(pm *packagemanager.PackageManager) ([]*BoardPort, error) {
128129
// ensure the connection to the discoverer is unique to avoid messing up
129130
// the messages exchanged
130-
mutex.Lock()
131-
defer mutex.Unlock()
131+
listBoardMutex.Lock()
132+
defer listBoardMutex.Unlock()
132133

133134
// get the bundled tool
134135
t, err := getBuiltinSerialDiscoveryTool(pm)
@@ -233,8 +234,8 @@ func WatchListBoards(pm *packagemanager.PackageManager) (<-chan *discovery.Event
233234

234235
func getBuiltinSerialDiscoveryTool(pm *packagemanager.PackageManager) (*cores.ToolRelease, error) {
235236
builtinPackage := pm.Packages.GetOrCreatePackage("builtin")
236-
ctagsTool := builtinPackage.GetOrCreateTool("serial-discovery")
237-
ctagsRel := ctagsTool.GetOrCreateRelease(sdVersion)
238-
ctagsRel.Flavors = flavors
239-
return pm.Package("builtin").Tool("serial-discovery").Release(sdVersion).Get()
237+
serialDiscoveryTool := builtinPackage.GetOrCreateTool("serial-discovery")
238+
serialDiscoveryToolRel := serialDiscoveryTool.GetOrCreateRelease(serialDiscoveryVersion)
239+
serialDiscoveryToolRel.Flavors = serialDiscoveryFlavors
240+
return pm.Package("builtin").Tool("serial-discovery").Release(serialDiscoveryVersion).Get()
240241
}

‎commands/instances.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (instance *CoreInstance) checkForBuiltinTools(downloadCB DownloadProgressCB
115115
return err
116116
}
117117

118-
// Check for bultin serial-discovery tool
118+
// Check for builtin serial-discovery tool
119119
serialDiscoveryTool, _ := getBuiltinSerialDiscoveryTool(instance.PackageManager)
120120
serialDiscoveryInstalled, err := instance.installToolIfMissing(serialDiscoveryTool, downloadCB, taskCB)
121121
if err != nil {

0 commit comments

Comments
 (0)