Skip to content
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

Fix: Fixed issue with browsing WSL drives #11793

Merged
merged 4 commits into from
Mar 22, 2023
Merged

Fix: Fixed issue with browsing WSL drives #11793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c246165
skip network share authentication for wsl distributions
marcofranzen99 Mar 21, 2023
7d8fa5e
Update src/Files.App/ViewModels/ItemViewModel.cs
yaira2 Mar 21, 2023
241435d
Update src/Files.App/Filesystem/WSLDistroManager.cs
marcofranzen99 Mar 22, 2023
ffacd59
Merge branch 'main' into wsl_file_browsing
yaira2 Mar 22, 2023
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
9 changes: 9 additions & 0 deletions src/Files.App/Filesystem/WSLDistroManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Files.App.DataModels.NavigationControlItems;
using Files.App.Helpers;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
Expand Down Expand Up @@ -59,6 +60,14 @@ public async Task UpdateDrivesAsync()
}
}

public bool TryGetDistro(string path, out WslDistroItem? distro)
{
var normalizedPath = PathNormalization.NormalizePath(path);
distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));

return distro is not null;
}

private static Uri GetLogoUri(string displayName)
{
if (Contains(displayName, "ubuntu"))
Expand Down
5 changes: 4 additions & 1 deletion src/Files.App/ViewModels/ItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,10 @@ public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cancel
{
// Flag to use FindFirstFileExFromApp or StorageFolder enumeration - Use storage folder for Box Drive (#4629)
var isBoxFolder = App.CloudDrivesManager.Drives.FirstOrDefault(x => x.Text == "Box")?.Path?.TrimEnd('\\') is string boxFolder && path.StartsWith(boxFolder);
bool isNetwork = path.StartsWith(@"\\", StringComparison.Ordinal) && !path.StartsWith(@"\\?\", StringComparison.Ordinal);
bool isWslDistro = App.WSLDistroManager.TryGetDistro(path, out _);
bool isNetwork = path.StartsWith(@"\\", StringComparison.Ordinal) &&
!path.StartsWith(@"\\?\", StringComparison.Ordinal) &&
!isWslDistro;
bool enumFromStorageFolder = isBoxFolder;

BaseStorageFolder? rootFolder = null;
Expand Down