LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into composer

This commit is contained in:
Marius 2016-02-21 23:39:37 +01:00
parent 21ae1c45a7 eb9100e9bb
commit 27866110c3
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
filestore/filestore.go
View File

@ -77,11 +77,6 @@ func (store FileStore) WriteChunk(id string, offset int64, src io.Reader) (int64
defer file.Close()
n, err := io.Copy(file, src)
if n > 0 {
if err := store.setOffset(id, offset+n); err != nil {
return 0, err
}
}
return n, err
}
@ -91,8 +86,18 @@ func (store FileStore) GetInfo(id string) (tusd.FileInfo, error) {
if err != nil {
return info, err
}
err = json.Unmarshal(data, &info)
if err := json.Unmarshal(data, &info); err != nil {
return info, err
}
stat, err := os.Stat(store.binPath(id))
if err != nil {
return info, err
}
info.Offset = stat.Size()
return info, nil
}
func (store FileStore) GetReader(id string) (io.Reader, error) {
@ -116,20 +121,13 @@ func (store FileStore) ConcatUploads(dest string, uploads []string) (err error)
}
defer file.Close()
var bytesRead int64
defer func() {
err = store.setOffset(dest, bytesRead)
}()
for _, id := range uploads {
src, err := store.GetReader(id)
if err != nil {
return err
}
n, err := io.Copy(file, src)
bytesRead += n
if err != nil {
if _, err := io.Copy(file, src); err != nil {
return err
}
}
@ -200,19 +198,3 @@ func (store FileStore) writeInfo(id string, info tusd.FileInfo) error {
}
return ioutil.WriteFile(store.infoPath(id), data, defaultFilePerm)
}
// setOffset updates the .info file to match the new offset.
func (store FileStore) setOffset(id string, offset int64) error {
info, err := store.GetInfo(id)
if err != nil {
return err
}
// never decrement the offset
if info.Offset >= offset {
return nil
}
info.Offset = offset
return store.writeInfo(id, info)
}