Skip to content

Invalid favorites are no longer removed from the sidebar #8767

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 6 commits into from
Apr 1, 2022
Merged

Invalid favorites are no longer removed from the sidebar #8767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d85bf70
No longer remove invalid items from sidebar (#2316, #6860)
AaronKatzin Mar 25, 2022
34444d3
Update debug message upon invalid pinned item
AaronKatzin Mar 26, 2022
ea0cbd8
Load pinned favorite even if invalid, with indicative icon
AaronKatzin Mar 26, 2022
223647b
Updates invalid item icon to shell32.dll 16780 inaccessible folder
AaronKatzin Mar 27, 2022
df30e96
Updates invalid sidebar item to Folder icon with critical InfoBadge
AaronKatzin Mar 30, 2022
6ea68ac
Update infobadge to caution icon.
AaronKatzin Mar 31, 2022
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
2 changes: 2 additions & 0 deletions src/Files.Uwp/DataModels/NavigationControlItems/LocationItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public bool IsExpanded
}
}

public bool IsInvalid { get; set; } = false;

public SectionType Section { get; set; }

public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text);
Expand Down
38 changes: 20 additions & 18 deletions src/Files.Uwp/DataModels/SidebarPinnedModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,20 @@ public async Task AddItemToSidebarAsync(string path)
{
var item = await FilesystemTasks.Wrap(() => DrivesManager.GetRootFromPathAsync(path));
var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
var locationItem = new LocationItem
{
var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
var locationItem = new LocationItem
{
Font = MainViewModel.FontName,
Path = path,
Section = SectionType.Favorites,
IsDefaultLocation = false,
Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'))
};
Font = MainViewModel.FontName,
Path = path,
Section = SectionType.Favorites,
IsDefaultLocation = false,
Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'))
};

if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
{
locationItem.IsInvalid = false;
if (res)
{
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(res.Result, 24u, Windows.Storage.FileProperties.ThumbnailMode.ListView);
Expand All @@ -290,16 +291,17 @@ public async Task AddItemToSidebarAsync(string path)
locationItem.Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => locationItem.IconData.ToBitmapAsync());
}
}

if (!favoriteSection.ChildItems.Any(x => x.Path == locationItem.Path))
{
await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Insert(insertIndex, locationItem));
}
}
else
{
Debug.WriteLine($"Pinned item was invalid and will be removed from the file lines list soon: {res.ErrorCode}");
RemoveItem(path);
locationItem.Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIHelpers.GetIconResource(Constants.ImageRes.Folder));
locationItem.IsInvalid = true;
Debug.WriteLine($"Pinned item was invalid {res.ErrorCode}, item: {path}");
}

if (!favoriteSection.ChildItems.Any(x => x.Path == locationItem.Path))
{
await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Insert(insertIndex, locationItem));
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/Files.Uwp/UserControls/SidebarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
<muxc:NavigationViewItem.Icon>
<muxc:ImageIcon Source="{x:Bind Icon, Mode=OneWay}" />
</muxc:NavigationViewItem.Icon>
<muxc:NavigationViewItem.InfoBadge>
<muxc:InfoBadge Style="{ThemeResource CautionIconInfoBadgeStyle}" Visibility="{x:Bind IsInvalid, Mode=OneWay}"/>
</muxc:NavigationViewItem.InfoBadge>
</muxc:NavigationViewItem>
</DataTemplate>

Expand Down