Fix library update and list (#6426)

Author: gave92

Files.Launcher/Helpers/ShellFolderHelpers.cs

@@ -22,7 +22,7 @@ public static ShellLibraryItem GetShellLibraryItem(ShellLibrary library, string
             var folders = library.Folders;
             if (folders.Count > 0)
             {
-                libraryItem.DefaultSaveFolder = library.DefaultSaveFolder.FileSystemPath;
+                libraryItem.DefaultSaveFolder = Extensions.IgnoreExceptions(() => library.DefaultSaveFolder.FileSystemPath);
                 libraryItem.Folders = folders.Select(f => f.FileSystemPath).ToArray();
             }
             return libraryItem;

Files.Launcher/MessageHandlers/LibrariesHandler.cs

@@ -195,6 +195,8 @@ private async Task HandleShellLibraryMessage(Dictionary<string, object> message)
                             if (updated)
                             {
                                 library.Commit();
+                                var libField = typeof(ShellLibrary).GetField("folders", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                                libField.SetValue(library, null); // Force library folder reload
                                 response.Add("Update", JsonConvert.SerializeObject(ShellFolderExtensions.GetShellLibraryItem(library, libPath)));
                             }
                         }

Files/Filesystem/LibraryManager.cs

@@ -263,7 +263,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
                 var libItem = Libraries.FirstOrDefault(l => string.Equals(l.Path, libraryPath, StringComparison.OrdinalIgnoreCase));
                 if (libItem != null)
                 {
-                    Libraries[Libraries.IndexOf(libItem)] = libItem;
+                    Libraries[Libraries.IndexOf(libItem)] = newLib;
                 }
                 return newLib;
             }

Files/Views/Pages/PropertiesLibrary.xaml.cs

@@ -189,7 +189,7 @@ public override async Task<bool> SaveChangesAsync(ListedItem item)
                     using var dialog = DynamicDialogFactory.GetFor_PropertySaveErrorDialog();
                     try
                     {
-                        var newLib = await App.LibraryManager.UpdateLibrary(props.Library.ItemPath, newDefaultSaveFolder, newFolders, newIsPinned);
+                        var newLib = await Task.Run(() => App.LibraryManager.UpdateLibrary(props.Library.ItemPath, newDefaultSaveFolder, newFolders, newIsPinned));
                         if (newLib != null)
                         {
                             props.UpdateLibrary(new LibraryItem(newLib));