mirror of
https://github.com/nsnail/spectre.console.git
synced 2025-04-16 08:52:50 +08:00
Add status support
This commit is contained in:
parent
cbed41e637
commit
501db5d287
43
docs/input/appendix/spinners.md
Normal file
43
docs/input/appendix/spinners.md
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
Title: Spinners
|
||||||
|
Order: 4
|
||||||
|
---
|
||||||
|
|
||||||
|
For all available spinners, see https://jsfiddle.net/sindresorhus/2eLtsbey/embedded/result/
|
||||||
|
|
||||||
|
# Usage
|
||||||
|
|
||||||
|
Spinners can be used with [Progress](xref:progress) and [Status](xref:status).
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
AnsiConsole.Status()
|
||||||
|
.Spinner(Spinner.Known.Star)
|
||||||
|
.Start("Thinking...", ctx => {
|
||||||
|
// Omitted
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
# Implementing a spinner
|
||||||
|
|
||||||
|
To implement your own spinner, all you have to do is
|
||||||
|
inherit from the `Spinner` base class.
|
||||||
|
|
||||||
|
In the example below, the spinner will alterate between
|
||||||
|
the characters `A`, `B` and `C` every 100 ms.
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public sealed class MySpinner : Spinner
|
||||||
|
{
|
||||||
|
// The interval for each frame
|
||||||
|
public override TimeSpan Interval => TimeSpan.FromMilliseconds(100);
|
||||||
|
|
||||||
|
// Whether or not the spinner contains unicode characters
|
||||||
|
public override bool IsUnicode => false;
|
||||||
|
|
||||||
|
// The individual frames of the spinner
|
||||||
|
public override IReadOnlyList<string> Frames =>
|
||||||
|
new List<string>
|
||||||
|
{
|
||||||
|
"A", "B", "C",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
BIN
docs/input/assets/images/status.gif
Normal file
BIN
docs/input/assets/images/status.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 257 KiB |
@ -31,5 +31,4 @@ $(document).ready(function () {
|
|||||||
}; // keyup
|
}; // keyup
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
}); // ready
|
}); // ready
|
60
docs/input/status.md
Normal file
60
docs/input/status.md
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
Title: Status
|
||||||
|
Order: 6
|
||||||
|
---
|
||||||
|
|
||||||
|
Spectre.Console can display information about long running tasks in the console.
|
||||||
|
|
||||||
|
<img src="assets/images/status.gif" style="max-width: 100%;margin-bottom:20px;">
|
||||||
|
|
||||||
|
If the current terminal isn't considered "interactive", such as when running
|
||||||
|
in a continuous integration system, or the terminal can't display
|
||||||
|
ANSI control sequence, any progress will be displayed in a simpler way.
|
||||||
|
|
||||||
|
# Usage
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Synchronous
|
||||||
|
AnsiConsole.Status()
|
||||||
|
.Start("Thinking...", ctx =>
|
||||||
|
{
|
||||||
|
// Simulate some work
|
||||||
|
AnsiConsole.MarkupLine("Doing some work...");
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
|
||||||
|
// Update the status and spinner
|
||||||
|
ctx.Status("Thinking some more");
|
||||||
|
ctx.Spinner(Spinner.Known.Star);
|
||||||
|
ctx.SpinnerStyle(Style.Parse("green"));
|
||||||
|
|
||||||
|
// Simulate some work
|
||||||
|
AnsiConsole.MarkupLine("Doing some more work...");
|
||||||
|
Thread.Sleep(2000);
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
## Asynchronous progress
|
||||||
|
|
||||||
|
If you prefer to use async/await, you can use `StartAsync` instead of `Start`.
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Asynchronous
|
||||||
|
await AnsiConsole.Status()
|
||||||
|
.StartAsync("Thinking...", async ctx =>
|
||||||
|
{
|
||||||
|
// Omitted
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
# Configure
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
AnsiConsole.Status()
|
||||||
|
.AutoRefresh(false)
|
||||||
|
.Spinner(Spinner.Known.Star)
|
||||||
|
.SpinnerStyle(Style.Parse("green bold"))
|
||||||
|
.Start("Thinking...", ctx =>
|
||||||
|
{
|
||||||
|
// Omitted
|
||||||
|
ctx.Refresh();
|
||||||
|
});
|
||||||
|
```
|
70
examples/Status/Program.cs
Normal file
70
examples/Status/Program.cs
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
using System.Threading;
|
||||||
|
using Spectre.Console;
|
||||||
|
|
||||||
|
namespace ProgressExample
|
||||||
|
{
|
||||||
|
public static class Program
|
||||||
|
{
|
||||||
|
public static void Main()
|
||||||
|
{
|
||||||
|
AnsiConsole.Status()
|
||||||
|
.AutoRefresh(true)
|
||||||
|
.Spinner(Spinner.Known.Default)
|
||||||
|
.Start("[yellow]Initializing warp drive[/]", ctx =>
|
||||||
|
{
|
||||||
|
// Initialize
|
||||||
|
Thread.Sleep(3000);
|
||||||
|
WriteLogMessage("Starting gravimetric field displacement manifold");
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
WriteLogMessage("Warming up deuterium chamber");
|
||||||
|
Thread.Sleep(2000);
|
||||||
|
WriteLogMessage("Generating antideuterium");
|
||||||
|
|
||||||
|
// Warp nacelles
|
||||||
|
Thread.Sleep(3000);
|
||||||
|
ctx.Spinner(Spinner.Known.BouncingBar);
|
||||||
|
ctx.Status("[bold blue]Unfolding warp nacelles[/]");
|
||||||
|
WriteLogMessage("Unfolding left warp nacelle");
|
||||||
|
Thread.Sleep(2000);
|
||||||
|
WriteLogMessage("Left warp nacelle [green]online[/]");
|
||||||
|
WriteLogMessage("Unfolding right warp nacelle");
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
WriteLogMessage("Right warp nacelle [green]online[/]");
|
||||||
|
|
||||||
|
// Warp bubble
|
||||||
|
Thread.Sleep(3000);
|
||||||
|
ctx.Spinner(Spinner.Known.Star2);
|
||||||
|
ctx.Status("[bold blue]Generating warp bubble[/]");
|
||||||
|
Thread.Sleep(3000);
|
||||||
|
ctx.Spinner(Spinner.Known.Star);
|
||||||
|
ctx.Status("[bold blue]Stabilizing warp bubble[/]");
|
||||||
|
|
||||||
|
// Safety
|
||||||
|
ctx.Spinner(Spinner.Known.Monkey);
|
||||||
|
ctx.Status("[bold blue]Performing safety checks[/]");
|
||||||
|
WriteLogMessage("Enabling interior dampening");
|
||||||
|
Thread.Sleep(2000);
|
||||||
|
WriteLogMessage("Interior dampening [green]enabled[/]");
|
||||||
|
|
||||||
|
// Warp!
|
||||||
|
Thread.Sleep(3000);
|
||||||
|
ctx.Spinner(Spinner.Known.Moon);
|
||||||
|
WriteLogMessage("Preparing for warp");
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
for (var warp = 1; warp < 10; warp++)
|
||||||
|
{
|
||||||
|
ctx.Status($"[bold blue]Warp {warp}[/]");
|
||||||
|
Thread.Sleep(500);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Done
|
||||||
|
AnsiConsole.MarkupLine("[bold green]Crusing at Warp 9.8[/]");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void WriteLogMessage(string message)
|
||||||
|
{
|
||||||
|
AnsiConsole.MarkupLine($"[grey]LOG:[/] {message}[grey]...[/]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
19
examples/Status/Status.csproj
Normal file
19
examples/Status/Status.csproj
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
|
<IsPackable>false</IsPackable>
|
||||||
|
<Title>Status</Title>
|
||||||
|
<Description>Demonstrates how to show status updates.</Description>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
@ -19,4 +19,4 @@ if(!$?) {
|
|||||||
Pop-Location
|
Pop-Location
|
||||||
|
|
||||||
# Copy the files to the correct location
|
# Copy the files to the correct location
|
||||||
Copy-Item (Join-Path "$Output" "ProgressSpinner.Generated.cs") -Destination "$Source/Progress/ProgressSpinner.Generated.cs"
|
Copy-Item (Join-Path "$Output" "Spinner.Generated.cs") -Destination "$Source/Progress/Spinner.Generated.cs"
|
||||||
|
@ -21,8 +21,8 @@ namespace Generator.Commands
|
|||||||
{
|
{
|
||||||
// Read the spinner model.
|
// Read the spinner model.
|
||||||
var spinners = new List<Spinner>();
|
var spinners = new List<Spinner>();
|
||||||
spinners.AddRange(Spinner.Parse(File.ReadAllText("Data/spinners.json")));
|
|
||||||
spinners.AddRange(Spinner.Parse(File.ReadAllText("Data/spinners_default.json")));
|
spinners.AddRange(Spinner.Parse(File.ReadAllText("Data/spinners_default.json")));
|
||||||
|
spinners.AddRange(Spinner.Parse(File.ReadAllText("Data/spinners_sindresorhus.json")));
|
||||||
|
|
||||||
var output = new DirectoryPath(settings.Output);
|
var output = new DirectoryPath(settings.Output);
|
||||||
if (!_fileSystem.Directory.Exists(settings.Output))
|
if (!_fileSystem.Directory.Exists(settings.Output))
|
||||||
@ -31,7 +31,7 @@ namespace Generator.Commands
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Parse the Scriban template.
|
// Parse the Scriban template.
|
||||||
var templatePath = new FilePath("Templates/ProgressSpinner.Generated.template");
|
var templatePath = new FilePath("Templates/Spinner.Generated.template");
|
||||||
var template = Template.Parse(File.ReadAllText(templatePath.FullPath));
|
var template = Template.Parse(File.ReadAllText(templatePath.FullPath));
|
||||||
|
|
||||||
// Render the template with the model.
|
// Render the template with the model.
|
||||||
|
@ -15,7 +15,10 @@
|
|||||||
<None Update="Data\colors.json">
|
<None Update="Data\colors.json">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="Data\spinners.json">
|
<None Update="Data\spinners_default.json">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="Data\spinners_sindresorhus.json">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="Templates\ColorTable.Generated.template">
|
<None Update="Templates\ColorTable.Generated.template">
|
||||||
@ -27,7 +30,7 @@
|
|||||||
<None Update="Templates\ColorPalette.Generated.template">
|
<None Update="Templates\ColorPalette.Generated.template">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="Templates\ProgressSpinner.Generated.template">
|
<None Update="Templates\Spinner.Generated.template">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="Templates\Emoji.Json.template">
|
<None Update="Templates\Emoji.Json.template">
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Generated {{ date.now | date.to_string `%F %R` }}
|
// Generated {{ date.now | date.to_string `%F %R` }}
|
||||||
// Generated from https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json
|
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Generated {{ date.now | date.to_string `%F %R` }}
|
// Generated {{ date.now | date.to_string `%F %R` }}
|
||||||
//
|
//
|
||||||
|
// Partly generated from
|
||||||
|
// https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json
|
||||||
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
@ -13,10 +16,10 @@ using System.Collections.Generic;
|
|||||||
|
|
||||||
namespace Spectre.Console
|
namespace Spectre.Console
|
||||||
{
|
{
|
||||||
public abstract partial class ProgressSpinner
|
public abstract partial class Spinner
|
||||||
{
|
{
|
||||||
{{~ for spinner in spinners ~}}
|
{{~ for spinner in spinners ~}}
|
||||||
private sealed class {{ spinner.normalized_name }}Spinner : ProgressSpinner
|
private sealed class {{ spinner.normalized_name }}Spinner : Spinner
|
||||||
{
|
{
|
||||||
public override TimeSpan Interval => TimeSpan.FromMilliseconds({{ spinner.interval }});
|
public override TimeSpan Interval => TimeSpan.FromMilliseconds({{ spinner.interval }});
|
||||||
public override bool IsUnicode => {{ spinner.unicode }};
|
public override bool IsUnicode => {{ spinner.unicode }};
|
||||||
@ -38,7 +41,7 @@ namespace Spectre.Console
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the "{{ spinner.name }}" spinner.
|
/// Gets the "{{ spinner.name }}" spinner.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static ProgressSpinner {{ spinner.normalized_name }} { get; } = new {{ spinner.normalized_name }}Spinner();
|
public static Spinner {{ spinner.normalized_name }} { get; } = new {{ spinner.normalized_name }}Spinner();
|
||||||
{{~ end ~}}
|
{{~ end ~}}
|
||||||
}
|
}
|
||||||
}
|
}
|
25
src/Spectre.Console.Tests/Tools/DummySpinners.cs
Normal file
25
src/Spectre.Console.Tests/Tools/DummySpinners.cs
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace Spectre.Console.Tests
|
||||||
|
{
|
||||||
|
public sealed class DummySpinner1 : Spinner
|
||||||
|
{
|
||||||
|
public override TimeSpan Interval => TimeSpan.FromMilliseconds(100);
|
||||||
|
public override bool IsUnicode => true;
|
||||||
|
public override IReadOnlyList<string> Frames => new List<string>
|
||||||
|
{
|
||||||
|
"*",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class DummySpinner2 : Spinner
|
||||||
|
{
|
||||||
|
public override TimeSpan Interval => TimeSpan.FromMilliseconds(100);
|
||||||
|
public override bool IsUnicode => true;
|
||||||
|
public override IReadOnlyList<string> Frames => new List<string>
|
||||||
|
{
|
||||||
|
"-",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
42
src/Spectre.Console.Tests/Unit/StatusTests.cs
Normal file
42
src/Spectre.Console.Tests/Unit/StatusTests.cs
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
using Shouldly;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace Spectre.Console.Tests.Unit
|
||||||
|
{
|
||||||
|
public sealed partial class StatusTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Should_Render_Status_Correctly()
|
||||||
|
{
|
||||||
|
// Given
|
||||||
|
var console = new TestableAnsiConsole(ColorSystem.TrueColor, width: 10);
|
||||||
|
|
||||||
|
var status = new Status(console);
|
||||||
|
status.AutoRefresh = false;
|
||||||
|
status.Spinner = new DummySpinner1();
|
||||||
|
|
||||||
|
// When
|
||||||
|
status.Start("foo", ctx =>
|
||||||
|
{
|
||||||
|
ctx.Refresh();
|
||||||
|
ctx.Spinner(new DummySpinner2());
|
||||||
|
ctx.Status("bar");
|
||||||
|
ctx.Refresh();
|
||||||
|
ctx.Spinner(new DummySpinner1());
|
||||||
|
ctx.Status("baz");
|
||||||
|
});
|
||||||
|
|
||||||
|
// Then
|
||||||
|
console.Output
|
||||||
|
.NormalizeLineEndings()
|
||||||
|
.ShouldBe(
|
||||||
|
"[?25l \n" +
|
||||||
|
"[38;5;11m*[0m foo\n" +
|
||||||
|
" [1A[1A \n" +
|
||||||
|
"[38;5;11m-[0m bar\n" +
|
||||||
|
" [1A[1A \n" +
|
||||||
|
"[38;5;11m*[0m baz\n" +
|
||||||
|
" [2K[1A[2K[1A[2K[?25h");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -60,6 +60,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.ImageSharp"
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Progress", "..\examples\Progress\Progress.csproj", "{2B712A52-40F1-4C1C-833E-7C869ACA91F3}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Progress", "..\examples\Progress\Progress.csproj", "{2B712A52-40F1-4C1C-833E-7C869ACA91F3}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Status", "..\examples\Status\Status.csproj", "{3716AFDF-0904-4635-8422-86E6B9356840}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -310,6 +312,18 @@ Global
|
|||||||
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x64.Build.0 = Release|Any CPU
|
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x86.ActiveCfg = Release|Any CPU
|
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x86.Build.0 = Release|Any CPU
|
{2B712A52-40F1-4C1C-833E-7C869ACA91F3}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@ -333,6 +347,7 @@ Global
|
|||||||
{45BF6302-6553-4E52-BF0F-B10D1AA9A6D1} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
{45BF6302-6553-4E52-BF0F-B10D1AA9A6D1} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
||||||
{5693761A-754A-40A8-9144-36510D6A4D69} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
{5693761A-754A-40A8-9144-36510D6A4D69} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
||||||
{2B712A52-40F1-4C1C-833E-7C869ACA91F3} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
{2B712A52-40F1-4C1C-833E-7C869ACA91F3} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
||||||
|
{3716AFDF-0904-4635-8422-86E6B9356840} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {5729B071-67A0-48FB-8B1B-275E6822086C}
|
SolutionGuid = {5729B071-67A0-48FB-8B1B-275E6822086C}
|
||||||
|
@ -13,5 +13,14 @@ namespace Spectre.Console
|
|||||||
{
|
{
|
||||||
return Console.Progress();
|
return Console.Progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a new <see cref="Status"/> instance.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A <see cref="Status"/> instance.</returns>
|
||||||
|
public static Status Status()
|
||||||
|
{
|
||||||
|
return Console.Status();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,5 +21,20 @@ namespace Spectre.Console
|
|||||||
|
|
||||||
return new Progress(console);
|
return new Progress(console);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a new <see cref="Status"/> instance for the console.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="console">The console.</param>
|
||||||
|
/// <returns>A <see cref="Status"/> instance.</returns>
|
||||||
|
public static Status Status(this IAnsiConsole console)
|
||||||
|
{
|
||||||
|
if (console is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(console));
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Status(console);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,19 +13,18 @@ namespace Spectre.Console
|
|||||||
/// <param name="column">The column.</param>
|
/// <param name="column">The column.</param>
|
||||||
/// <param name="style">The style.</param>
|
/// <param name="style">The style.</param>
|
||||||
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
public static SpinnerColumn Style(this SpinnerColumn column, Style style)
|
public static SpinnerColumn Style(this SpinnerColumn column, Style? style)
|
||||||
{
|
{
|
||||||
if (column is null)
|
if (column is null)
|
||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(column));
|
throw new ArgumentNullException(nameof(column));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (style is null)
|
if (style != null)
|
||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(style));
|
column.Style = style;
|
||||||
}
|
}
|
||||||
|
|
||||||
column.Style = style;
|
|
||||||
return column;
|
return column;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
61
src/Spectre.Console/Extensions/StatusContextExtensions.cs
Normal file
61
src/Spectre.Console/Extensions/StatusContextExtensions.cs
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Spectre.Console
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Contains extension methods for <see cref="StatusContext"/>.
|
||||||
|
/// </summary>
|
||||||
|
public static class StatusContextExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the status message.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">The status context.</param>
|
||||||
|
/// <param name="status">The status message.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static StatusContext Status(this StatusContext context, string status)
|
||||||
|
{
|
||||||
|
if (context is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
context.Status = status;
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the spinner.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">The status context.</param>
|
||||||
|
/// <param name="spinner">The spinner.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static StatusContext Spinner(this StatusContext context, Spinner spinner)
|
||||||
|
{
|
||||||
|
if (context is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
context.Spinner = spinner;
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the spinner style.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">The status context.</param>
|
||||||
|
/// <param name="style">The spinner style.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static StatusContext SpinnerStyle(this StatusContext context, Style? style)
|
||||||
|
{
|
||||||
|
if (context is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
context.SpinnerStyle = style;
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
62
src/Spectre.Console/Extensions/StatusExtensions.cs
Normal file
62
src/Spectre.Console/Extensions/StatusExtensions.cs
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Spectre.Console
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Contains extension methods for <see cref="Status"/>.
|
||||||
|
/// </summary>
|
||||||
|
public static class StatusExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Sets whether or not auto refresh is enabled.
|
||||||
|
/// If disabled, you will manually have to refresh the progress.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="status">The <see cref="Status"/> instance.</param>
|
||||||
|
/// <param name="enabled">Whether or not auto refresh is enabled.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static Status AutoRefresh(this Status status, bool enabled)
|
||||||
|
{
|
||||||
|
if (status is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(status));
|
||||||
|
}
|
||||||
|
|
||||||
|
status.AutoRefresh = enabled;
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the spinner.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="status">The <see cref="Status"/> instance.</param>
|
||||||
|
/// <param name="spinner">The spinner.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static Status Spinner(this Status status, Spinner spinner)
|
||||||
|
{
|
||||||
|
if (status is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(status));
|
||||||
|
}
|
||||||
|
|
||||||
|
status.Spinner = spinner;
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the spinner style.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="status">The <see cref="Status"/> instance.</param>
|
||||||
|
/// <param name="style">The spinner style.</param>
|
||||||
|
/// <returns>The same instance so that multiple calls can be chained.</returns>
|
||||||
|
public static Status SpinnerStyle(this Status status, Style? style)
|
||||||
|
{
|
||||||
|
if (status is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(status));
|
||||||
|
}
|
||||||
|
|
||||||
|
status.SpinnerStyle = style;
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -8,9 +8,6 @@ namespace Spectre.Console
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class PercentageColumn : ProgressColumn
|
public sealed class PercentageColumn : ProgressColumn
|
||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
|
||||||
protected internal override int? ColumnWidth => 4;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the style for a non-complete task.
|
/// Gets or sets the style for a non-complete task.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -28,5 +25,11 @@ namespace Spectre.Console
|
|||||||
var style = percentage == 100 ? CompletedStyle : Style ?? Style.Plain;
|
var style = percentage == 100 ? CompletedStyle : Style ?? Style.Plain;
|
||||||
return new Text($"{percentage}%", style).RightAligned();
|
return new Text($"{percentage}%", style).RightAligned();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override int? GetColumnWidth(RenderContext context)
|
||||||
|
{
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,9 +8,6 @@ namespace Spectre.Console
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class RemainingTimeColumn : ProgressColumn
|
public sealed class RemainingTimeColumn : ProgressColumn
|
||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
|
||||||
protected internal override int? ColumnWidth => 7;
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
protected internal override bool NoWrap => true;
|
protected internal override bool NoWrap => true;
|
||||||
|
|
||||||
@ -30,5 +27,11 @@ namespace Spectre.Console
|
|||||||
|
|
||||||
return new Text($"{remaining.Value:h\\:mm\\:ss}", Style ?? Style.Plain);
|
return new Text($"{remaining.Value:h\\:mm\\:ss}", Style ?? Style.Plain);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override int? GetColumnWidth(RenderContext context)
|
||||||
|
{
|
||||||
|
return 7;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,25 +13,39 @@ namespace Spectre.Console
|
|||||||
private const string ACCUMULATED = "SPINNER_ACCUMULATED";
|
private const string ACCUMULATED = "SPINNER_ACCUMULATED";
|
||||||
private const string INDEX = "SPINNER_INDEX";
|
private const string INDEX = "SPINNER_INDEX";
|
||||||
|
|
||||||
private readonly ProgressSpinner _spinner;
|
private readonly object _lock;
|
||||||
private int? _maxLength;
|
private Spinner _spinner;
|
||||||
|
private int? _maxWidth;
|
||||||
/// <inheritdoc/>
|
|
||||||
protected internal override int? ColumnWidth => 1;
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
protected internal override bool NoWrap => true;
|
protected internal override bool NoWrap => true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the <see cref="Console.Spinner"/>.
|
||||||
|
/// </summary>
|
||||||
|
public Spinner Spinner
|
||||||
|
{
|
||||||
|
get => _spinner;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
_spinner = value ?? Spinner.Known.Default;
|
||||||
|
_maxWidth = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the style of the spinner.
|
/// Gets or sets the style of the spinner.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Style Style { get; set; } = new Style(foreground: Color.Yellow);
|
public Style? Style { get; set; } = new Style(foreground: Color.Yellow);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="SpinnerColumn"/> class.
|
/// Initializes a new instance of the <see cref="SpinnerColumn"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SpinnerColumn()
|
public SpinnerColumn()
|
||||||
: this(ProgressSpinner.Known.Default)
|
: this(Spinner.Known.Default)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,36 +53,55 @@ namespace Spectre.Console
|
|||||||
/// Initializes a new instance of the <see cref="SpinnerColumn"/> class.
|
/// Initializes a new instance of the <see cref="SpinnerColumn"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="spinner">The spinner to use.</param>
|
/// <param name="spinner">The spinner to use.</param>
|
||||||
public SpinnerColumn(ProgressSpinner spinner)
|
public SpinnerColumn(Spinner spinner)
|
||||||
{
|
{
|
||||||
_spinner = spinner ?? throw new ArgumentNullException(nameof(spinner));
|
_spinner = spinner ?? throw new ArgumentNullException(nameof(spinner));
|
||||||
|
_lock = new object();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public override IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime)
|
public override IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime)
|
||||||
{
|
{
|
||||||
var useAscii = (context.LegacyConsole || !context.Unicode) && _spinner.IsUnicode;
|
var useAscii = (context.LegacyConsole || !context.Unicode) && _spinner.IsUnicode;
|
||||||
var spinner = useAscii ? ProgressSpinner.Known.Ascii : _spinner;
|
var spinner = useAscii ? Spinner.Known.Ascii : _spinner ?? Spinner.Known.Default;
|
||||||
|
|
||||||
if (!task.IsStarted || task.IsFinished)
|
if (!task.IsStarted || task.IsFinished)
|
||||||
{
|
{
|
||||||
if (_maxLength == null)
|
return new Markup(new string(' ', GetMaxWidth(context)));
|
||||||
{
|
|
||||||
_maxLength = _spinner.Frames.Max(frame => Cell.GetCellLength(context, frame));
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Markup(new string(' ', _maxLength.Value));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var accumulated = task.State.Update<double>(ACCUMULATED, acc => acc + deltaTime.TotalMilliseconds);
|
var accumulated = task.State.Update<double>(ACCUMULATED, acc => acc + deltaTime.TotalMilliseconds);
|
||||||
if (accumulated >= _spinner.Interval.TotalMilliseconds)
|
if (accumulated >= spinner.Interval.TotalMilliseconds)
|
||||||
{
|
{
|
||||||
task.State.Update<double>(ACCUMULATED, _ => 0);
|
task.State.Update<double>(ACCUMULATED, _ => 0);
|
||||||
task.State.Update<int>(INDEX, index => index + 1);
|
task.State.Update<int>(INDEX, index => index + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
var index = task.State.Get<int>(INDEX);
|
var index = task.State.Get<int>(INDEX);
|
||||||
return new Markup(spinner.Frames[index % spinner.Frames.Count], Style ?? Style.Plain);
|
var frame = spinner.Frames[index % spinner.Frames.Count];
|
||||||
|
return new Markup(frame.EscapeMarkup(), Style ?? Style.Plain);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override int? GetColumnWidth(RenderContext context)
|
||||||
|
{
|
||||||
|
return GetMaxWidth(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int GetMaxWidth(RenderContext context)
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
if (_maxWidth == null)
|
||||||
|
{
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
|
||||||
|
return _maxWidth.Value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,8 @@ namespace Spectre.Console
|
|||||||
|
|
||||||
internal List<ProgressColumn> Columns { get; }
|
internal List<ProgressColumn> Columns { get; }
|
||||||
|
|
||||||
|
internal ProgressRenderer? FallbackRenderer { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="Progress"/> class.
|
/// Initializes a new instance of the <see cref="Progress"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -116,11 +118,11 @@ namespace Spectre.Console
|
|||||||
if (interactive)
|
if (interactive)
|
||||||
{
|
{
|
||||||
var columns = new List<ProgressColumn>(Columns);
|
var columns = new List<ProgressColumn>(Columns);
|
||||||
return new InteractiveProgressRenderer(_console, columns, RefreshRate);
|
return new DefaultProgressRenderer(_console, columns, RefreshRate);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return new NonInteractiveProgressRenderer();
|
return FallbackRenderer ?? new FallbackProgressRenderer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,11 +13,6 @@ namespace Spectre.Console
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal virtual bool NoWrap { get; }
|
protected internal virtual bool NoWrap { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the requested column width for the column.
|
|
||||||
/// </summary>
|
|
||||||
protected internal virtual int? ColumnWidth { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a renderable representing the column.
|
/// Gets a renderable representing the column.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -26,5 +21,15 @@ namespace Spectre.Console
|
|||||||
/// <param name="deltaTime">The elapsed time since last call.</param>
|
/// <param name="deltaTime">The elapsed time since last call.</param>
|
||||||
/// <returns>A renderable representing the column.</returns>
|
/// <returns>A renderable representing the column.</returns>
|
||||||
public abstract IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime);
|
public abstract IRenderable Render(RenderContext context, ProgressTask task, TimeSpan deltaTime);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the width of the column.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">The context.</param>
|
||||||
|
/// <returns>The width of the column, or <c>null</c> to calculate.</returns>
|
||||||
|
public virtual int? GetColumnWidth(RenderContext context)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
using Spectre.Console.Internal;
|
using Spectre.Console.Internal;
|
||||||
|
|
||||||
namespace Spectre.Console
|
namespace Spectre.Console
|
||||||
@ -21,6 +22,8 @@ namespace Spectre.Console
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsFinished => _tasks.All(task => task.IsFinished);
|
public bool IsFinished => _tasks.All(task => task.IsFinished);
|
||||||
|
|
||||||
|
internal Encoding Encoding => _console.Encoding;
|
||||||
|
|
||||||
internal ProgressContext(IAnsiConsole console, ProgressRenderer renderer)
|
internal ProgressContext(IAnsiConsole console, ProgressRenderer renderer)
|
||||||
{
|
{
|
||||||
_tasks = new List<ProgressTask>();
|
_tasks = new List<ProgressTask>();
|
||||||
@ -56,14 +59,11 @@ namespace Spectre.Console
|
|||||||
_console.Render(new ControlSequence(string.Empty));
|
_console.Render(new ControlSequence(string.Empty));
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void EnumerateTasks(Action<ProgressTask> action)
|
internal IReadOnlyList<ProgressTask> GetTasks()
|
||||||
{
|
{
|
||||||
lock (_taskLock)
|
lock (_taskLock)
|
||||||
{
|
{
|
||||||
foreach (var task in _tasks)
|
return new List<ProgressTask>(_tasks);
|
||||||
{
|
|
||||||
action(task);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ using Spectre.Console.Rendering;
|
|||||||
|
|
||||||
namespace Spectre.Console.Internal
|
namespace Spectre.Console.Internal
|
||||||
{
|
{
|
||||||
internal sealed class InteractiveProgressRenderer : ProgressRenderer
|
internal sealed class DefaultProgressRenderer : ProgressRenderer
|
||||||
{
|
{
|
||||||
private readonly IAnsiConsole _console;
|
private readonly IAnsiConsole _console;
|
||||||
private readonly List<ProgressColumn> _columns;
|
private readonly List<ProgressColumn> _columns;
|
||||||
@ -17,7 +17,7 @@ namespace Spectre.Console.Internal
|
|||||||
|
|
||||||
public override TimeSpan RefreshRate { get; }
|
public override TimeSpan RefreshRate { get; }
|
||||||
|
|
||||||
public InteractiveProgressRenderer(IAnsiConsole console, List<ProgressColumn> columns, TimeSpan refreshRate)
|
public DefaultProgressRenderer(IAnsiConsole console, List<ProgressColumn> columns, TimeSpan refreshRate)
|
||||||
{
|
{
|
||||||
_console = console ?? throw new ArgumentNullException(nameof(console));
|
_console = console ?? throw new ArgumentNullException(nameof(console));
|
||||||
_columns = columns ?? throw new ArgumentNullException(nameof(columns));
|
_columns = columns ?? throw new ArgumentNullException(nameof(columns));
|
||||||
@ -60,6 +60,8 @@ namespace Spectre.Console.Internal
|
|||||||
_stopwatch.Start();
|
_stopwatch.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var renderContext = new RenderContext(_console.Encoding, _console.Capabilities.LegacyConsole);
|
||||||
|
|
||||||
var delta = _stopwatch.Elapsed - _lastUpdate;
|
var delta = _stopwatch.Elapsed - _lastUpdate;
|
||||||
_lastUpdate = _stopwatch.Elapsed;
|
_lastUpdate = _stopwatch.Elapsed;
|
||||||
|
|
||||||
@ -68,9 +70,10 @@ namespace Spectre.Console.Internal
|
|||||||
{
|
{
|
||||||
var column = new GridColumn().PadRight(1);
|
var column = new GridColumn().PadRight(1);
|
||||||
|
|
||||||
if (_columns[columnIndex].ColumnWidth != null)
|
var columnWidth = _columns[columnIndex].GetColumnWidth(renderContext);
|
||||||
|
if (columnWidth != null)
|
||||||
{
|
{
|
||||||
column.Width = _columns[columnIndex].ColumnWidth;
|
column.Width = columnWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_columns[columnIndex].NoWrap)
|
if (_columns[columnIndex].NoWrap)
|
||||||
@ -88,12 +91,11 @@ namespace Spectre.Console.Internal
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add rows
|
// Add rows
|
||||||
var renderContext = new RenderContext(_console.Encoding, _console.Capabilities.LegacyConsole);
|
foreach (var task in context.GetTasks())
|
||||||
context.EnumerateTasks(task =>
|
|
||||||
{
|
{
|
||||||
var columns = _columns.Select(column => column.Render(renderContext, task, delta));
|
var columns = _columns.Select(column => column.Render(renderContext, task, delta));
|
||||||
grid.AddRow(columns.ToArray());
|
grid.AddRow(columns.ToArray());
|
||||||
});
|
}
|
||||||
|
|
||||||
_live.SetRenderable(new Padder(grid, new Padding(0, 1)));
|
_live.SetRenderable(new Padder(grid, new Padding(0, 1)));
|
||||||
}
|
}
|
@ -4,7 +4,7 @@ using Spectre.Console.Rendering;
|
|||||||
|
|
||||||
namespace Spectre.Console.Internal
|
namespace Spectre.Console.Internal
|
||||||
{
|
{
|
||||||
internal sealed class NonInteractiveProgressRenderer : ProgressRenderer
|
internal sealed class FallbackProgressRenderer : ProgressRenderer
|
||||||
{
|
{
|
||||||
private const double FirstMilestone = 25;
|
private const double FirstMilestone = 25;
|
||||||
private static readonly double?[] _milestones = new double?[] { FirstMilestone, 50, 75, 95, 96, 97, 98, 99, 100 };
|
private static readonly double?[] _milestones = new double?[] { FirstMilestone, 50, 75, 95, 96, 97, 98, 99, 100 };
|
||||||
@ -16,7 +16,7 @@ namespace Spectre.Console.Internal
|
|||||||
|
|
||||||
public override TimeSpan RefreshRate => TimeSpan.FromSeconds(1);
|
public override TimeSpan RefreshRate => TimeSpan.FromSeconds(1);
|
||||||
|
|
||||||
public NonInteractiveProgressRenderer()
|
public FallbackProgressRenderer()
|
||||||
{
|
{
|
||||||
_taskMilestones = new Dictionary<int, double>();
|
_taskMilestones = new Dictionary<int, double>();
|
||||||
_lock = new object();
|
_lock = new object();
|
||||||
@ -29,7 +29,7 @@ namespace Spectre.Console.Internal
|
|||||||
var hasStartedTasks = false;
|
var hasStartedTasks = false;
|
||||||
var updates = new List<(string, double)>();
|
var updates = new List<(string, double)>();
|
||||||
|
|
||||||
context.EnumerateTasks(task =>
|
foreach (var task in context.GetTasks())
|
||||||
{
|
{
|
||||||
if (!task.IsStarted || task.IsFinished)
|
if (!task.IsStarted || task.IsFinished)
|
||||||
{
|
{
|
||||||
@ -42,12 +42,15 @@ namespace Spectre.Console.Internal
|
|||||||
{
|
{
|
||||||
updates.Add((task.Description, task.Percentage));
|
updates.Add((task.Description, task.Percentage));
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
// Got started tasks but no updates for 30 seconds?
|
// Got started tasks but no updates for 30 seconds?
|
||||||
if (hasStartedTasks && updates.Count == 0 && (DateTime.Now - _lastUpdate) > TimeSpan.FromSeconds(30))
|
if (hasStartedTasks && updates.Count == 0 && (DateTime.Now - _lastUpdate) > TimeSpan.FromSeconds(30))
|
||||||
{
|
{
|
||||||
context.EnumerateTasks(task => updates.Add((task.Description, task.Percentage)));
|
foreach (var task in context.GetTasks())
|
||||||
|
{
|
||||||
|
updates.Add((task.Description, task.Percentage));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (updates.Count > 0)
|
if (updates.Count > 0)
|
@ -0,0 +1,60 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using Spectre.Console.Rendering;
|
||||||
|
|
||||||
|
namespace Spectre.Console.Internal
|
||||||
|
{
|
||||||
|
internal sealed class StatusFallbackRenderer : ProgressRenderer
|
||||||
|
{
|
||||||
|
private readonly object _lock;
|
||||||
|
private IRenderable? _renderable;
|
||||||
|
private string? _lastStatus;
|
||||||
|
|
||||||
|
public override TimeSpan RefreshRate => TimeSpan.FromSeconds(1);
|
||||||
|
|
||||||
|
public StatusFallbackRenderer()
|
||||||
|
{
|
||||||
|
_lock = new object();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Update(ProgressContext context)
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
var task = context.GetTasks().SingleOrDefault();
|
||||||
|
if (task != null)
|
||||||
|
{
|
||||||
|
// Not same description?
|
||||||
|
if (_lastStatus != task.Description)
|
||||||
|
{
|
||||||
|
_lastStatus = task.Description;
|
||||||
|
_renderable = new Markup(task.Description + Environment.NewLine);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_renderable = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override IEnumerable<IRenderable> Process(RenderContext context, IEnumerable<IRenderable> renderables)
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
var result = new List<IRenderable>();
|
||||||
|
result.AddRange(renderables);
|
||||||
|
|
||||||
|
if (_renderable != null)
|
||||||
|
{
|
||||||
|
result.Add(_renderable);
|
||||||
|
}
|
||||||
|
|
||||||
|
_renderable = null;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@ namespace Spectre.Console
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a spinner used in a <see cref="SpinnerColumn"/>.
|
/// Represents a spinner used in a <see cref="SpinnerColumn"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract partial class ProgressSpinner
|
public abstract partial class Spinner
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the update interval for the spinner.
|
/// Gets the update interval for the spinner.
|
89
src/Spectre.Console/Progress/Status.cs
Normal file
89
src/Spectre.Console/Progress/Status.cs
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Spectre.Console.Internal;
|
||||||
|
|
||||||
|
namespace Spectre.Console
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a status display.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class Status
|
||||||
|
{
|
||||||
|
private readonly IAnsiConsole _console;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the spinner.
|
||||||
|
/// </summary>
|
||||||
|
public Spinner? Spinner { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the spinner style.
|
||||||
|
/// </summary>
|
||||||
|
public Style? SpinnerStyle { get; set; } = new Style(foreground: Color.Yellow);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether or not status
|
||||||
|
/// should auto refresh. Defaults to <c>true</c>.
|
||||||
|
/// </summary>
|
||||||
|
public bool AutoRefresh { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="Status"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="console">The console.</param>
|
||||||
|
public Status(IAnsiConsole console)
|
||||||
|
{
|
||||||
|
_console = console ?? throw new ArgumentNullException(nameof(console));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Starts a new status display.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="status">The status to display.</param>
|
||||||
|
/// <param name="action">he action to execute.</param>
|
||||||
|
public void Start(string status, Action<StatusContext> action)
|
||||||
|
{
|
||||||
|
var task = StartAsync(status, ctx =>
|
||||||
|
{
|
||||||
|
action(ctx);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
});
|
||||||
|
|
||||||
|
task.GetAwaiter().GetResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Starts a new status display.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="status">The status to display.</param>
|
||||||
|
/// <param name="action">he action to execute.</param>
|
||||||
|
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
|
||||||
|
public async Task StartAsync(string status, Func<StatusContext, Task> action)
|
||||||
|
{
|
||||||
|
// Set the progress columns
|
||||||
|
var spinnerColumn = new SpinnerColumn(Spinner ?? Spinner.Known.Default)
|
||||||
|
{
|
||||||
|
Style = SpinnerStyle ?? Style.Plain,
|
||||||
|
};
|
||||||
|
|
||||||
|
var progress = new Progress(_console)
|
||||||
|
{
|
||||||
|
FallbackRenderer = new StatusFallbackRenderer(),
|
||||||
|
AutoClear = true,
|
||||||
|
AutoRefresh = AutoRefresh,
|
||||||
|
};
|
||||||
|
|
||||||
|
progress.Columns(new ProgressColumn[]
|
||||||
|
{
|
||||||
|
spinnerColumn,
|
||||||
|
new TaskDescriptionColumn(),
|
||||||
|
});
|
||||||
|
|
||||||
|
await progress.StartAsync(async ctx =>
|
||||||
|
{
|
||||||
|
var statusContext = new StatusContext(ctx, ctx.AddTask(status), spinnerColumn);
|
||||||
|
await action(statusContext).ConfigureAwait(false);
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
76
src/Spectre.Console/Progress/StatusContext.cs
Normal file
76
src/Spectre.Console/Progress/StatusContext.cs
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Spectre.Console
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a context that can be used to interact with a <see cref="Status"/>.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class StatusContext
|
||||||
|
{
|
||||||
|
private readonly ProgressContext _context;
|
||||||
|
private readonly ProgressTask _task;
|
||||||
|
private readonly SpinnerColumn _spinnerColumn;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the current status.
|
||||||
|
/// </summary>
|
||||||
|
public string Status
|
||||||
|
{
|
||||||
|
get => _task.Description;
|
||||||
|
set => SetStatus(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the current spinner.
|
||||||
|
/// </summary>
|
||||||
|
public Spinner Spinner
|
||||||
|
{
|
||||||
|
get => _spinnerColumn.Spinner;
|
||||||
|
set => SetSpinner(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the current spinner style.
|
||||||
|
/// </summary>
|
||||||
|
public Style? SpinnerStyle
|
||||||
|
{
|
||||||
|
get => _spinnerColumn.Style;
|
||||||
|
set => _spinnerColumn.Style = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal StatusContext(ProgressContext context, ProgressTask task, SpinnerColumn spinnerColumn)
|
||||||
|
{
|
||||||
|
_context = context ?? throw new ArgumentNullException(nameof(context));
|
||||||
|
_task = task ?? throw new ArgumentNullException(nameof(task));
|
||||||
|
_spinnerColumn = spinnerColumn ?? throw new ArgumentNullException(nameof(spinnerColumn));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Refreshes the status.
|
||||||
|
/// </summary>
|
||||||
|
public void Refresh()
|
||||||
|
{
|
||||||
|
_context.Refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetStatus(string status)
|
||||||
|
{
|
||||||
|
if (status is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(status));
|
||||||
|
}
|
||||||
|
|
||||||
|
_task.Description = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetSpinner(Spinner spinner)
|
||||||
|
{
|
||||||
|
if (spinner is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(spinner));
|
||||||
|
}
|
||||||
|
|
||||||
|
_spinnerColumn.Spinner = spinner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,4 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using Spectre.Console.Internal;
|
using Spectre.Console.Internal;
|
||||||
|
|
||||||
namespace Spectre.Console.Rendering
|
namespace Spectre.Console.Rendering
|
||||||
@ -8,7 +7,7 @@ namespace Spectre.Console.Rendering
|
|||||||
{
|
{
|
||||||
private readonly object _lock = new object();
|
private readonly object _lock = new object();
|
||||||
private IRenderable? _renderable;
|
private IRenderable? _renderable;
|
||||||
private int? _height;
|
private SegmentShape? _shape;
|
||||||
|
|
||||||
public void SetRenderable(IRenderable renderable)
|
public void SetRenderable(IRenderable renderable)
|
||||||
{
|
{
|
||||||
@ -22,12 +21,12 @@ namespace Spectre.Console.Rendering
|
|||||||
{
|
{
|
||||||
lock (_lock)
|
lock (_lock)
|
||||||
{
|
{
|
||||||
if (_height == null)
|
if (_shape == null)
|
||||||
{
|
{
|
||||||
return new ControlSequence(string.Empty);
|
return new ControlSequence(string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new ControlSequence("\r" + "\u001b[1A".Repeat(_height.Value - 1));
|
return new ControlSequence("\r" + "\u001b[1A".Repeat(_shape.Value.Height - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,12 +34,12 @@ namespace Spectre.Console.Rendering
|
|||||||
{
|
{
|
||||||
lock (_lock)
|
lock (_lock)
|
||||||
{
|
{
|
||||||
if (_height == null)
|
if (_shape == null)
|
||||||
{
|
{
|
||||||
return new ControlSequence(string.Empty);
|
return new ControlSequence(string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new ControlSequence("\r\u001b[2K" + "\u001b[1A\u001b[2K".Repeat(_height.Value - 1));
|
return new ControlSequence("\r\u001b[2K" + "\u001b[1A\u001b[2K".Repeat(_shape.Value.Height - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,27 +52,27 @@ namespace Spectre.Console.Rendering
|
|||||||
var segments = _renderable.Render(context, maxWidth);
|
var segments = _renderable.Render(context, maxWidth);
|
||||||
var lines = Segment.SplitLines(context, segments);
|
var lines = Segment.SplitLines(context, segments);
|
||||||
|
|
||||||
_height = lines.Count;
|
var shape = SegmentShape.Calculate(context, lines);
|
||||||
|
_shape = _shape == null ? shape : _shape.Value.Inflate(shape);
|
||||||
|
_shape.Value.SetShape(context, lines);
|
||||||
|
|
||||||
var result = new List<Segment>();
|
|
||||||
foreach (var (_, _, last, line) in lines.Enumerate())
|
foreach (var (_, _, last, line) in lines.Enumerate())
|
||||||
{
|
{
|
||||||
foreach (var item in line)
|
foreach (var item in line)
|
||||||
{
|
{
|
||||||
result.Add(item);
|
yield return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!last)
|
if (!last)
|
||||||
{
|
{
|
||||||
result.Add(Segment.LineBreak);
|
yield return Segment.LineBreak;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
yield break;
|
||||||
}
|
}
|
||||||
|
|
||||||
_height = 0;
|
_shape = null;
|
||||||
return Enumerable.Empty<Segment>();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -599,6 +599,7 @@ namespace Spectre.Console.Rendering
|
|||||||
return stack.ToList();
|
return stack.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Move this to Table
|
||||||
internal static List<List<SegmentLine>> MakeSameHeight(int cellHeight, List<List<SegmentLine>> cells)
|
internal static List<List<SegmentLine>> MakeSameHeight(int cellHeight, List<List<SegmentLine>> cells)
|
||||||
{
|
{
|
||||||
if (cells is null)
|
if (cells is null)
|
||||||
@ -619,5 +620,49 @@ namespace Spectre.Console.Rendering
|
|||||||
|
|
||||||
return cells;
|
return cells;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static (int Width, int Height) GetShape(RenderContext context, List<SegmentLine> lines)
|
||||||
|
{
|
||||||
|
if (context is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lines is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(lines));
|
||||||
|
}
|
||||||
|
|
||||||
|
var height = lines.Count;
|
||||||
|
var width = lines.Max(l => CellCount(context, l));
|
||||||
|
|
||||||
|
return (width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static List<SegmentLine> SetShape(RenderContext context, List<SegmentLine> lines, (int Width, int Height) shape)
|
||||||
|
{
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
var length = CellCount(context, line);
|
||||||
|
var missing = shape.Width - length;
|
||||||
|
if (missing > 0)
|
||||||
|
{
|
||||||
|
line.Add(new Segment(new string(' ', missing)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lines.Count < shape.Height)
|
||||||
|
{
|
||||||
|
var missing = shape.Height - lines.Count;
|
||||||
|
for (int i = 0; i < missing; i++)
|
||||||
|
{
|
||||||
|
var line = new SegmentLine();
|
||||||
|
line.Add(new Segment(new string(' ', shape.Width)));
|
||||||
|
lines.Add(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return lines;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
67
src/Spectre.Console/Rendering/SegmentShape.cs
Normal file
67
src/Spectre.Console/Rendering/SegmentShape.cs
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace Spectre.Console.Rendering
|
||||||
|
{
|
||||||
|
internal readonly struct SegmentShape
|
||||||
|
{
|
||||||
|
public int Width { get; }
|
||||||
|
public int Height { get; }
|
||||||
|
|
||||||
|
public SegmentShape(int width, int height)
|
||||||
|
{
|
||||||
|
Width = width;
|
||||||
|
Height = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SegmentShape Calculate(RenderContext context, List<SegmentLine> lines)
|
||||||
|
{
|
||||||
|
if (context is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lines is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(lines));
|
||||||
|
}
|
||||||
|
|
||||||
|
var height = lines.Count;
|
||||||
|
var width = lines.Max(l => Segment.CellCount(context, l));
|
||||||
|
|
||||||
|
return new SegmentShape(width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SegmentShape Inflate(SegmentShape other)
|
||||||
|
{
|
||||||
|
return new SegmentShape(
|
||||||
|
Math.Max(Width, other.Width),
|
||||||
|
Math.Max(Height, other.Height));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetShape(RenderContext context, List<SegmentLine> lines)
|
||||||
|
{
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
var length = Segment.CellCount(context, line);
|
||||||
|
var missing = Width - length;
|
||||||
|
if (missing > 0)
|
||||||
|
{
|
||||||
|
line.Add(new Segment(new string(' ', missing)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lines.Count < Height)
|
||||||
|
{
|
||||||
|
var missing = Height - lines.Count;
|
||||||
|
for (var i = 0; i < missing; i++)
|
||||||
|
{
|
||||||
|
var line = new SegmentLine();
|
||||||
|
line.Add(new Segment(new string(' ', Width)));
|
||||||
|
lines.Add(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user