Skip to content

Commit f92e2f6

Browse files
cmagliecmaglie
authored
Merge pull request #25 from arduino/linter_fix
Apply some go lint fixes
2 parents 3269d18 + 60684f0 commit f92e2f6

File tree

1 file changed

+133
-133
lines changed

1 file changed

+133
-133
lines changed

‎properties.go

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@ This library is mainly used in the Arduino platform software to handle
3333
configurations made of key/value pairs stored in files with an INI like
3434
syntax, for example:
3535
36-
...
37-
uno.name=Arduino/Genuino Uno
38-
uno.upload.tool=avrdude
39-
uno.upload.protocol=arduino
40-
uno.upload.maximum_size=32256
41-
uno.upload.maximum_data_size=2048
42-
uno.upload.speed=115200
43-
uno.build.mcu=atmega328p
44-
uno.build.f_cpu=16000000L
45-
uno.build.board=AVR_UNO
46-
uno.build.core=arduino
47-
uno.build.variant=standard
48-
diecimila.name=Arduino Duemilanove or Diecimila
49-
diecimila.upload.tool=avrdude
50-
diecimila.upload.protocol=arduino
51-
diecimila.build.f_cpu=16000000L
52-
diecimila.build.board=AVR_DUEMILANOVE
53-
diecimila.build.core=arduino
54-
diecimila.build.variant=standard
55-
...
36+
...
37+
uno.name=Arduino/Genuino Uno
38+
uno.upload.tool=avrdude
39+
uno.upload.protocol=arduino
40+
uno.upload.maximum_size=32256
41+
uno.upload.maximum_data_size=2048
42+
uno.upload.speed=115200
43+
uno.build.mcu=atmega328p
44+
uno.build.f_cpu=16000000L
45+
uno.build.board=AVR_UNO
46+
uno.build.core=arduino
47+
uno.build.variant=standard
48+
diecimila.name=Arduino Duemilanove or Diecimila
49+
diecimila.upload.tool=avrdude
50+
diecimila.upload.protocol=arduino
51+
diecimila.build.f_cpu=16000000L
52+
diecimila.build.board=AVR_DUEMILANOVE
53+
diecimila.build.core=arduino
54+
diecimila.build.variant=standard
55+
...
5656
5757
This library has methods to parse this kind of file into a Map object.
5858
@@ -139,7 +139,7 @@ func LoadFromBytes(bytes []byte) (*Map, error) {
139139

140140
for lineNum, line := range strings.Split(text, "\n") {
141141
if err := properties.parseLine(line); err != nil {
142-
return nil, fmt.Errorf("Error parsing data at line %d: %s", lineNum, err)
142+
return nil, fmt.Errorf("error parsing data at line %d: %s", lineNum, err)
143143
}
144144
}
145145

@@ -150,12 +150,12 @@ func LoadFromBytes(bytes []byte) (*Map, error) {
150150
func Load(filepath string) (*Map, error) {
151151
bytes, err := ioutil.ReadFile(filepath)
152152
if err != nil {
153-
return nil, fmt.Errorf("Error reading file: %s", err)
153+
return nil, fmt.Errorf("error reading file: %s", err)
154154
}
155155

156156
res, err := LoadFromBytes(bytes)
157157
if err != nil {
158-
return nil, fmt.Errorf("Error reading file: %s", err)
158+
return nil, fmt.Errorf("error reading file: %s", err)
159159
}
160160
return res, nil
161161
}
@@ -172,7 +172,7 @@ func LoadFromSlice(lines []string) (*Map, error) {
172172

173173
for lineNum, line := range lines {
174174
if err := properties.parseLine(line); err != nil {
175-
return nil, fmt.Errorf("Error reading from slice (index:%d): %s", lineNum, err)
175+
return nil, fmt.Errorf("error reading from slice (index:%d): %s", lineNum, err)
176176
}
177177
}
178178

@@ -189,7 +189,7 @@ func (m *Map) parseLine(line string) error {
189189

190190
lineParts := strings.SplitN(line, "=", 2)
191191
if len(lineParts) != 2 {
192-
return fmt.Errorf("Invalid line format, should be 'key=value'")
192+
return fmt.Errorf("invalid line format, should be 'key=value'")
193193
}
194194
key := strings.TrimSpace(lineParts[0])
195195
value := strings.TrimSpace(lineParts[1])
@@ -277,39 +277,39 @@ func (m *Map) Remove(key string) {
277277
// FirstLevelOf generates a map-of-Maps using the first level of the hierarchy
278278
// of the current Map. For example the following Map:
279279
//
280-
// properties.Map{
281-
// "uno.name": "Arduino/Genuino Uno",
282-
// "uno.upload.tool": "avrdude",
283-
// "uno.upload.protocol": "arduino",
284-
// "uno.upload.maximum_size": "32256",
285-
// "diecimila.name": "Arduino Duemilanove or Diecimila",
286-
// "diecimila.upload.tool": "avrdude",
287-
// "diecimila.upload.protocol": "arduino",
288-
// "diecimila.bootloader.tool": "avrdude",
289-
// "diecimila.bootloader.low_fuses": "0xFF",
290-
// }
280+
// properties.Map{
281+
// "uno.name": "Arduino/Genuino Uno",
282+
// "uno.upload.tool": "avrdude",
283+
// "uno.upload.protocol": "arduino",
284+
// "uno.upload.maximum_size": "32256",
285+
// "diecimila.name": "Arduino Duemilanove or Diecimila",
286+
// "diecimila.upload.tool": "avrdude",
287+
// "diecimila.upload.protocol": "arduino",
288+
// "diecimila.bootloader.tool": "avrdude",
289+
// "diecimila.bootloader.low_fuses": "0xFF",
290+
// }
291291
//
292292
// is transformed into the following map-of-Maps:
293293
//
294-
// map[string]Map{
295-
// "uno" : properties.Map{
296-
// "name": "Arduino/Genuino Uno",
297-
// "upload.tool": "avrdude",
298-
// "upload.protocol": "arduino",
299-
// "upload.maximum_size": "32256",
300-
// },
301-
// "diecimila" : properties.Map{
302-
// "name": "Arduino Duemilanove or Diecimila",
303-
// "upload.tool": "avrdude",
304-
// "upload.protocol": "arduino",
305-
// "bootloader.tool": "avrdude",
306-
// "bootloader.low_fuses": "0xFF",
307-
// }
308-
// }
294+
// map[string]Map{
295+
// "uno" : properties.Map{
296+
// "name": "Arduino/Genuino Uno",
297+
// "upload.tool": "avrdude",
298+
// "upload.protocol": "arduino",
299+
// "upload.maximum_size": "32256",
300+
// },
301+
// "diecimila" : properties.Map{
302+
// "name": "Arduino Duemilanove or Diecimila",
303+
// "upload.tool": "avrdude",
304+
// "upload.protocol": "arduino",
305+
// "bootloader.tool": "avrdude",
306+
// "bootloader.low_fuses": "0xFF",
307+
// }
308+
// }
309309
func (m *Map) FirstLevelOf() map[string]*Map {
310310
newMap := make(map[string]*Map)
311311
for _, key := range m.o {
312-
if strings.Index(key, ".") == -1 {
312+
if !strings.Contains(key, ".") {
313313
continue
314314
}
315315
keyParts := strings.SplitN(key, ".", 2)
@@ -325,24 +325,24 @@ func (m *Map) FirstLevelOf() map[string]*Map {
325325
// FirstLevelKeys returns the keys in the first level of the hierarchy
326326
// of the current Map. For example the following Map:
327327
//
328-
// properties.Map{
329-
// "uno.name": "Arduino/Genuino Uno",
330-
// "uno.upload.tool": "avrdude",
331-
// "uno.upload.protocol": "arduino",
332-
// "uno.upload.maximum_size": "32256",
333-
// "diecimila.name": "Arduino Duemilanove or Diecimila",
334-
// "diecimila.upload.tool": "avrdude",
335-
// "diecimila.upload.protocol": "arduino",
336-
// "diecimila.bootloader.tool": "avrdude",
337-
// "diecimila.bootloader.low_fuses": "0xFF",
338-
// }
328+
// properties.Map{
329+
// "uno.name": "Arduino/Genuino Uno",
330+
// "uno.upload.tool": "avrdude",
331+
// "uno.upload.protocol": "arduino",
332+
// "uno.upload.maximum_size": "32256",
333+
// "diecimila.name": "Arduino Duemilanove or Diecimila",
334+
// "diecimila.upload.tool": "avrdude",
335+
// "diecimila.upload.protocol": "arduino",
336+
// "diecimila.bootloader.tool": "avrdude",
337+
// "diecimila.bootloader.low_fuses": "0xFF",
338+
// }
339339
//
340340
// will produce the following result:
341341
//
342-
// []string{
343-
// "uno",
344-
// "diecimila",
345-
// }
342+
// []string{
343+
// "uno",
344+
// "diecimila",
345+
// }
346346
//
347347
// the order of the original map is preserved
348348
func (m *Map) FirstLevelKeys() []string {
@@ -363,26 +363,26 @@ func (m *Map) FirstLevelKeys() []string {
363363
// of the keys hierarchy as selector.
364364
// For example the following Map:
365365
//
366-
// properties.Map{
367-
// "uno.name": "Arduino/Genuino Uno",
368-
// "uno.upload.tool": "avrdude",
369-
// "uno.upload.protocol": "arduino",
370-
// "uno.upload.maximum_size": "32256",
371-
// "diecimila.name": "Arduino Duemilanove or Diecimila",
372-
// "diecimila.upload.tool": "avrdude",
373-
// "diecimila.upload.protocol": "arduino",
374-
// "diecimila.bootloader.tool": "avrdude",
375-
// "diecimila.bootloader.low_fuses": "0xFF",
376-
// }
366+
// properties.Map{
367+
// "uno.name": "Arduino/Genuino Uno",
368+
// "uno.upload.tool": "avrdude",
369+
// "uno.upload.protocol": "arduino",
370+
// "uno.upload.maximum_size": "32256",
371+
// "diecimila.name": "Arduino Duemilanove or Diecimila",
372+
// "diecimila.upload.tool": "avrdude",
373+
// "diecimila.upload.protocol": "arduino",
374+
// "diecimila.bootloader.tool": "avrdude",
375+
// "diecimila.bootloader.low_fuses": "0xFF",
376+
// }
377377
//
378378
// after calling SubTree("uno") will be transformed into:
379379
//
380-
// properties.Map{
381-
// "name": "Arduino/Genuino Uno",
382-
// "upload.tool": "avrdude",
383-
// "upload.protocol": "arduino",
384-
// "upload.maximum_size": "32256",
385-
// },
380+
// properties.Map{
381+
// "name": "Arduino/Genuino Uno",
382+
// "upload.tool": "avrdude",
383+
// "upload.protocol": "arduino",
384+
// "upload.maximum_size": "32256",
385+
// },
386386
func (m *Map) SubTree(rootKey string) *Map {
387387
rootKey += "."
388388
newMap := NewMap()
@@ -399,7 +399,7 @@ func (m *Map) SubTree(rootKey string) *Map {
399399
// ExpandPropsInString uses the Map to replace values into a format string.
400400
// The format string should contains markers between braces, for example:
401401
//
402-
// "The selected upload protocol is {upload.protocol}."
402+
// "The selected upload protocol is {upload.protocol}."
403403
//
404404
// Each marker is replaced by the corresponding value of the Map.
405405
// The values in the Map may contain other markers, they are evaluated
@@ -509,58 +509,58 @@ func MergeMapsOfProperties(target map[string]*Map, sources ...map[string]*Map) m
509509
// DeleteUnexpandedPropsFromString removes all the brace markers "{xxx}" that are not expanded
510510
// into a value using the Map.ExpandPropsInString() method.
511511
func DeleteUnexpandedPropsFromString(str string) string {
512-
rxp := regexp.MustCompile("\\{.+?\\}")
512+
rxp := regexp.MustCompile(`\{.+?\}`)
513513
return rxp.ReplaceAllString(str, "")
514514
}
515515

516516
// ExtractSubIndexSets works like SubTree but it considers also the numeric sub index in the form
517517
// `root.N.xxx...` as separate subsets.
518518
// For example the following Map:
519519
//
520-
// properties.Map{
521-
// "uno.upload_port.vid": "0x1000",
522-
// "uno.upload_port.pid": "0x2000",
523-
// "due.upload_port.0.vid": "0x1000",
524-
// "due.upload_port.0.pid": "0x2000",
525-
// "due.upload_port.1.vid": "0x1001",
526-
// "due.upload_port.1.pid": "0x2001",
527-
// "tre.upload_port.1.vid": "0x1001",
528-
// "tre.upload_port.1.pid": "0x2001",
529-
// "tre.upload_port.2.vid": "0x1002",
530-
// "tre.upload_port.2.pid": "0x2002",
531-
// }
520+
// properties.Map{
521+
// "uno.upload_port.vid": "0x1000",
522+
// "uno.upload_port.pid": "0x2000",
523+
// "due.upload_port.0.vid": "0x1000",
524+
// "due.upload_port.0.pid": "0x2000",
525+
// "due.upload_port.1.vid": "0x1001",
526+
// "due.upload_port.1.pid": "0x2001",
527+
// "tre.upload_port.1.vid": "0x1001",
528+
// "tre.upload_port.1.pid": "0x2001",
529+
// "tre.upload_port.2.vid": "0x1002",
530+
// "tre.upload_port.2.pid": "0x2002",
531+
// }
532532
//
533533
// calling ExtractSubIndexSets("uno.upload_port") returns the array:
534534
//
535-
// [ properties.Map{
536-
// "vid": "0x1000",
537-
// "pid": "0x2000",
538-
// },
539-
// ]
535+
// [ properties.Map{
536+
// "vid": "0x1000",
537+
// "pid": "0x2000",
538+
// },
539+
// ]
540540
//
541541
// calling ExtractSubIndexSets("due.upload_port") returns the array:
542542
//
543-
// [ properties.Map{
544-
// "vid": "0x1000",
545-
// "pid": "0x2000",
546-
// },
547-
// properties.Map{
548-
// "vid": "0x1001",
549-
// "pid": "0x2001",
550-
// },
551-
// ]
543+
// [ properties.Map{
544+
// "vid": "0x1000",
545+
// "pid": "0x2000",
546+
// },
547+
// properties.Map{
548+
// "vid": "0x1001",
549+
// "pid": "0x2001",
550+
// },
551+
// ]
552552
//
553553
// the sub-index may start with .1 too, so calling ExtractSubIndexSets("tre.upload_port") returns:
554554
//
555-
// [ properties.Map{
556-
// "vid": "0x1001",
557-
// "pid": "0x2001",
558-
// },
559-
// properties.Map{
560-
// "vid": "0x1002",
561-
// "pid": "0x2002",
562-
// },
563-
// ]
555+
// [ properties.Map{
556+
// "vid": "0x1001",
557+
// "pid": "0x2001",
558+
// },
559+
// properties.Map{
560+
// "vid": "0x1002",
561+
// "pid": "0x2002",
562+
// },
563+
// ]
564564
//
565565
// Numeric subindex cannot be mixed with non-numeric, in that case only the numeric sub
566566
// index sets will be returned.
@@ -597,27 +597,27 @@ func (m *Map) ExtractSubIndexSets(root string) []*Map {
597597
// ExtractSubIndexLists extracts a list of arguments from a root `root.N=...`.
598598
// For example the following Map:
599599
//
600-
// properties.Map{
601-
// "uno.discovery.required": "item",
602-
// "due.discovery.required.0": "item1",
603-
// "due.discovery.required.1": "item2",
604-
// "due.discovery.required.2": "item3",
605-
// "tre.discovery.required.1": "itemA",
606-
// "tre.discovery.required.2": "itemB",
607-
// "tre.discovery.required.3": "itemC",
608-
// }
600+
// properties.Map{
601+
// "uno.discovery.required": "item",
602+
// "due.discovery.required.0": "item1",
603+
// "due.discovery.required.1": "item2",
604+
// "due.discovery.required.2": "item3",
605+
// "tre.discovery.required.1": "itemA",
606+
// "tre.discovery.required.2": "itemB",
607+
// "tre.discovery.required.3": "itemC",
608+
// }
609609
//
610610
// calling ExtractSubIndexLists("uno.discovery.required") returns the array:
611611
//
612-
// [ "item" ]
612+
// [ "item" ]
613613
//
614614
// calling ExtractSubIndexLists("due.discovery.required") returns the array:
615615
//
616-
// [ "item1", "item2", "item3" ]
616+
// [ "item1", "item2", "item3" ]
617617
//
618618
// the sub-index may start with .1 too, so calling ExtractSubIndexLists("tre.discovery.required") returns:
619619
//
620-
// [ "itemA", "itemB", "itemC" ]
620+
// [ "itemA", "itemB", "itemC" ]
621621
//
622622
// Numeric subindex cannot be mixed with non-numeric, in that case only the numeric sub
623623
// index sets will be returned.

0 commit comments

Comments
 (0)