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

Use manifest package name in generated code.

Browse Source
This commit is contained in:
John Beisley 2022-06-06 18:03:17 +01:00
parent 89dd64b3ce
commit 5a32790ea4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,8 +140,9 @@ func processService(
} }
err = tmpl.ExecuteTemplate(os.Stdout, "service", tmplArgs{ err = tmpl.ExecuteTemplate(os.Stdout, "service", tmplArgs{
Imps: imps, Manifest: srvManifest,
SCPD: sd, Imps: imps,
SCPD: sd,
}) })
if err != nil { if err != nil {
return fmt.Errorf("executing srv_template: %w", err) return fmt.Errorf("executing srv_template: %w", err)
@ -169,8 +170,9 @@ type ServiceManifest struct {
} }
type tmplArgs struct { type tmplArgs struct {
Imps *imports Manifest *ServiceManifest
SCPD *srvdesc.SCPD Imps *imports
SCPD *srvdesc.SCPD
} }
type imports struct { type imports struct {

2
v2alpha/srv/srv.gotemplate
View File

@ -1,6 +1,6 @@
{{define "service"}} {{define "service"}}
{{- $Imps := .Imps}} {{- $Imps := .Imps}}
package TODO package {{.Manifest.Package}}
import ( import (
{{- range .Imps.ImportLines}} {{- range .Imps.ImportLines}}