From d37dc8fb4442505fa951c46c402e77c815dd5bb5 Mon Sep 17 00:00:00 2001
From: Dallas Groot <dallas_groot@me.com>
Date: Sat, 11 Apr 2026 00:59:53 -0700
Subject: [PATCH] quick fixes

---
 iOS/Views/Library/RadioView.swift         | 2 +-
 iOS/Views/NowPlaying/NowPlayingView.swift | 3 ++-
 watchOS/App/WatchOfflineStore.swift       | 1 +
 watchOS/App/WatchSessionManager.swift     | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/iOS/Views/Library/RadioView.swift b/iOS/Views/Library/RadioView.swift
index a73164c..0ba8e9a 100644
--- a/iOS/Views/Library/RadioView.swift
+++ b/iOS/Views/Library/RadioView.swift
@@ -325,7 +325,7 @@ struct RadioView: View {
         let radioSong = Song(
             id: station.id, parent: nil, isDir: nil,
             title: station.name, album: "Radio",
-            artist: station.homePageUrl ?? "Internet Radio",
+            artist: station.homePageUrl ?? "Internet Radio", albumArtist: nil,
             track: nil, year: nil, genre: nil, coverArt: nil,
             size: nil, contentType: nil, suffix: nil,
             transcodedContentType: nil, transcodedSuffix: nil,
diff --git a/iOS/Views/NowPlaying/NowPlayingView.swift b/iOS/Views/NowPlaying/NowPlayingView.swift
index 7e6dcec..3a4a1dc 100644
--- a/iOS/Views/NowPlaying/NowPlayingView.swift
+++ b/iOS/Views/NowPlaying/NowPlayingView.swift
@@ -1162,6 +1162,7 @@ struct NowPlayingView: View {
                     let updated = Song(
                         id: song.id, parent: song.parent, isDir: song.isDir,
                         title: song.title, album: song.album, artist: song.artist,
+                        albumArtist: song.albumArtist,
                         track: song.track, year: song.year, genre: song.genre,
                         coverArt: song.coverArt, size: song.size,
                         contentType: song.contentType, suffix: song.suffix,
@@ -1538,7 +1539,7 @@ struct RadioRecordingsView: View {
             let song = Song(
                 id: rec.id.uuidString, parent: nil, isDir: nil,
                 title: rec.name, album: "Recording",
-                artist: stationName,
+                artist: stationName, albumArtist: nil,
                 track: nil, year: nil, genre: nil, coverArt: nil,
                 size: nil, contentType: nil, suffix: nil,
                 transcodedContentType: nil, transcodedSuffix: nil,
diff --git a/watchOS/App/WatchOfflineStore.swift b/watchOS/App/WatchOfflineStore.swift
index 3fba38b..7982f24 100644
--- a/watchOS/App/WatchOfflineStore.swift
+++ b/watchOS/App/WatchOfflineStore.swift
@@ -72,6 +72,7 @@ class WatchOfflineStore: NSObject, ObservableObject, URLSessionDownloadDelegate
             title:  title  ?? old.song.title,
             album:  album  ?? old.song.album,
             artist: artist ?? old.song.artist,
+            albumArtist: albumArtist ?? old.song.albumArtist,
             track: old.song.track, year: old.song.year, genre: old.song.genre,
             coverArt: old.song.coverArt,
             size: old.song.size, contentType: old.song.contentType,
diff --git a/watchOS/App/WatchSessionManager.swift b/watchOS/App/WatchSessionManager.swift
index 9e3c329..bb34104 100644
--- a/watchOS/App/WatchSessionManager.swift
+++ b/watchOS/App/WatchSessionManager.swift
@@ -288,6 +288,7 @@ class WatchSessionManager: NSObject, ObservableObject {
             title: message["title"] as? String ?? "Unknown",
             album: message["album"] as? String,
             artist: message["artist"] as? String,
+            albumArtist: message["albumArtist"] as? String,
             track: nil, year: nil, genre: nil,
             coverArt: message["coverArt"] as? String,
             size: nil, contentType: nil,
@@ -513,6 +514,7 @@ extension WatchSessionManager: WCSessionDelegate {
                 title: metadata["title"] as? String ?? "Unknown",
                 album: metadata["album"] as? String,
                 artist: metadata["artist"] as? String,
+                albumArtist: metadata["albumArtist"] as? String,
                 track: nil, year: nil, genre: nil,
                 coverArt: coverArtId,
                 size: nil, contentType: nil,