lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progress/copycallback: increment with bytes read regardless of error

Browse Source
This commit is contained in:
Taylor Blau 2017-02-16 18:32:42 -07:00
parent 09f6330aaa
commit a2a7b09762
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
progress/copycallback.go
View File

@ -31,12 +31,11 @@ func (r *bodyWithCallback) Read(p []byte) (int, error) {
if n > 0 { if n > 0 {
r.readSize += int64(n) r.readSize += int64(n)
}
if err == nil && r.c != nil { if (err == nil || err == io.EOF) && r.c != nil {
err = r.c(r.totalSize, r.readSize, n) err = r.c(r.totalSize, r.readSize, n)
}
} }
return n, err return n, err
} }
@ -52,12 +51,11 @@ func (w *CallbackReader) Read(p []byte) (int, error) {
if n > 0 { if n > 0 {
w.ReadSize += int64(n) w.ReadSize += int64(n)
}
if err == nil && w.C != nil { if (err == nil || err == io.EOF) && w.C != nil {
err = w.C(w.TotalSize, w.ReadSize, n) err = w.C(w.TotalSize, w.ReadSize, n)
}
} }
return n, err return n, err
} }