From f1554e9d4d566add517e8643b41be3954caa7cc6 Mon Sep 17 00:00:00 2001
From: Maximilian Bauer <bauer.maximilian@web.de>
Date: Wed, 9 Jun 2021 21:09:32 +0200
Subject: [PATCH] Artist/Album: albumCount/songCount has fallback

---
 Amperfy/Storage/EntityWrappers/Album.swift  | 5 ++++-
 Amperfy/Storage/EntityWrappers/Artist.swift | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Amperfy/Storage/EntityWrappers/Album.swift b/Amperfy/Storage/EntityWrappers/Album.swift
index 2dd7ff43..fcef52c5 100644
--- 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
index f1c352ea..9e72ce12 100644
--- 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)