gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Chris Lu 2014-03-09 18:50:45 -07:00
parent e6e85a6b2c
commit c830b60f36
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
go/operation/submit.go
View file

@ -17,7 +17,9 @@ type FilePart struct {
FileSize int64 FileSize int64
IsGzipped bool IsGzipped bool
MimeType string MimeType string
ModTime int64 //in seconds ModTime int64 //in seconds
Server string //this comes from assign result
Fid string //this comes from assign result, but customizable
} }
type SubmitResult struct { type SubmitResult struct {
@ -41,17 +43,17 @@ func SubmitFiles(master string, files []FilePart, replication string, maxMB int)
return results, err return results, err
} }
for index, file := range files { for index, file := range files {
fid := ret.Fid file.Fid = ret.Fid
if index > 0 { if index > 0 {
fid = fid + "_" + strconv.Itoa(index) file.Fid = file.Fid + "_" + strconv.Itoa(index)
} }
results[index].Size, err = file.upload(ret.PublicUrl, fid, maxMB, master, replication) file.Server = ret.PublicUrl
results[index].Size, err = file.Upload(maxMB, master, replication)
if err != nil { if err != nil {
fid = ""
results[index].Error = err.Error() results[index].Error = err.Error()
} }
results[index].Fid = fid results[index].Fid = file.Fid
results[index].FileUrl = ret.PublicUrl + "/" + fid results[index].FileUrl = file.Server + "/" + file.Fid
} }
return results, nil return results, nil
} }
@ -93,8 +95,8 @@ func newFilePart(fullPathFilename string) (ret FilePart, err error) {
return ret, nil return ret, nil
} }
func (fi FilePart) upload(server string, fid string, maxMB int, master, replication string) (retSize int, err error) { func (fi FilePart) Upload(maxMB int, master, replication string) (retSize int, err error) {
fileUrl := "http://" + server + "/" + fid fileUrl := "http://" + fi.Server + "/" + fi.Fid
if fi.ModTime != 0 { if fi.ModTime != 0 {
fileUrl += "?ts=" + strconv.Itoa(int(fi.ModTime)) fileUrl += "?ts=" + strconv.Itoa(int(fi.ModTime))
} }