Format generated source code.

v2alpha/cmd/goupnp2srvgen/main.go

@@ -1,10 +1,13 @@
 package main
 
 import (
+	"bytes"
 	"encoding/xml"
 	"errors"
 	"flag"
 	"fmt"
+	"go/format"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -24,6 +27,7 @@ import (
 )
 
 var (
+	formatOutput     = flag.Bool("format_output", true, "If true, format the output source code.")
 	outputDir        = flag.String("output_dir", "", "Path to directory to write output in.")
 	srvManifests     = flag.String("srv_manifests", "", "Path to srvmanifests.toml")
 	srvTemplate      = flag.String("srv_template", "", "Path to srv.gotemplate.")
@@ -159,13 +163,8 @@ func processService(
 		return err
 	}
 
-	outputPath := filepath.Join(outputDir, srvManifest.Package+".go")
+	buf := &bytes.Buffer{}
-	outFile, err := os.Create(outputPath)
+	err = tmpl.ExecuteTemplate(buf, "service", tmplArgs{
-	if err != nil {
-		return fmt.Errorf("creating output service file %q: %w", outputPath, err)
-	}
-	defer outFile.Close()
-	err = tmpl.ExecuteTemplate(outFile, "service", tmplArgs{
 		Manifest: srvManifest,
 		Imps:     imps,
 		SCPD:     sd,
@@ -173,8 +172,18 @@ func processService(
 	if err != nil {
 		return fmt.Errorf("executing srv_template: %w", err)
 	}
-	if err := outFile.Close(); err != nil {
+	src := buf.Bytes()
-		return fmt.Errorf("closing output service file %q: %w", outputPath, err)
+	if *formatOutput {
+		var err error
+		src, err = format.Source(src)
+		if err != nil {
+			return fmt.Errorf("formatting output service file: %w", err)
+		}
+	}
+
+	outputPath := filepath.Join(outputDir, srvManifest.Package+".go")
+	if err := ioutil.WriteFile(outputPath, src, os.ModePerm); err != nil {
+		return fmt.Errorf("writing output service file %q: %w", outputPath, err)
 	}
 
 	return nil

v2alpha/srv/inetgw2/wanpppconn1/wanpppconn1.go

@@ -20,10 +20,13 @@ var _ pkg1.Action = &AddPortMapping{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *AddPortMapping) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *AddPortMapping) ActionName() string { return "AddPortMapping" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *AddPortMapping) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *AddPortMapping) RefResponse() any { return &a.Response }
 
@@ -54,10 +57,13 @@ var _ pkg1.Action = &ConfigureConnection{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ConfigureConnection) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ConfigureConnection) ActionName() string { return "ConfigureConnection" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ConfigureConnection) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ConfigureConnection) RefResponse() any { return &a.Response }
 
@@ -82,10 +88,13 @@ var _ pkg1.Action = &DeletePortMapping{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *DeletePortMapping) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *DeletePortMapping) ActionName() string { return "DeletePortMapping" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *DeletePortMapping) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *DeletePortMapping) RefResponse() any { return &a.Response }
 
@@ -111,10 +120,13 @@ var _ pkg1.Action = &ForceTermination{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ForceTermination) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ForceTermination) ActionName() string { return "ForceTermination" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ForceTermination) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *ForceTermination) RefResponse() any { return &a.Response }
 
@@ -136,10 +148,13 @@ var _ pkg1.Action = &GetAutoDisconnectTime{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetAutoDisconnectTime) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetAutoDisconnectTime) ActionName() string { return "GetAutoDisconnectTime" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetAutoDisconnectTime) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetAutoDisconnectTime) RefResponse() any { return &a.Response }
 
@@ -163,10 +178,13 @@ var _ pkg1.Action = &GetConnectionTypeInfo{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetConnectionTypeInfo) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetConnectionTypeInfo) ActionName() string { return "GetConnectionTypeInfo" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetConnectionTypeInfo) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetConnectionTypeInfo) RefResponse() any { return &a.Response }
 
@@ -191,10 +209,13 @@ var _ pkg1.Action = &GetExternalIPAddress{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetExternalIPAddress) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetExternalIPAddress) ActionName() string { return "GetExternalIPAddress" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetExternalIPAddress) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetExternalIPAddress) RefResponse() any { return &a.Response }
 
@@ -218,10 +239,13 @@ var _ pkg1.Action = &GetGenericPortMappingEntry{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetGenericPortMappingEntry) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetGenericPortMappingEntry) ActionName() string { return "GetGenericPortMappingEntry" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetGenericPortMappingEntry) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetGenericPortMappingEntry) RefResponse() any { return &a.Response }
 
@@ -254,10 +278,13 @@ var _ pkg1.Action = &GetIdleDisconnectTime{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetIdleDisconnectTime) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetIdleDisconnectTime) ActionName() string { return "GetIdleDisconnectTime" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetIdleDisconnectTime) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetIdleDisconnectTime) RefResponse() any { return &a.Response }
 
