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

Remove GofmtWriteCloser.

Browse Source 
Now uses common github.com/huin/goutil/codegen version.
This commit is contained in:
John Beisley 2014-01-12 01:10:05 +00:00
parent 79a1c07c05
commit 3a950ed088
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/specgen/specgen.go
View File

@ -14,7 +14,6 @@ import (
"io/ioutil"
"log"
"os"
"os/exec"
"path"
"path/filepath"
"regexp"
@ -22,6 +21,7 @@ import (
"github.com/huin/goupnp"
"github.com/huin/goupnp/scpd"
"github.com/huin/goutil/codegen"
)
// flags
@ -177,7 +177,7 @@ func (dcp *DCP) writePackage(outDir string) error {
}
var output io.WriteCloser = packageFile
if *enableGofmt {
if output, err = NewGofmtWriteCloser(output); err != nil {
if output, err = codegen.NewGofmtWriteCloser(output); err != nil {
packageFile.Close()
return err
}
@ -189,43 +189,6 @@ func (dcp *DCP) writePackage(outDir string) error {
return output.Close()
}
type GofmtWriteCloser struct {
output io.WriteCloser
stdin io.WriteCloser
gofmt *exec.Cmd
}
func NewGofmtWriteCloser(output io.WriteCloser) (*GofmtWriteCloser, error) {
gofmt := exec.Command("gofmt")
gofmt.Stdout = output
gofmt.Stderr = os.Stderr
stdin, err := gofmt.StdinPipe()
if err != nil {
return nil, err
}
if err = gofmt.Start(); err != nil {
return nil, err
}
return &GofmtWriteCloser{
output: output,
stdin: stdin,
gofmt: gofmt,
}, nil
}
func (gwc *GofmtWriteCloser) Write(p []byte) (int, error) {
return gwc.stdin.Write(p)
}
func (gwc *GofmtWriteCloser) Close() error {
gwc.stdin.Close()
if err := gwc.output.Close(); err != nil {
gwc.gofmt.Wait()
return err
}
return gwc.gofmt.Wait()
}
func (dcp *DCP) processSCPDFile(file *zip.File) {
scpd := new(scpd.SCPD)
if err := unmarshalXmlFile(file, scpd); err != nil {