Skip to content

Delay progress bar in Copy-Item and Remove-Item cmdlets #24013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 10 commits into from
Aug 20, 2024
Merged

Delay progress bar in Copy-Item and Remove-Item cmdlets #24013

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb51b3e
removing progressbar for less then 5 files
TheSpyGod Jul 3, 2024
2ade18e
Changed the progress bar to be 600ms timed
TheSpyGod Jul 4, 2024
0cc8a9a
Made both remove and copy display the progress bar after 200ms
TheSpyGod Jul 4, 2024
05f0221
Merge pull request #1 from TheSpyGod/issue
TheSpyGod Jul 4, 2024
d26cbb7
Changed it so that the Progressbar Instance is only created after 3 s…
TheSpyGod Jul 5, 2024
a92b26b
Merge pull request #2 from TheSpyGod/issue
TheSpyGod Jul 5, 2024
66d9ae0
Fixed Indentation as Guidelines Say and Switched Const to PascalCase
TheSpyGod Jul 5, 2024
24f132f
Merge pull request #3 from TheSpyGod/issue
TheSpyGod Jul 5, 2024
115e1b8
fix indentation
SteveL-MSFT Aug 13, 2024
4b7d2a7
address Ilya's feedback and reduce threshold to 2 secs
SteveL-MSFT Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,16 +3115,19 @@ void WriteErrorHelper(Exception exception)
{
_removedFiles++;
_removedBytes += fileBytesSize;
double speed = _removedBytes / 1024 / 1024 / _removeStopwatch.Elapsed.TotalSeconds;
var progress = new ProgressRecord(
REMOVE_FILE_ACTIVITY_ID,
StringUtil.Format(FileSystemProviderStrings.RemovingLocalFileActivity, _removedFiles, _totalFiles),
StringUtil.Format(FileSystemProviderStrings.RemovingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_removedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
);
var percentComplete = _totalBytes != 0 ? (int)Math.Min(_removedBytes * 100 / _totalBytes, 100) : 100;
progress.PercentComplete = percentComplete;
progress.RecordType = ProgressRecordType.Processing;
WriteProgress(progress);
if (_removeStopwatch.Elapsed.TotalSeconds > ProgressBarDurationThreshold)
{
double speed = _removedBytes / 1024 / 1024 / _removeStopwatch.Elapsed.TotalSeconds;
var progress = new ProgressRecord(
REMOVE_FILE_ACTIVITY_ID,
StringUtil.Format(FileSystemProviderStrings.RemovingLocalFileActivity, _removedFiles, _totalFiles),
StringUtil.Format(FileSystemProviderStrings.RemovingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_removedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
);
var percentComplete = _totalBytes != 0 ? (int)Math.Min(_removedBytes * 100 / _totalBytes, 100) : 100;
progress.PercentComplete = percentComplete;
progress.RecordType = ProgressRecordType.Processing;
WriteProgress(progress);
}
}
}
}
Expand Down Expand Up @@ -3994,16 +3997,19 @@ private void CopyFileInfoItem(FileInfo file, string destinationPath, bool force,
{
_copiedFiles++;
_copiedBytes += file.Length;
double speed = (double)(_copiedBytes / 1024 / 1024) / _copyStopwatch.Elapsed.TotalSeconds;
var progress = new ProgressRecord(
COPY_FILE_ACTIVITY_ID,
StringUtil.Format(FileSystemProviderStrings.CopyingLocalFileActivity, _copiedFiles, _totalFiles),
StringUtil.Format(FileSystemProviderStrings.CopyingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_copiedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
);
var percentComplete = _totalBytes != 0 ? (int)Math.Min(_copiedBytes * 100 / _totalBytes, 100) : 100;
progress.PercentComplete = percentComplete;
progress.RecordType = ProgressRecordType.Processing;
WriteProgress(progress);
if (_copyStopwatch.Elapsed.TotalSeconds > ProgressBarDurationThreshold)
{
double speed = (double)(_copiedBytes / 1024 / 1024) / _copyStopwatch.Elapsed.TotalSeconds;
var progress = new ProgressRecord(
COPY_FILE_ACTIVITY_ID,
StringUtil.Format(FileSystemProviderStrings.CopyingLocalFileActivity, _copiedFiles, _totalFiles),
StringUtil.Format(FileSystemProviderStrings.CopyingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_copiedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
);
var percentComplete = _totalBytes != 0 ? (int)Math.Min(_copiedBytes * 100 / _totalBytes, 100) : 100;
progress.PercentComplete = percentComplete;
progress.RecordType = ProgressRecordType.Processing;
WriteProgress(progress);
}
}
}
else
Expand Down Expand Up @@ -4945,6 +4951,7 @@ private bool PathIsReservedDeviceName(string destinationPath, string errorId)
private long _removedFiles;
private readonly Stopwatch _removeStopwatch = new();

private const double ProgressBarDurationThreshold = 2.0;
#endregion CopyItem

#endregion ContainerCmdletProvider members
Expand Down