Skip to content

Fix: Fixed issue where directly opening a library would invoke explorer.exe #14336

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 2 commits into from
Jan 9, 2024
Merged

Fix: Fixed issue where directly opening a library would invoke explorer.exe #14336

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575a555
Fix: Directly opening library files invokes explorer.exe
MinaHansen Dec 31, 2023
12fff83
Merge branch 'main' into fix-for-issue-#14302
MinaHansen Jan 1, 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: 27 additions & 1 deletion src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Copyright (c) 2023 Files Community
// Licensed under the MIT License. See the LICENSE.

using Microsoft.Extensions.Logging;
using System.Runtime.InteropServices.WindowsRuntime;
using Vanara.PInvoke;
using Windows.Foundation;
using Windows.Foundation.Metadata;
using Windows.Storage;
Expand All @@ -27,7 +29,31 @@ public sealed class SystemStorageFolder : BaseStorageFolder
public SystemStorageFolder(StorageFolder folder) => Folder = folder;

public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await StorageFolder.GetFolderFromPathAsync(path)));
{
if (path.EndsWith(ShellLibraryItem.EXTENSION))
{
try
{
using var shellItem = new ShellLibraryEx(Shell32.ShellUtil.GetShellItemForPath(path), true);
if (shellItem is ShellLibraryEx library)
{
var libraryItem = ShellFolderExtensions.GetShellLibraryItem(library, path);
var firstFolder = libraryItem?.Folders.FirstOrDefault();

if (firstFolder != null)
{
return AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await StorageFolder.GetFolderFromPathAsync(firstFolder)));
}
}
}
catch (Exception e)
{
App.Logger.LogWarning(e, null);
}
}

return AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await StorageFolder.GetFolderFromPathAsync(path)));
}

public override IAsyncOperation<StorageFolder> ToStorageFolderAsync() => Task.FromResult(Folder).AsAsyncOperation();

Expand Down