Skip to content

Fix: Fixed an issue where the status center didn't display the size #16830

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
merged 5 commits into from
Feb 21, 2025
Merged

Fix: Fixed an issue where the status center didn't display the size #16830

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7949b4
Merge branch 'main' into BUG16538
primetime43 Feb 19, 2025
e24a7d2
Fixes #16538
primetime43 Feb 19, 2025
f2a4e2b
Removed the try, finally, & error variable
primetime43 Feb 20, 2025
4dc80cb
Removed the try, finally, & error variable #16538
primetime43 Feb 20, 2025
cedf5da
Merge remote-tracking branch 'primetime43/BUG16538' into BUG16538
primetime43 Feb 20, 2025
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
33 changes: 20 additions & 13 deletions src/Files.App/Utils/Storage/Operations/FileSizeCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Collections.Concurrent;
using System.IO;
using System.Runtime.InteropServices;
using Windows.Win32;
using Windows.Win32.Storage.FileSystem;

Expand All @@ -29,12 +30,12 @@ await Parallel.ForEachAsync(
_paths,
cancellationToken,
async (path, token) => await Task.Factory.StartNew(() =>
{
ComputeSizeRecursively(path, token);
},
token,
TaskCreationOptions.LongRunning,
TaskScheduler.Default));
{
ComputeSizeRecursively(path, token);
},
token,
TaskCreationOptions.LongRunning,
TaskScheduler.Default));

unsafe void ComputeSizeRecursively(string path, CancellationToken token)
{
Expand Down Expand Up @@ -73,24 +74,30 @@ unsafe void ComputeSizeRecursively(string path, CancellationToken token)

var itemPath = Path.Combine(directory, findData.cFileName.ToString());

if (attributes.HasFlag(FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY))
// Skip current and parent directory entries
var fileName = findData.cFileName.ToString();
if (fileName.Equals(".", StringComparison.OrdinalIgnoreCase) ||
fileName.Equals("..", StringComparison.OrdinalIgnoreCase))
{
ComputeFileSize(itemPath);
continue;
}
else if (findData.cFileName.ToString() is string fileName &&
fileName.Equals(".", StringComparison.OrdinalIgnoreCase) &&
fileName.Equals("..", StringComparison.OrdinalIgnoreCase))

if (attributes.HasFlag(FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY))
{
queue.Enqueue(itemPath);
}
else
{
ComputeFileSize(itemPath);
}

if (token.IsCancellationRequested)
break;
}
while (PInvoke.FindNextFile(hFile, &findData));
}

PInvoke.CloseHandle(hFile);
PInvoke.FindClose(hFile);
}
}
}
}
Expand Down
Loading