Skip to content

Commit

Permalink
修复 某些情况下下载测速数值过大的问题 (#290)
Browse files Browse the repository at this point in the history
* fix the speed measurement value is too large

* fix break when err == io.EOF
  • Loading branch information
charSLee013 authored Feb 11, 2023
1 parent ed1d512 commit f5ce273
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions task/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,15 @@ func downloadHandler(ip *net.IPAddr) float64 {
}
bufferRead, err := response.Body.Read(buffer)
if err != nil {
if err != io.EOF { // 文件下载完了,或因网络等问题导致链接中断,则退出循环(终止测速)
// 获取上个时间片
last_time_slice := timeStart.Add(timeSlice * time.Duration(timeCounter-1))
// 下载数据量 / (用当前时间 - 上个时间片/ 时间片)
e.Add(float64(contentRead-lastContentRead) / (float64(currentTime.Sub(last_time_slice)) / float64(timeSlice)))

if err == io.EOF { // 文件下载完了,或因网络等问题导致链接中断,则退出循环(终止测速)
break
}
e.Add(float64(contentRead-lastContentRead) / (float64(nextTime.Sub(currentTime)) / float64(timeSlice)))

}
contentRead += int64(bufferRead)
}
Expand Down

0 comments on commit f5ce273

Please sign in to comment.