Prioritize primary Cover Art

Retrieve the primary cover art before fetching additional images.
By separating the retrieval process, primary artwork will always appear first.

Author: UnknownException

CUERipper.Avalonia/ViewModels/UserControls/CoverViewAlbumViewModel.cs

@@ -26,6 +26,8 @@ public partial class CoverViewAlbumViewModel : ObservableObject, IEquatable<Cove
     {
         public string Uri { get; set; }
         public string Uri150 { get; set; }
+        public bool IsPrimary { get; set; }
+
         public Bitmap? Bitmap150 { get; set; }
 
         private bool _isSelected;
@@ -42,10 +44,11 @@ public bool IsSelected
         [ObservableProperty]
         private string borderColor = "Transparent";
 
-        public CoverViewAlbumViewModel(string uri, string uri150)
+        public CoverViewAlbumViewModel(string uri, string uri150, bool isPrimary)
         {
             Uri = uri;
             Uri150 = uri150;
+            IsPrimary = isPrimary;
         }
 
         public bool Equals(CoverViewAlbumViewModel? other)

CUERipper.Avalonia/Views/UserControls/CoverViewer.axaml.cs

@@ -66,45 +66,58 @@ public void Feed()
 
         ClearCovers();
 
-        var albumCovers = _metaService.GetAlbumMetaInformation(false)
+        var unorderedCovers = _metaService.GetAlbumMetaInformation(false)
             .SelectMany(x => x.Data.AlbumArt)
             .Where(x => !string.IsNullOrWhiteSpace(x.uri) || !string.IsNullOrWhiteSpace(x.uri150))
             .Select(x => new CoverViewAlbumViewModel(!string.IsNullOrWhiteSpace(x.uri) ? x.uri : x.uri150
-                , !string.IsNullOrWhiteSpace(x.uri150) ? x.uri150 : x.uri))
+                , !string.IsNullOrWhiteSpace(x.uri150) ? x.uri150 : x.uri
+                , x.primary)
+            )
             .Distinct()
             .ToArray();
 
+        var orderedCovers = new[] 
+        { 
+            // Primary artwork (Front cover)
+            unorderedCovers.Where(x => x.IsPrimary)
+            // Secondary artwork (Photo of CD, back cover, etc.)
+            , unorderedCovers.Where(x => !x.IsPrimary) 
+        };
+
         _thumbnailJob.Run(async (CancellationToken ct) =>
         {
             using var semaphore = new SemaphoreSlim(Constants.MaxCoverFetchConcurrency);
-            await Task.WhenAll(albumCovers.Select(async cover =>
+            foreach (var albumCovers in orderedCovers)
             {
-                await semaphore.WaitAsync(ct);
-                try
+                await Task.WhenAll(albumCovers.Select(async cover =>
                 {
-                    var bitmap = await _metaService.FetchImageAsync(cover.Uri150, ct);
-                    if (ct.IsCancellationRequested) return;
-
-                    if (bitmap != null)
+                    await semaphore.WaitAsync(ct);
+                    try
                     {
-                        cover.Bitmap150 = bitmap;
-                        Dispatcher.UIThread.Post(() =>
+                        var bitmap = await _metaService.FetchImageAsync(cover.Uri150, ct);
+                        if (ct.IsCancellationRequested) return;
+
+                        if (bitmap != null)
                         {
-                            if (ViewModel.AlbumCovers.None())
+                            cover.Bitmap150 = bitmap;
+                            Dispatcher.UIThread.Post(() =>
                             {
-                                cover.IsSelected = true;
-                                ViewModel.CurrentCover = cover.Bitmap150;
-                            }
-
-                            ViewModel.AlbumCovers.Add(cover);
-                        });
+                                if (ViewModel.AlbumCovers.None())
+                                {
+                                    cover.IsSelected = true;
+                                    ViewModel.CurrentCover = cover.Bitmap150;
+                                }
+
+                                ViewModel.AlbumCovers.Add(cover);
+                            });
+                        }
                     }
-                }
-                finally
-                {
-                    semaphore.Release();
-                }
-            }));
+                    finally
+                    {
+                        semaphore.Release();
+                    }
+                }));
+            }
         });
     }