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

Rename some fields in TOML DCP manifest.

Browse Source
This commit is contained in:
John Beisley 2022-06-10 07:24:33 +01:00
parent 9d4879e3c6
commit be592a92bd
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
v2alpha/cmd/goupnp2srvgen/main.go
View File

@ -153,25 +153,25 @@ func processService(
} }
type DCPSpecManifests struct { type DCPSpecManifests struct {
DCPS []*DCPSpecManifest DCPS []*DCPSpecManifest `toml:"dcp"`
} }
type DCPSpecManifest struct { type DCPSpecManifest struct {
// Path is the file path within upnpresources.zip to the DCP spec ZIP file. // Path is the file path within upnpresources.zip to the DCP spec ZIP file.
Path string Path string `toml:"path"`
// Services maps from a service name (e.g. "FooBar:1") to a path within the DCP spec ZIP file // Services maps from a service name (e.g. "FooBar:1") to a path within the DCP spec ZIP file
// (e.g. "xml data files/service/FooBar1.xml"). // (e.g. "xml data files/service/FooBar1.xml").
Services []*ServiceManifest Services []*ServiceManifest `toml:"service"`
} }
type ServiceManifest struct { type ServiceManifest struct {
// Package is the Go package name to generate e.g. "foo1". // Package is the Go package name to generate e.g. "foo1".
Package string Package string `toml:"package"`
// ServiceType is the SOAP namespace and service type that identifes the service e.g. // ServiceType is the SOAP namespace and service type that identifes the service e.g.
// "urn:schemas-upnp-org:service:Foo:1" // "urn:schemas-upnp-org:service:Foo:1"
ServiceType string ServiceType string `toml:"type"`
// Path within the DCP spec ZIP file e.g. "xml data files/service/Foo1.xml". // Path within the DCP spec ZIP file e.g. "xml data files/service/Foo1.xml".
Path string Path string `toml:"path"`
} }
type tmplArgs struct { type tmplArgs struct {

20
v2alpha/srv/srvmanifests.toml
View File

@ -1,10 +1,10 @@
[[DCPS]] [[dcp]]
Path = "standardizeddcps/Internet Gateway_2/UPnP-gw-IGD-TestFiles-20101210.zip" path = "standardizeddcps/Internet Gateway_2/UPnP-gw-IGD-TestFiles-20101210.zip"
[[DCPS.Services]] [[dcp.service]]
Package = "lanhostconfigmanagement1" package = "lanhostconfigmanagement1"
ServiceType = "urn:schemas-upnp-org:service:LANHostConfigManagement:1" type = "urn:schemas-upnp-org:service:LANHostConfigManagement:1"
Path = "xml data files/service/LANHostConfigManagement1.xml" path = "xml data files/service/LANHostConfigManagement1.xml"
[[DCPS.Services]] [[dcp.service]]
Package = "wanpppconnection1" package = "wanpppconnection1"
ServiceType = "urn:schemas-upnp-org:service:WANPPPConnection:1" type = "urn:schemas-upnp-org:service:WANPPPConnection:1"
Path = "xml data files/service/WANPPPConnection1.xml" path = "xml data files/service/WANPPPConnection1.xml"