Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化速度计算

This commit is contained in:
nilaoda 2022-08-19 23:15:29 +08:00
parent 52a1ce95cb
commit 16bff5391d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/N_m3u8DL-RE/Column/DownloadSpeedColumn.cs
View File

@ -1,4 +1,5 @@
using N_m3u8DL_RE.Entity; using N_m3u8DL_RE.Common.Log;
using N_m3u8DL_RE.Entity;
using Spectre.Console; using Spectre.Console;
using Spectre.Console.Rendering; using Spectre.Console.Rendering;
using System; using System;
@ -11,7 +12,7 @@ namespace N_m3u8DL_RE.Column
{ {
internal sealed class DownloadSpeedColumn : ProgressColumn internal sealed class DownloadSpeedColumn : ProgressColumn
{ {
private TimeSpan CalcTimeSpan = TimeSpan.FromSeconds(0); private string DateTimeString = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
private string Speed = "0Bps"; private string Speed = "0Bps";
protected override bool NoWrap => true; protected override bool NoWrap => true;
public SpeedContainer SpeedContainer { get; set; } public SpeedContainer SpeedContainer { get; set; }
@ -25,13 +26,13 @@ namespace N_m3u8DL_RE.Column
public override IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime) public override IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime)
{ {
CalcTimeSpan = CalcTimeSpan.Add(deltaTime); var now = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//一秒汇报一次即可 //一秒汇报一次即可
if (CalcTimeSpan.TotalSeconds > 1) if (DateTimeString != now)
{ {
Speed = FormatFileSize(SpeedContainer.Downloaded / CalcTimeSpan.TotalSeconds); Speed = FormatFileSize(SpeedContainer.Downloaded);
SpeedContainer.Reset(); SpeedContainer.Reset();
CalcTimeSpan = TimeSpan.FromSeconds(0); DateTimeString = now;
} }
var percentage = (int)task.Percentage; var percentage = (int)task.Percentage;
var flag = percentage == 100 || percentage == 0; var flag = percentage == 100 || percentage == 0;
@ -47,7 +48,7 @@ namespace N_m3u8DL_RE.Column
>= 1024 * 1024 * 1024 => string.Format("{0:########0.00}GBps", (double)fileSize / (1024 * 1024 * 1024)), >= 1024 * 1024 * 1024 => string.Format("{0:########0.00}GBps", (double)fileSize / (1024 * 1024 * 1024)),
>= 1024 * 1024 => string.Format("{0:####0.00}MBps", (double)fileSize / (1024 * 1024)), >= 1024 * 1024 => string.Format("{0:####0.00}MBps", (double)fileSize / (1024 * 1024)),
>= 1024 => string.Format("{0:####0.00}KBps", (double)fileSize / 1024), >= 1024 => string.Format("{0:####0.00}KBps", (double)fileSize / 1024),
_ => string.Format("{0}Bps", fileSize) _ => string.Format("{0:####0.00}Bps", fileSize)
}; };
} }
} }