Skip to content

Fix: Fixed issue with creating shortcuts in libraries #10913

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 16 commits into from
Jan 24, 2023
Merged

Fix: Fixed issue with creating shortcuts in libraries #10913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cf6b182
Fix shortcuts not working on libraries
hecksmosis Jan 3, 2023
081b7ad
Merge branch 'main' into fix_library_shortcut
yaira2 Jan 4, 2023
f88037c
Merge branch 'main' into fix_library_shortcut
yaira2 Jan 5, 2023
52e24f7
Let's not reinvent the wheel
gave92 Jan 8, 2023
b123e21
Merge branch 'main' of https://github.com/files-community/Files into …
gave92 Jan 8, 2023
ae9d351
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 10, 2023
9a8dabb
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 11, 2023
6273c1f
Extract file name variable
hecksmosis Jan 17, 2023
3b7bcf9
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 17, 2023
2372702
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 19, 2023
594e70f
Update UIFilesystemHelpers.cs
hecksmosis Jan 21, 2023
3b36506
Merge branch 'fix_library_shortcut' of https://github.com/hecksmosis/…
hecksmosis Jan 21, 2023
cea27b5
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 22, 2023
df52cfd
Merge branch 'main' into fix_library_shortcut
hecksmosis Jan 22, 2023
268e44d
Merge branch 'main' into fix_library_shortcut
QuaintMako Jan 23, 2023
df1e6df
Merge branch 'main' into fix_library_shortcut
yaira2 Jan 24, 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: 8 additions & 1 deletion src/Files.App/Helpers/UIFilesystemHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,14 @@ public static void SetHiddenAttributeItem(ListedItem item, bool isHidden, ItemMa

public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInstance)
{
var viewModel = new CreateShortcutDialogViewModel(associatedInstance.FilesystemViewModel.WorkingDirectory);
var currentPath = associatedInstance.FilesystemViewModel.WorkingDirectory;
if (App.LibraryManager.TryGetLibrary(currentPath, out var library) &&
!library.IsEmpty)
{
currentPath = library.DefaultSaveFolder;
}

var viewModel = new CreateShortcutDialogViewModel(currentPath);
var dialogService = Ioc.Default.GetRequiredService<IDialogService>();
await dialogService.ShowDialogAsync(viewModel);
}
Expand Down
11 changes: 9 additions & 2 deletions src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,17 @@ public virtual void RenameItem(RoutedEventArgs e)

public virtual async void CreateShortcut(RoutedEventArgs e)
{
var currentPath = associatedInstance.FilesystemViewModel.WorkingDirectory;
if (App.LibraryManager.TryGetLibrary(currentPath, out var library) &&
!library.IsEmpty)
{
currentPath = library.DefaultSaveFolder;
}

foreach (ListedItem selectedItem in SlimContentPage.SelectedItems)
{
var filePath = Path.Combine(associatedInstance.FilesystemViewModel.WorkingDirectory,
string.Format("ShortcutCreateNewSuffix".GetLocalizedResource(), selectedItem.Name) + ".lnk");
var fileName = string.Format("ShortcutCreateNewSuffix".GetLocalizedResource(), selectedItem.Name) + ".lnk";
var filePath = Path.Combine(currentPath, fileName);

await FileOperationsHelpers.CreateOrUpdateLinkAsync(filePath, selectedItem.ItemPath);
}
Expand Down