Fix syncing legacy FinampCollections.

Komodo5197 · May 24, 2024 · e681be0 · e681be0
1 parent eb22e76
commit e681be0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/lib/components/AlbumScreen/download_dialog.dart b/lib/components/AlbumScreen/download_dialog.dart
@@ -43,13 +43,13 @@ class DownloadDialog extends StatefulWidget {
       viewId = finampUserHelper.currentUser!.currentViewId;
     }
     bool needTranscode = FinampSettingsHelper
-                .finampSettings.shouldTranscodeDownloads ==
-            TranscodeDownloadsSetting.ask &&
-        // Skip asking for transcode for image only collection
-        (item.finampCollection?.type != FinampCollectionType.libraryImages ||
-            // Skip asking for transcode for metadata +image collection
-            item.finampCollection?.type !=
-                FinampCollectionType.allPlaylistsMetadata);
+                    .finampSettings.shouldTranscodeDownloads ==
+                TranscodeDownloadsSetting.ask &&
+            // Skip asking for transcode for image only collection
+            item.finampCollection?.type != FinampCollectionType.libraryImages ||
+        // Skip asking for transcode for metadata +image collection
+        item.finampCollection?.type !=
+            FinampCollectionType.allPlaylistsMetadata;
     String? downloadLocation =
         FinampSettingsHelper.finampSettings.defaultDownloadLocation;
     if (!FinampSettingsHelper.finampSettings.downloadLocationsMap

diff --git a/lib/models/finamp_models.dart b/lib/models/finamp_models.dart
@@ -177,7 +177,8 @@ class FinampSettings {
     this.showArtistChipImage = _showArtistChipImage,
     this.trackOfflineFavorites = _trackOfflineFavoritesDefault,
     this.showProgressOnNowPlayingBar = _showProgressOnNowPlayingBarDefault,
-    this.startInstantMixForIndividualTracks = _startInstantMixForIndividualTracksDefault,
+    this.startInstantMixForIndividualTracks =
+        _startInstantMixForIndividualTracksDefault,
   });
 
   @HiveField(0, defaultValue: _isOfflineDefault)
@@ -924,10 +925,22 @@ class DownloadStub {
   BaseItemDto? _baseItemCached;
 
   @ignore
-  FinampCollection? get finampCollection => _finampCollectionCached ??=
-      ((jsonItem == null || type != DownloadItemType.finampCollection)
+  FinampCollection? get finampCollection =>
+      _finampCollectionCached ??= (type != DownloadItemType.finampCollection
           ? null
-          : FinampCollection.fromJson(jsonDecode(jsonItem!)));
+          : jsonItem == null
+              // Switch on ID to allow legacy collections to continue syncing
+              ? switch (id) {
+                  "Favorites" =>
+                    FinampCollection(type: FinampCollectionType.favorites),
+                  "All Playlists" =>
+                    FinampCollection(type: FinampCollectionType.allPlaylists),
+                  "5 Latest Albums" =>
+                    FinampCollection(type: FinampCollectionType.latest5Albums),
+                  _ =>
+                    throw "Invalid FinampCollection DownloadItem: no attached collection"
+                }
+              : FinampCollection.fromJson(jsonDecode(jsonItem!)));
 
   @ignore
   FinampCollection? _finampCollectionCached;

diff --git a/lib/services/downloads_service_backend.dart b/lib/services/downloads_service_backend.dart
@@ -1338,18 +1338,7 @@ class DownloadsSyncService {
   Future<List<DownloadStub>> _getFinampCollectionChildren(
       DownloadStub parent) async {
     assert(parent.type == DownloadItemType.finampCollection);
-    FinampCollection collection;
-    // Switch on ID to allow legacy collections to continue syncing
-    switch (parent.id) {
-      case "Favorites":
-        collection = FinampCollection(type: FinampCollectionType.favorites);
-      case "All Playlists":
-        collection = FinampCollection(type: FinampCollectionType.allPlaylists);
-      case "5 Latest Albums":
-        collection = FinampCollection(type: FinampCollectionType.latest5Albums);
-      case _:
-        collection = parent.finampCollection!;
-    }
+    FinampCollection collection = parent.finampCollection!;
     try {
       List<BaseItemDto> outputItems;
       DownloadItemType? typeOverride;