generate thumbnails in same order as current sorting

bartekmotyl · Sep 11, 2022 · c74c192 · c74c192
1 parent cd40f91
commit c74c192
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/sources/Favourite Photo Browser/Favourite Photo Browser.csproj b/sources/Favourite Photo Browser/Favourite Photo Browser.csproj
@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/bartekmotyl/favourite-photo-browser</PackageProjectUrl>
     <PackageIcon>favourite-photo-browser-icon.png</PackageIcon>
     <PackageLicenseFile>MIT</PackageLicenseFile>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
     <Version>$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>

diff --git a/sources/Favourite Photo Browser/ViewModels/MainWindowViewModel.cs b/sources/Favourite Photo Browser/ViewModels/MainWindowViewModel.cs
@@ -79,17 +79,21 @@ public async Task ToggleFavourite()
             currentFolderItem.Favourite = updated;
         }
 
-        private void UpdateThumbnailsSorting()
+        private IEnumerable<FolderItemViewModel> SortFolderItems(IEnumerable<FolderItemViewModel> folderItems)
         {
-            IEnumerable<FolderItemViewModel> sorted;
             if (SelectedSortOrderIndex == 0)
-                sorted = allFolderItems.OrderBy(f => f.FileDate);
+                return folderItems.OrderBy(f => f.FileDate);
             else if (SelectedSortOrderIndex == 1)
-                sorted = allFolderItems.OrderByDescending(f => f.FileDate);
+                return folderItems.OrderByDescending(f => f.FileDate);
             else if (SelectedSortOrderIndex == 2)
-                sorted = allFolderItems.OrderBy(f => f.FileName);
-            else 
-                sorted = allFolderItems.OrderByDescending(f => f.FileName);
+                return folderItems.OrderBy(f => f.FileName);
+            else
+                return folderItems.OrderByDescending(f => f.FileName);
+        }
+
+        private void UpdateThumbnailsSorting()
+        {
+            IEnumerable<FolderItemViewModel> sorted = SortFolderItems(allFolderItems);
 
             var newItems = sorted
                 .Where(f => !ShowFavouritesOnly || (f.Favourite ?? 0) > 0)
@@ -115,7 +119,7 @@ private async Task LoadFilesInFolder(string folderPath)
 
             thumbnailsLoadingJob?.CancellationTokenSource.Cancel();
 
-            var fileNamesToProcess = allFolderItems.Where(fi => !fi.Ignored).Select(fi => fi.FileName).ToArray();
+            var fileNamesToProcess = SortFolderItems(allFolderItems.Where(fi => !fi.Ignored)).Select(fi => fi.FileName).ToArray();
             thumbnailsLoadingJob = new ThumnailsLoadingJob(folderPath, fileNamesToProcess);
 
             var readThumnailsTask = dbConnector.ReadThumbnails(thumbnailsLoadingJob);