tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-06-20 05:48:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add enhancements to progress widget

Browse Source 
* Adds TransferSpeedColumn
* Adds DownloadedColumn
* Adds ElapsedTimeColumn
* Minor enhancements to existing columns
This commit is contained in:
Patrik Svensson
2021-01-12 12:39:27 +01:00
committed by Patrik Svensson
parent d87d8e4422
commit 07db28bb6f
12 changed files with 342 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Spectre.Console/Widgets/Progress/Columns/SpinnerColumn.cs
View File

@ -16,6 +16,7 @@ namespace Spectre.Console
private readonly object _lock;
private Spinner _spinner;
private int? _maxWidth;
private string? _completed;
/// <inheritdoc/>
protected internal override bool NoWrap => true;
@ -36,6 +37,25 @@ namespace Spectre.Console
}
}
/// <summary>
/// Gets or sets the text that should be shown instead
/// of the spinner once a task completes.
/// </summary>
public string? CompletedText
{
get => _completed;
set
{
_completed = value;
_maxWidth = null;
}
}
/// <summary>
/// Gets or sets the completed style.
/// </summary>
public Style? CompletedStyle { get; set; }
/// <summary>
/// Gets or sets the style of the spinner.
/// </summary>
@ -67,7 +87,7 @@ namespace Spectre.Console
if (!task.IsStarted || task.IsFinished)
{
return new Markup(new string(' ', GetMaxWidth(context)));
return new Markup(CompletedText ?? " ", CompletedStyle ?? Style.Plain);
}
var accumulated = task.State.Update<double>(ACCUMULATED, acc => acc + deltaTime.TotalMilliseconds);
@ -97,7 +117,9 @@ namespace Spectre.Console
var useAscii = (context.LegacyConsole || !context.Unicode) && _spinner.IsUnicode;
var spinner = useAscii ? Spinner.Known.Ascii : _spinner ?? Spinner.Known.Default;
_maxWidth = spinner.Frames.Max(frame => Cell.GetCellLength(context, frame));
_maxWidth = Math.Max(
((IRenderable)new Markup(CompletedText ?? " ")).Measure(context, int.MaxValue).Max,
spinner.Frames.Max(frame => Cell.GetCellLength(context, frame)));
}
return _maxWidth.Value;