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

Compare commits

base: LumeWeb:35b64515d767f38913247d58c69893adfc87348e
Branches Tags
LumeWeb:master
LumeWeb:develop
LumeWeb:v0.1.0-develop.3
LumeWeb:v0.1.0-develop.2
LumeWeb:v0.1.0-develop.1
LumeWeb:v0.0.1
..
compare: LumeWeb:0caa54f0282993aa77c446bdd7e6e389779cdeea
Branches Tags
LumeWeb:develop
LumeWeb:master
LumeWeb:v0.1.0-develop.3
LumeWeb:v0.1.0-develop.2
LumeWeb:v0.1.0-develop.1
LumeWeb:v0.0.1

3 Commits
35b64515d7 ... 0caa54f028

Author SHA1 Message Date
Derrick Hammer 0caa54f028
fix: if i > 0 add to bytesRead 2024-03-22 20:23:51 -04:00
Derrick Hammer 96713e3538
fix: always pass 0 to ReadBytes 2024-03-22 20:23:37 -04:00
Derrick Hammer ba60a6c729
fix: if eof, return the byte count 2024-03-22 20:23:14 -04:00
1 changed files with 7 additions and 1 deletions
Show Stats Expand all files Collapse all files

8
import/import.go
View File

@ -223,13 +223,16 @@ func (i *ImportReader) Close() error {
func (i *ImportReader) Read(p []byte) (n int, err error) { func (i *ImportReader) Read(p []byte) (n int, err error) {
n, err = i.reader.Read(p) n, err = i.reader.Read(p)
if err != nil { if err != nil {
if err == io.EOF {
return n, err
}
return 0, err return 0, err
} }
// Update cumulative bytes read // Update cumulative bytes read
i.bytesRead += uint64(n) i.bytesRead += uint64(n)
err = i.ReadBytes(n) err = i.ReadBytes(0)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -238,6 +241,9 @@ func (i *ImportReader) Read(p []byte) (n int, err error) {
} }
func (i *ImportReader) ReadBytes(n int) (err error) { func (i *ImportReader) ReadBytes(n int) (err error) {
if n > 0 {
i.bytesRead += uint64(n)
}
stageProgress := float64(100) / float64(i.totalStages) stageProgress := float64(100) / float64(i.totalStages)
// Calculate progress based on bytes read // Calculate progress based on bytes read