Artist/Album: albumCount/songCount has fallback

BLeeEZ · Jun 9, 2021 · f1554e9 · f1554e9
1 parent 3ba54b4
commit f1554e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Amperfy/Storage/EntityWrappers/Album.swift b/Amperfy/Storage/EntityWrappers/Album.swift
@@ -53,7 +53,10 @@ public class Album: AbstractLibraryEntity, SongContainable {
         }
     }
     var songCount: Int {
-        get { return Int(managedObject.songCount) }
+        get {
+            let moSongCount = Int(managedObject.songCount)
+            return moSongCount != 0 ? moSongCount : (managedObject.songs?.count ?? 0)
+        }
         set {
             guard Int16.isValid(value: newValue), managedObject.songCount != Int16(newValue) else { return }
             managedObject.songCount = Int16(newValue)

diff --git a/Amperfy/Storage/EntityWrappers/Artist.swift b/Amperfy/Storage/EntityWrappers/Artist.swift
@@ -34,7 +34,10 @@ public class Artist: AbstractLibraryEntity, SongContainable {
         }
     }
     var albumCount: Int {
-        get { return Int(managedObject.albumCount) }
+        get {
+            let moAlbumCount = Int(managedObject.albumCount)
+            return moAlbumCount != 0 ? moAlbumCount : (managedObject.albums?.count ?? 0)
+        }
         set {
             guard Int16.isValid(value: newValue), managedObject.albumCount != Int16(newValue) else { return }
             managedObject.albumCount = Int16(newValue)