lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-05 00:50:54 +00:00
Code Issues Releases Activity

method refactor

Browse Source
This commit is contained in:
JessonChan 2015-11-11 18:06:18 +08:00
parent b25a1355f9
commit 1200b7c347
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
context/acceptencoder.go
View File

@ -23,28 +23,34 @@ import (
"strconv" "strconv"
"strings" "strings"
"bytes" "fmt"
"io/ioutil"
) )
// WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate)
func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) {
return writeLevel(encoding, writer, file, flate.BestCompression) content, err := ioutil.ReadAll(file)
if err != nil {
return false, "", err
}
return writeLevel(encoding, writer, content, flate.BestCompression)
} }
// WriteBody reads writes content to writer by the specific encoding(gzip/deflate) // WriteBody reads writes content to writer by the specific encoding(gzip/deflate)
func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) {
return writeLevel(encoding, writer, bytes.NewBuffer(content), flate.BestSpeed) return writeLevel(encoding, writer, content, flate.BestSpeed)
} }
// writeLevel reads from reader,writes to writer by specific encoding and compress level // writeLevel reads from reader,writes to writer by specific encoding and compress level
// the compress level is defined by deflate package // the compress level is defined by deflate package
func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { func writeLevel(encoding string, writer io.Writer, content []byte, level int) (bool, string, error) {
var outputWriter io.Writer var outputWriter io.Writer
var err error var err error
if cf, ok := encoderMap[encoding]; ok { if cf, ok := encoderMap[encoding]; ok {
fmt.Println("write level", encoding)
outputWriter, err = cf.encode(writer, level) outputWriter, err = cf.encode(writer, level)
} else { } else {
encoding = "" encoding = ""
@ -53,9 +59,7 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int)
if err != nil { if err != nil {
return false, "", err return false, "", err
} }
if _, err = io.Copy(outputWriter, reader); err != nil { outputWriter.Write(content)
return false, "", err
}
switch outputWriter.(type) { switch outputWriter.(type) {
case io.WriteCloser: case io.WriteCloser:
outputWriter.(io.WriteCloser).Close() outputWriter.(io.WriteCloser).Close()