fix nullability handling of album cover url

Fooxboy · Apr 11, 2024 · 526b314 · 526b314
1 parent cee9a52
commit 526b314
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/MusicX.Shared/Player/AlbumId.cs b/MusicX.Shared/Player/AlbumId.cs
@@ -8,7 +8,7 @@ namespace MusicX.Shared.Player;
 [ProtoContract(ImplicitFields = ImplicitFields.AllPublic, SkipConstructor = true)]
 [ProtoInclude(100, typeof(BoomAlbumId))]
 [ProtoInclude(101, typeof(VkAlbumId))]
-public abstract record AlbumId(string Name, string CoverUrl, string? BigCoverUrl);
+public abstract record AlbumId(string Name, string? CoverUrl, string? BigCoverUrl);
 
 [ProtoContract(ImplicitFields = ImplicitFields.AllPublic, SkipConstructor = true)]
 public sealed record VkAlbumId

diff --git a/MusicX/Controls/PlayerControl.xaml b/MusicX/Controls/PlayerControl.xaml
@@ -264,7 +264,7 @@
                                                             Height="45"
                                                             CornerRadius="5">
                                                             <Border.Background>
-                                                                <ImageBrush ImageSource="{Binding AlbumId.CoverUrl}" />
+                                                                <ImageBrush ImageSource="{Binding AlbumId.CoverUrl, FallbackValue={x:Null}}" />
                                                             </Border.Background>
                                                         </Border>
                                                         <TextBlock

diff --git a/MusicX/Controls/PlayerControl.xaml.cs b/MusicX/Controls/PlayerControl.xaml.cs
@@ -183,7 +183,7 @@ private async void PlayerService_TrackChangedEvent(object? sender, EventArgs e)
 
 
 
-                if (playerService.CurrentTrack.AlbumId != null)
+                if (playerService.CurrentTrack.AlbumId?.CoverUrl != null)
                 {
                     var amim = (Storyboard)(this.Resources["BackgroundAmimate"]);
                     amim.Begin();

diff --git a/MusicX/Services/DownloaderService.cs b/MusicX/Services/DownloaderService.cs
@@ -172,18 +172,21 @@ private async Task AddMetadataAsync(PlaylistTrack audio, string filePath, Cancel
         if (audio.AlbumId != null)
         {
             tfile.Tag.Album = audio.AlbumId.Name;
-
-            var thumbData = await _httpClient.GetByteArrayAsync(audio.AlbumId.BigCoverUrl ?? audio.AlbumId.CoverUrl, cancellationToken);
 
-            var cover = new AttachedPictureFrame
+            if (audio.AlbumId.CoverUrl != null)
             {
-                Type = PictureType.FrontCover,
-                Description = "Cover",
-                MimeType = MediaTypeNames.Image.Jpeg,
-                Data = thumbData,
-                TextEncoding = StringType.UTF16
-            };
-            tfile.Tag.Pictures = new IPicture[] {cover};
+                var thumbData = await _httpClient.GetByteArrayAsync(audio.AlbumId.BigCoverUrl ?? audio.AlbumId.CoverUrl, cancellationToken);
+
+                var cover = new AttachedPictureFrame
+                {
+                    Type = PictureType.FrontCover,
+                    Description = "Cover",
+                    MimeType = MediaTypeNames.Image.Jpeg,
+                    Data = thumbData,
+                    TextEncoding = StringType.UTF16
+                };
+                tfile.Tag.Pictures = new IPicture[] {cover};
+            }
         }
 
         tfile.Save();

diff --git a/MusicX/Services/Player/PlayerService.cs b/MusicX/Services/Player/PlayerService.cs
@@ -315,7 +315,7 @@ private async Task UpdateWindowsData()
 
 
 
-            if (CurrentTrack.AlbumId is not null)
+            if (CurrentTrack.AlbumId?.CoverUrl is not null)
             {
                 player.SystemMediaTransportControls.DisplayUpdater.Thumbnail = RandomAccessStreamReference.CreateFromUri(new Uri(CurrentTrack.AlbumId.CoverUrl));
 

diff --git a/MusicX/Views/FullScreenWindow.xaml.cs b/MusicX/Views/FullScreenWindow.xaml.cs
@@ -79,7 +79,7 @@ private async void SetData()
                 PositionSlider.Maximum = playerService.CurrentTrack!.Data.Duration.TotalSeconds;
 
 
-                if (playerService.CurrentTrack.AlbumId != null)
+                if (playerService.CurrentTrack.AlbumId?.CoverUrl != null)
                 {
 
                     var bitmapImage = new BitmapImage(new Uri(playerService.CurrentTrack.AlbumId.BigCoverUrl ?? playerService.CurrentTrack.AlbumId.CoverUrl));
@@ -96,7 +96,7 @@ private async void SetData()
 
                 if (playerService.NextPlayTrack != null)
                 {
-                    if (playerService.NextPlayTrack.AlbumId != null)
+                    if (playerService.NextPlayTrack.AlbumId?.CoverUrl != null)
                     {
                         NextTrackCover.ImageSource = new BitmapImage(new Uri(playerService.NextPlayTrack.AlbumId.CoverUrl));
                         NextTrackNote.Visibility = Visibility.Collapsed;
-Original file line number
+Diff line change
@@ Expand Up / @@ -315,7 +315,7 @@ private async Task UpdateWindowsData() @@
-                if (CurrentTrack.AlbumId is not null)
+                if (CurrentTrack.AlbumId?.CoverUrl is not null)
                 {
                     player.SystemMediaTransportControls.DisplayUpdater.Thumbnail = RandomAccessStreamReference.CreateFromUri(new Uri(CurrentTrack.AlbumId.CoverUrl));
@@ Expand Down @@