From 261b8e13d6508c6d98bc993d2e75a2991a30735c Mon Sep 17 00:00:00 2001
From: Moritz Weber <moritz.weber@posteo.de>
Date: Wed, 30 Aug 2023 14:58:10 -0400
Subject: [PATCH] fix initialisation of playlist widget

---
 .../datasources/local_music_fetcher_impl.dart | 32 +++++++++++--------
 src/lib/system/models/album_model.dart        |  3 +-
 .../repositories/init_repository_impl.dart    |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/lib/system/datasources/local_music_fetcher_impl.dart b/src/lib/system/datasources/local_music_fetcher_impl.dart
index 333183a..dd5eb3e 100644
--- a/src/lib/system/datasources/local_music_fetcher_impl.dart
+++ b/src/lib/system/datasources/local_music_fetcher_impl.dart
@@ -69,7 +69,9 @@ class LocalMusicFetcherImpl implements LocalMusicFetcher {
     final Set<String> songFilePaths = {};
     for (final libDir in libDirs) {
       _log.d('Checking folder: ${libDir.path}');
-      songFilePaths.addAll(await getSongFilesInDirectory(libDir.path, allowedExtensions, blockedPaths));
+      songFilePaths.addAll(
+        await getSongFilesInDirectory(libDir.path, allowedExtensions, blockedPaths),
+      );
     }
     final List<File> songFiles = songFilePaths.map((e) => File(e)).toList();
 
@@ -166,18 +168,22 @@ class LocalMusicFetcherImpl implements LocalMusicFetcher {
         artists.add(ArtistModel(name: artistName, id: newArtistId++));
       }
 
-      albums.add(AlbumModel.fromMetadata(
-        songData: songData,
-        albumId: albumId,
-        albumArtPath: albumArtMap[albumId],
-      ));
-      songs.add(SongModel.fromMetadata(
-        path: songFile.path,
-        songData: songData,
-        albumId: albumId,
-        lastModified: lastModified,
-        albumArtPath: albumArtMap[albumId],
-      ));
+      albums.add(
+        AlbumModel.fromMetadata(
+          songData: songData,
+          albumId: albumId,
+          albumArtPath: albumArtMap[albumId],
+        ),
+      );
+      songs.add(
+        SongModel.fromMetadata(
+          path: songFile.path,
+          songData: songData,
+          albumId: albumId,
+          lastModified: lastModified,
+          albumArtPath: albumArtMap[albumId],
+        ),
+      );
     }
 
     _log.d('Songs in list: ${songs.length}');
diff --git a/src/lib/system/models/album_model.dart b/src/lib/system/models/album_model.dart
index 2081344..c2bbbb7 100644
--- a/src/lib/system/models/album_model.dart
+++ b/src/lib/system/models/album_model.dart
@@ -37,8 +37,7 @@ class AlbumModel extends Album {
     String? albumArtPath,
     Color? color,
   }) {
-    final albumArtist = songData.albumArtist ?? '';
-    final artist = albumArtist != '' ? albumArtist : songData.artist;
+    final artist = songData.albumArtist ?? songData.artist;
 
     return AlbumModel(
       id: albumId,
diff --git a/src/lib/system/repositories/init_repository_impl.dart b/src/lib/system/repositories/init_repository_impl.dart
index 2c01700..d87daed 100644
--- a/src/lib/system/repositories/init_repository_impl.dart
+++ b/src/lib/system/repositories/init_repository_impl.dart
@@ -37,7 +37,7 @@ class InitRepositoryImpl extends InitRepository {
         3,
         L10n.of(context)!.yourPlaylists,
         HomePlaylistsOrder.history,
-        OrderDirection.ascending,
+        OrderDirection.descending,
         HomePlaylistsFilter.both,
       ),
     );