@@ -281,10 +308,13 @@ var _ pkg1.Action = &GetLinkLayerMaxBitRates{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetLinkLayerMaxBitRates) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetLinkLayerMaxBitRates) ActionName() string { return "GetLinkLayerMaxBitRates" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetLinkLayerMaxBitRates) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetLinkLayerMaxBitRates) RefResponse() any { return &a.Response }
 
@@ -309,10 +339,13 @@ var _ pkg1.Action = &GetNATRSIPStatus{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetNATRSIPStatus) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetNATRSIPStatus) ActionName() string { return "GetNATRSIPStatus" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetNATRSIPStatus) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetNATRSIPStatus) RefResponse() any { return &a.Response }
 
@@ -337,10 +370,13 @@ var _ pkg1.Action = &GetPPPAuthenticationProtocol{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPAuthenticationProtocol) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPAuthenticationProtocol) ActionName() string { return "GetPPPAuthenticationProtocol" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPAuthenticationProtocol) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPAuthenticationProtocol) RefResponse() any { return &a.Response }
 
@@ -364,10 +400,13 @@ var _ pkg1.Action = &GetPPPCompressionProtocol{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPCompressionProtocol) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPCompressionProtocol) ActionName() string { return "GetPPPCompressionProtocol" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPCompressionProtocol) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPCompressionProtocol) RefResponse() any { return &a.Response }
 
@@ -391,10 +430,13 @@ var _ pkg1.Action = &GetPPPEncryptionProtocol{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPEncryptionProtocol) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPEncryptionProtocol) ActionName() string { return "GetPPPEncryptionProtocol" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPEncryptionProtocol) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPPPEncryptionProtocol) RefResponse() any { return &a.Response }
 
@@ -418,10 +460,13 @@ var _ pkg1.Action = &GetPassword{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPassword) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPassword) ActionName() string { return "GetPassword" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPassword) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetPassword) RefResponse() any { return &a.Response }
 
@@ -445,10 +490,13 @@ var _ pkg1.Action = &GetSpecificPortMappingEntry{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetSpecificPortMappingEntry) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetSpecificPortMappingEntry) ActionName() string { return "GetSpecificPortMappingEntry" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetSpecificPortMappingEntry) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetSpecificPortMappingEntry) RefResponse() any { return &a.Response }
 
@@ -480,10 +528,13 @@ var _ pkg1.Action = &GetStatusInfo{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetStatusInfo) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetStatusInfo) ActionName() string { return "GetStatusInfo" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetStatusInfo) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetStatusInfo) RefResponse() any { return &a.Response }
 
@@ -509,10 +560,13 @@ var _ pkg1.Action = &GetUserName{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetUserName) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetUserName) ActionName() string { return "GetUserName" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetUserName) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetUserName) RefResponse() any { return &a.Response }
 
@@ -536,10 +590,13 @@ var _ pkg1.Action = &GetWarnDisconnectDelay{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetWarnDisconnectDelay) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetWarnDisconnectDelay) ActionName() string { return "GetWarnDisconnectDelay" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetWarnDisconnectDelay) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *GetWarnDisconnectDelay) RefResponse() any { return &a.Response }
 
@@ -563,10 +620,13 @@ var _ pkg1.Action = &RequestConnection{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestConnection) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestConnection) ActionName() string { return "RequestConnection" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestConnection) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestConnection) RefResponse() any { return &a.Response }
 
@@ -588,10 +648,13 @@ var _ pkg1.Action = &RequestTermination{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestTermination) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestTermination) ActionName() string { return "RequestTermination" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestTermination) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *RequestTermination) RefResponse() any { return &a.Response }
 
@@ -613,10 +676,13 @@ var _ pkg1.Action = &SetAutoDisconnectTime{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetAutoDisconnectTime) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetAutoDisconnectTime) ActionName() string { return "SetAutoDisconnectTime" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetAutoDisconnectTime) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetAutoDisconnectTime) RefResponse() any { return &a.Response }
 
@@ -640,10 +706,13 @@ var _ pkg1.Action = &SetConnectionType{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetConnectionType) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetConnectionType) ActionName() string { return "SetConnectionType" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetConnectionType) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetConnectionType) RefResponse() any { return &a.Response }
 
@@ -667,10 +736,13 @@ var _ pkg1.Action = &SetIdleDisconnectTime{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetIdleDisconnectTime) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetIdleDisconnectTime) ActionName() string { return "SetIdleDisconnectTime" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetIdleDisconnectTime) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetIdleDisconnectTime) RefResponse() any { return &a.Response }
 
@@ -694,10 +766,13 @@ var _ pkg1.Action = &SetWarnDisconnectDelay{}
 
 // ServiceType implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetWarnDisconnectDelay) ServiceType() string { return ServiceType }
+
 // ActionName implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetWarnDisconnectDelay) ActionName() string { return "SetWarnDisconnectDelay" }
+
 // RefRequest implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetWarnDisconnectDelay) RefRequest() any { return &a.Request }
+
 // RefResponse implements "github.com/huin/goupnp/v2alpha/soap".Action.
 func (a *SetWarnDisconnectDelay) RefResponse() any { return &a.Response }