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

Progress bar header and footer (#1262)

Browse Source
This commit is contained in:
Phil Scott
2023-09-16 16:39:43 -04:00
committed by GitHub
parent 3bee7212b7
commit ed9e198d60
6 changed files with 84 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Spectre.Console/Live/Progress/Progress.cs
View File

@@ -7,6 +7,11 @@ public sealed class Progress
{
private readonly IAnsiConsole _console;
/// <summary>
/// Gets or sets a optional custom render function.
/// </summary>
public Func<IRenderable, IReadOnlyList<ProgressTask>, IRenderable> RenderHook { get; set; } = (renderable, _) => renderable;
/// <summary>
/// Gets or sets a value indicating whether or not task list should auto refresh.
/// Defaults to <c>true</c>.
@@ -158,7 +163,7 @@ public sealed class Progress
if (interactive)
{
var columns = new List<ProgressColumn>(Columns);
return new DefaultProgressRenderer(_console, columns, RefreshRate, HideCompleted);
return new DefaultProgressRenderer(_console, columns, RefreshRate, HideCompleted, RenderHook);
}
else
{

15
src/Spectre.Console/Live/Progress/Renderers/DefaultProgressRenderer.cs
View File

@@ -8,11 +8,12 @@ internal sealed class DefaultProgressRenderer : ProgressRenderer
private readonly object _lock;
private readonly Stopwatch _stopwatch;
private readonly bool _hideCompleted;
private readonly Func<IRenderable, IReadOnlyList<ProgressTask>, IRenderable> _renderHook;
private TimeSpan _lastUpdate;
public override TimeSpan RefreshRate { get; }
public DefaultProgressRenderer(IAnsiConsole console, List<ProgressColumn> columns, TimeSpan refreshRate, bool hideCompleted)
public DefaultProgressRenderer(IAnsiConsole console, List<ProgressColumn> columns, TimeSpan refreshRate, bool hideCompleted, Func<IRenderable, IReadOnlyList<ProgressTask>, IRenderable> renderHook)
{
_console = console ?? throw new ArgumentNullException(nameof(console));
_columns = columns ?? throw new ArgumentNullException(nameof(columns));
@@ -21,6 +22,7 @@ internal sealed class DefaultProgressRenderer : ProgressRenderer
_stopwatch = new Stopwatch();
_lastUpdate = TimeSpan.Zero;
_hideCompleted = hideCompleted;
_renderHook = renderHook;
RefreshRate = refreshRate;
}
@@ -95,13 +97,20 @@ internal sealed class DefaultProgressRenderer : ProgressRenderer
}
// Add rows
foreach (var task in context.GetTasks().Where(tsk => !(_hideCompleted && tsk.IsFinished)))
var tasks = context.GetTasks();
var layout = new Grid();
layout.AddColumn();
foreach (var task in tasks.Where(tsk => !(_hideCompleted && tsk.IsFinished)))
{
var columns = _columns.Select(column => column.Render(renderContext, task, delta));
grid.AddRow(columns.ToArray());
}
_live.SetRenderable(new Padder(grid, new Padding(0, 1)));
layout.AddRow(grid);
_live.SetRenderable(new Padder(_renderHook(layout, tasks), new Padding(0, 1)));
}
}