gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only limit input parameter to io.Reader

Browse Source
This commit is contained in:
Chris Lu
2013-08-14 11:31:39 -07:00
parent 8e1ac16d16
commit 37b231b5dc
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go/operation/submit.go
View File

@@ -11,11 +11,11 @@ import (
) )
type FilePart struct { type FilePart struct {
ReadCloser io.ReadCloser //required, all rest are optional Reader io.Reader //required, all rest are optional
FileName string FileName string
IsGzipped bool IsGzipped bool
MimeType string MimeType string
ModTime int64 //in seconds ModTime int64 //in seconds
} }
type SubmitResult struct { type SubmitResult struct {
@@ -69,7 +69,7 @@ func NewFilePart(fullPathFilename string) (ret FilePart, err error) {
glog.V(0).Info("Failed to open file: ", fullPathFilename) glog.V(0).Info("Failed to open file: ", fullPathFilename)
return ret, openErr return ret, openErr
} }
ret.ReadCloser = fh ret.Reader = fh
if fi, fiErr := fh.Stat(); fiErr != nil { if fi, fiErr := fh.Stat(); fiErr != nil {
glog.V(0).Info("Failed to stat file:", fullPathFilename) glog.V(0).Info("Failed to stat file:", fullPathFilename)
@@ -95,8 +95,10 @@ func (fi FilePart) Upload(server string, fid string) (int, error) {
if fi.ModTime != 0 { if fi.ModTime != 0 {
fileUrl += "?ts=" + strconv.Itoa(int(fi.ModTime)) fileUrl += "?ts=" + strconv.Itoa(int(fi.ModTime))
} }
defer fi.ReadCloser.Close() if closer, ok := fi.Reader.(io.Closer); ok{
ret, e := Upload(fileUrl, fi.FileName, fi.ReadCloser, fi.IsGzipped, fi.MimeType) defer closer.Close()
}
ret, e := Upload(fileUrl, fi.FileName, fi.Reader, fi.IsGzipped, fi.MimeType)
if e != nil { if e != nil {
return 0, e return 0, e
} }