admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Minimal progress view to handle Activity that is longer than console width (#15264)

Browse Source
This commit is contained in:
Steve Lee
2021-05-17 09:54:37 -07:00
committed by GitHub
parent 38d582f038
commit 364e74a00a
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs
+26 -6
View File
@@ -387,14 +387,26 @@ namespace Microsoft.PowerShell
maxWidth = PSStyle.Instance.Progress.MaxWidth;
}
// if the activity is really long, only use up to half the width
string activity;
if (Activity.Length > maxWidth / 2)
{
activity = Activity.Substring(0, maxWidth / 2) + PSObjectHelper.Ellipsis;
}
else
{
activity = Activity;
}
// 4 is for the extra space and square brackets below and one extra space
int barWidth = maxWidth - Activity.Length - indentation - 4;
int barWidth = maxWidth - activity.Length - indentation - 4;
var sb = new StringBuilder();
int padding = maxWidth + PSStyle.Instance.Progress.Style.Length + PSStyle.Instance.Reverse.Length + PSStyle.Instance.ReverseOff.Length;
sb.Append(PSStyle.Instance.Reverse);
if (StatusDescription.Length > barWidth - secRemainLength)
int maxStatusLength = barWidth - secRemainLength - 1;
if (maxStatusLength > 0 && StatusDescription.Length > barWidth - secRemainLength)
{
sb.Append(StatusDescription.Substring(0, barWidth - secRemainLength - 1));
sb.Append(PSObjectHelper.Ellipsis);
@@ -404,10 +416,15 @@ namespace Microsoft.PowerShell
sb.Append(StatusDescription);
}
sb.Append(string.Empty.PadRight(barWidth + PSStyle.Instance.Reverse.Length - sb.Length - secRemainLength));
int emptyPadLength = barWidth + PSStyle.Instance.Reverse.Length - sb.Length - secRemainLength;
if (emptyPadLength > 0)
{
sb.Append(string.Empty.PadRight(emptyPadLength));
}
sb.Append(secRemain);
if (PercentComplete > 0 && PercentComplete < 100)
if (PercentComplete > 0 && PercentComplete < 100 && barWidth > 0)
{
int barLength = PercentComplete * barWidth / 100;
if (barLength >= barWidth)
@@ -415,7 +432,10 @@ namespace Microsoft.PowerShell
barLength = barWidth - 1;
}
sb.Insert(barLength + PSStyle.Instance.Reverse.Length, PSStyle.Instance.ReverseOff);
if (barLength < sb.Length)
{
sb.Insert(barLength + PSStyle.Instance.Reverse.Length, PSStyle.Instance.ReverseOff);
}
}
else
{
@@ -427,7 +447,7 @@ namespace Microsoft.PowerShell
"{0}{1}{2} [{3}]{4}",
indent,
PSStyle.Instance.Progress.Style,
Activity,
activity,
sb.ToString(),
PSStyle.Instance.Reset)
.PadRight(padding));
test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
+4
View File
@@ -22,4 +22,8 @@ Describe "Write-Progress DRT Unit Tests" -Tags "CI" {
It "all params works" -Pending {
{ Write-Progress -Activity 'myactivity' -Status 'mystatus' -Id 1 -ParentId 2 -Completed:$false -current 'current' -sec 1 -percent 1 } | Should -Not -Throw
}
It 'Activity longer than console width works' {
{ Write-Progress -Activity ('a' * ([console]::WindowWidth + 1)) -Status ('b' * ([console]::WindowWidth + 1)) -Id 1 } | Should -Not -Throw
}
}