Skip to content

Feature: Hide drives without attached media from sidebar and homepage #17895

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

Feature: Hide drives without attached media from sidebar and homepage #17895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/Files.App/Services/Storage/StorageDevicesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public async IAsyncEnumerable<IFolder> GetDrivesAsync()
var pCloudDrivePath = App.AppModel.PCloudDrivePath;
foreach (var drive in list)
{
if (!drive.IsReady)
continue;

var driveLabel = DriveHelpers.GetExtendedDriveLabel(drive);
// Filter out cloud drives
// We don't want cloud drives to appear in the plain "Drives" sections.
Expand Down
6 changes: 6 additions & 0 deletions src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ private void Win32_OnDeviceRemoved(object? sender, DeviceEventArgs e)
private async void Win32_OnDeviceAdded(object? sender, DeviceEventArgs e)
{
var driveAdded = new DriveInfo(e.DeviceId);
if (!driveAdded.IsReady)
return;

var rootAdded = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(e.DeviceId).AsTask());
if (!rootAdded)
{
Expand Down Expand Up @@ -98,6 +101,9 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
{
// Check if this drive is associated with a drive letter
var driveAdded = new DriveInfo(root.Path);
if (!driveAdded.IsReady)
return;

type = DriveHelpers.GetDriveType(driveAdded);
label = DriveHelpers.GetExtendedDriveLabel(driveAdded);
}
Expand Down
Loading