修复 某些情况下下载测速数值过大的问题 (#290)

* fix the speed measurement value is too large

* fix break when err == io.EOF
This commit is contained in:
charSLee013 2023-02-11 12:40:06 +08:00 committed by GitHub
parent ed1d512d65
commit f5ce273688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions

View File

@ -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)
}