Skip to content

Fix: Fixed formatting bug when entering commands into the Address Bar #15448

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 3 commits into from
May 23, 2024
Merged

Fix: Fixed formatting bug when entering commands into the Address Bar #15448

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8dcc28
Update AddressToolbarViewModel.cs
yaira2 May 22, 2024
86f4a8c
Update AddressToolbarViewModel.cs
yaira2 May 22, 2024
2f37d0c
Merge branch 'main' into ya/FixCommands
yaira2 May 22, 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
28 changes: 14 additions & 14 deletions src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,30 +720,30 @@ await DialogDisplayHelper.ShowDialogAsync("CommandNotExecutable".GetLocalizedRes

var isFtp = FtpHelpers.IsFtpPath(currentInput);

currentInput = NormalizePathInput(currentInput, isFtp);
var normalizedInput = NormalizePathInput(currentInput, isFtp);

if (currentSelectedPath == currentInput || string.IsNullOrWhiteSpace(currentInput))
if (currentSelectedPath == normalizedInput || string.IsNullOrWhiteSpace(normalizedInput))
return;

if (currentInput != shellPage.FilesystemViewModel.WorkingDirectory || shellPage.CurrentPageType == typeof(HomePage))
if (normalizedInput != shellPage.FilesystemViewModel.WorkingDirectory || shellPage.CurrentPageType == typeof(HomePage))
{
if (currentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || currentInput.Equals("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
if (normalizedInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || normalizedInput.Equals("Home".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
{
SavePathToHistory("Home");
shellPage.NavigateHome();
}
else
{
currentInput = StorageFileExtensions.GetResolvedPath(currentInput, isFtp);
if (currentSelectedPath == currentInput)
normalizedInput = StorageFileExtensions.GetResolvedPath(normalizedInput, isFtp);
if (currentSelectedPath == normalizedInput)
return;

var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(currentInput));
var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(normalizedInput));

var resFolder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(currentInput, item));
if (resFolder || FolderHelpers.CheckFolderAccessWithWin32(currentInput))
var resFolder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(normalizedInput, item));
if (resFolder || FolderHelpers.CheckFolderAccessWithWin32(normalizedInput))
{
var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(currentInput).StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.Ordinal));
var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(normalizedInput).StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.Ordinal));
if (matchingDrive is not null && matchingDrive.Type == Data.Items.DriveType.CDRom && matchingDrive.MaxSpace == ByteSizeLib.ByteSize.FromBytes(0))
{
bool ejectButton = await DialogDisplayHelper.ShowDialogAsync("InsertDiscDialog/Title".GetLocalizedResource(), string.Format("InsertDiscDialog/Text".GetLocalizedResource(), matchingDrive.Path), "InsertDiscDialog/OpenDriveButton".GetLocalizedResource(), "Close".GetLocalizedResource());
Expand All @@ -754,18 +754,18 @@ await DialogDisplayHelper.ShowDialogAsync("CommandNotExecutable".GetLocalizedRes
}
return;
}
var pathToNavigate = resFolder.Result?.Path ?? currentInput;
var pathToNavigate = resFolder.Result?.Path ?? normalizedInput;
SavePathToHistory(pathToNavigate);
shellPage.NavigateToPath(pathToNavigate);
}
else if (isFtp)
{
SavePathToHistory(currentInput);
shellPage.NavigateToPath(currentInput);
SavePathToHistory(normalizedInput);
shellPage.NavigateToPath(normalizedInput);
}
else // Not a folder or inaccessible
{
var resFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileWithPathFromPathAsync(currentInput, item));
var resFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileWithPathFromPathAsync(normalizedInput, item));
if (resFile)
{
var pathToInvoke = resFile.Result.Path;
Expand Down