cyrilix/goupnp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factored dcpMetadataByDir out as a global.

Browse Source
This commit is contained in:
John Beisley 2014-06-07 20:55:03 +01:00
parent eadcb12812
commit 4370c89058
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gotasks/specgen_task.go
View File

@ -64,10 +64,7 @@ func TaskSpecgen(t *tasking.T) {
} }
defer specArchive.Close() defer specArchive.Close()
dcpCol := newDcpsCollection(map[string]DCPMetadata{ dcpCol := newDcpsCollection()
"Internet Gateway_1": {"internetgateway1"},
"Internet Gateway_2": {"internetgateway2"},
})
for _, f := range globFiles("standardizeddcps/*/*.zip", specArchive.Reader) { for _, f := range globFiles("standardizeddcps/*/*.zip", specArchive.Reader) {
dirName := strings.TrimPrefix(f.Name, "standardizeddcps/") dirName := strings.TrimPrefix(f.Name, "standardizeddcps/")
slashIndex := strings.Index(dirName, "/") slashIndex := strings.Index(dirName, "/")
@ -100,15 +97,18 @@ type DCPMetadata struct {
Name string Name string
} }
type dcpCollection struct { var dcpMetadataByDir = map[string]DCPMetadata{
dcpMetadataByDir map[string]DCPMetadata "Internet Gateway_1": {"internetgateway1"},
dcpByAlias map[string]*DCP "Internet Gateway_2": {"internetgateway2"},
} }
func newDcpsCollection(dcpMetadataByDir map[string]DCPMetadata) *dcpCollection { type dcpCollection struct {
dcpByAlias map[string]*DCP
}
func newDcpsCollection() *dcpCollection {
c := &dcpCollection{ c := &dcpCollection{
dcpMetadataByDir: dcpMetadataByDir, dcpByAlias: make(map[string]*DCP),
dcpByAlias: make(map[string]*DCP),
} }
for _, metadata := range dcpMetadataByDir { for _, metadata := range dcpMetadataByDir {
c.dcpByAlias[metadata.Name] = newDCP(metadata) c.dcpByAlias[metadata.Name] = newDCP(metadata)
@ -117,7 +117,7 @@ func newDcpsCollection(dcpMetadataByDir map[string]DCPMetadata) *dcpCollection {
} }
func (c *dcpCollection) dcpForDir(dirName string) *DCP { func (c *dcpCollection) dcpForDir(dirName string) *DCP {
metadata, ok := c.dcpMetadataByDir[dirName] metadata, ok := dcpMetadataByDir[dirName]
if !ok { if !ok {
return nil return nil
} }