tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-11-01 01:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set max value for progress task properly

Browse Source 
Also clamp the task value if it's greater than the max value.

Closes #163
This commit is contained in:
Patrik Svensson
2020-12-12 16:58:39 +01:00
committed by Patrik Svensson
parent acf01e056f
commit 63abcc92ba
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/Spectre.Console.Tests/Expectations/ProgressTests.Foo.verified.txt → src/Spectre.Console.Tests/Expectations/ProgressTests.Should_Reduce_Width_If_Needed.verified.txt
View File

26
src/Spectre.Console.Tests/Unit/ProgressTests.cs
View File

@@ -59,7 +59,7 @@ namespace Spectre.Console.Tests.Unit
}
[Fact]
public Task Foo()
public Task Should_Reduce_Width_If_Needed()
{
// Given
var console = new PlainConsole(width: 20);
@@ -87,5 +87,29 @@ namespace Spectre.Console.Tests.Unit
// Then
return Verifier.Verify(console.Output);
}
[Fact]
public void Setting_Max_Value_Should_Set_The_MaxValue_And_Cap_Value()
{
// Given
var task = default(ProgressTask);
var console = new PlainConsole();
var progress = new Progress(console)
.Columns(new[] { new ProgressBarColumn() })
.AutoRefresh(false)
.AutoClear(false);
// When
progress.Start(ctx =>
{
task = ctx.AddTask("foo");
task.Increment(100);
task.MaxValue = 20;
});
// Then
task.MaxValue.ShouldBe(20);
task.Value.ShouldBe(20);
}
}
}

8
src/Spectre.Console/Progress/ProgressTask.cs
View File

@@ -167,7 +167,7 @@ namespace Spectre.Console
if (maxValue != null)
{
_maxValue += maxValue.Value;
_maxValue = maxValue.Value;
}
if (increment != null)
@@ -175,6 +175,12 @@ namespace Spectre.Console
Value += increment.Value;
}
// Need to cap the max value?
if (Value > _maxValue)
{
Value = _maxValue;
}
var timestamp = DateTime.Now;
var threshold = timestamp - TimeSpan.FromSeconds(30);