fix: make all podcast pages fully ID based (#1359)

* fix: make all podcast pages fully ID based

* upgrade flutter and packages

Author: Feichtmeier

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.35.3"
+  "flutter": "3.35.4"
 }

.github/workflows/ci.yaml

@@ -35,6 +35,6 @@ jobs:
       - uses: actions/checkout@v5
       - uses: kuhnroyal/flutter-fvm-config-action/setup@v3
       - run: sudo apt update
-      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev
+      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev libnotify-dev
       - run: flutter pub get
       - run: flutter build linux -v

.gitignore

@@ -46,13 +46,7 @@ app.*.map.json
 /android/app/release
 /android/app/.cxx/
 
-.vscode/
-musicpod_0.1.0_amd64.snap
-#pubspec.lock
-pinnedAlbums.json
-playlists.json
-podcasts.json
-starredStations.json
+
 
 # FVM Version Cache
 .fvm/

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "musicpod",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "musicpod (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "musicpod (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "yaml.schemaStore.enable": false,
+  "dart.flutterSdkPath": ".fvm/versions/3.35.4"
+}

l10n.yaml

@@ -2,5 +2,4 @@ arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 nullable-getter: false
-synthetic-package: false
 format: true

lib/app/view/master_tile.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
@@ -11,9 +12,11 @@ import '../../common/view/spaced_divider.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/build_context_x.dart';
+import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../local_audio/local_audio_model.dart';
 import '../../player/player_model.dart';
+import '../../podcasts/podcast_model.dart';
 import '../../radio/radio_model.dart';
 import 'master_item.dart';
 import 'routing_manager.dart';
@@ -160,7 +163,14 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
                 child: IconButton(
                   style: tonedIconButtonStyle(context.colorScheme),
                   onPressed: () async {
-                    final audios = await getAudiosById(widget.pageId);
+                    final result = await showFutureLoadingDialog(
+                      context: context,
+                      future: () async => await getAudiosById(widget.pageId),
+                      backLabel: context.l10n.back,
+                      barrierDismissible: true,
+                      title: context.l10n.loadingPleaseWait,
+                    );
+                    final audios = result.asValue?.value;
                     if (audios?.firstOrNull?.audioType == AudioType.radio) {
                       di<RadioModel>().clickStation(audios?.firstOrNull);
                     }
@@ -200,8 +210,17 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
       return audio == null ? [] : [audio];
     }
 
-    return libraryModel.getPodcast(pageId) ??
-        libraryModel.getPlaylistById(pageId) ??
-        (await di<LocalAudioModel>().findAlbum(pageId));
+    if (libraryModel.isPodcastSubscribed(pageId)) {
+      final episodes =
+          di<PodcastModel>().getPodcastEpisodesFromCache(pageId) ??
+          await di<PodcastModel>().findEpisodes(feedUrl: pageId);
+      return episodes;
+    }
+
+    if (libraryModel.isPlaylistSaved(pageId)) {
+      return libraryModel.getPlaylistById(pageId);
+    }
+
+    return di<LocalAudioModel>().findAlbum(pageId);
   }
 }

lib/common/view/icons.dart

@@ -256,10 +256,10 @@ class Iconz {
       ? CupertinoIcons.plus
       : Icons.add;
   static IconData get removeFromLibrary => yaru
-      ? YaruIcons.checkmark
+      ? YaruIcons.minus
       : cupertino
-      ? CupertinoIcons.check_mark
-      : Icons.check;
+      ? CupertinoIcons.minus
+      : Icons.remove;
   static IconData get refresh => yaru
       ? YaruIcons.refresh
       : cupertino

lib/custom_content/custom_content_model.dart

@@ -1,7 +1,5 @@
 import 'dart:io';
 
-import 'package:collection/collection.dart';
-import 'package:file_selector/file_selector.dart';
 import 'package:flutter/foundation.dart';
 import 'package:m3u_parser_nullsafe/m3u_parser_nullsafe.dart';
 import 'package:opml/opml.dart';
@@ -36,8 +34,8 @@ class CustomContentModel extends SafeChangeNotifier {
 
   List<({List<Audio> audios, String id})> _playlists = [];
   List<({List<Audio> audios, String id})> get playlists => _playlists;
-  void setPlaylists(List<({List<Audio> audios, String id})> value) {
-    _playlists = value;
+  Future<void> addPlaylists() async {
+    _playlists = [..._playlists, ...await loadPlaylists()];
     notifyListeners();
   }
 
@@ -46,18 +44,11 @@ class CustomContentModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> addPlaylists({List<XFile>? files}) async =>
-      setPlaylists([..._playlists, ...await loadPlaylists(files: files)]);
-
-  Future<List<({List<Audio> audios, String id})>> loadPlaylists({
-    List<XFile>? files,
-  }) async {
+  Future<List<({List<Audio> audios, String id})>> loadPlaylists() async {
     final List<({List<Audio> audios, String id})> lists = [];
 
     try {
-      final paths =
-          files?.map((e) => e.path) ??
-          await _externalPathService.getPathsOfFiles();
+      final paths = await _externalPathService.getPathsOfFiles();
       for (var path in paths) {
         if (path.endsWith('.m3u')) {
           lists.add((
@@ -131,52 +122,77 @@ class CustomContentModel extends SafeChangeNotifier {
     File(join(basePath, '$id.m3u')).writeAsStringSync(m3uAsString.toString());
   }
 
-  bool _processing = false;
-  bool get processing => _processing;
-  void setProcessing(bool value) {
-    if (_processing == value) return;
-    _processing = value;
-    notifyListeners();
-  }
-
   Future<void> importPodcastsFromOpmlFile() async {
-    if (_processing) return;
-    setProcessing(true);
+    final podcasts =
+        <({String artist, String feedUrl, String? imageUrl, String name})>[];
+
     final path = await _externalPathService.getPathOfFile();
 
     if (path == null) {
-      setProcessing(false);
       return;
     }
     final file = File(path);
     if (!file.existsSync()) return;
     final xml = file.readAsStringSync();
     final doc = OpmlDocument.parse(xml);
 
-    for (var category in doc.body.where((e) => e.children != null)) {
-      final children = category.children!.where((e) => e.xmlUrl != null);
-      final podcasts = <(String feedUrl, List<Audio> audios)>[];
-      for (var feed in children) {
-        final audios = await _podcastService.findEpisodes(
-          feedUrl: feed.xmlUrl!,
+    for (var outline in doc.body) {
+      if (outline.xmlUrl != null) {
+        final maybe = await _findPodcast(
+          outline.xmlUrl!,
+          text: outline.text,
+          title: outline.title,
         );
-        if (audios.isNotEmpty) {
-          podcasts.add((feed.xmlUrl!, audios));
+        if (maybe != null) {
+          podcasts.add(maybe);
+        }
+      } else {
+        for (var outlineChild in (outline.children ?? <OpmlOutline>[]).where(
+          (e) => e.xmlUrl != null,
+        )) {
+          final maybe = await _findPodcast(
+            outlineChild.xmlUrl!,
+            text: outlineChild.text,
+            title: outlineChild.title,
+          );
+          if (maybe != null) {
+            podcasts.add(maybe);
+          }
         }
       }
-      if (podcasts.isNotEmpty) {
-        _libraryService.addPodcasts(podcasts);
-      }
     }
-    setProcessing(false);
+
+    if (podcasts.isNotEmpty) {
+      await _libraryService.addPodcasts(podcasts);
+    }
+  }
+
+  Future<({String artist, String feedUrl, String? imageUrl, String name})?>
+  _findPodcast(String feed, {String? text, String? title}) async {
+    if (title != null && text != null) {
+      return (feedUrl: feed, artist: text, imageUrl: null, name: title);
+    }
+
+    // Only load the feed if the fields are not provided because this is expensive
+    final audios = await _podcastService.findEpisodes(feedUrl: feed);
+    final artist = audios.first.artist ?? '';
+    final imageUrl = audios.first.albumArtUrl ?? audios.first.imageUrl;
+    final name = audios.first.album ?? '';
+    if (audios.isNotEmpty) {
+      final value = (
+        feedUrl: feed,
+        artist: artist,
+        imageUrl: imageUrl,
+        name: name,
+      );
+      return value;
+    }
+    return null;
   }
 
   Future<bool> exportPodcastsToOpmlFile() async {
-    if (_processing) return false;
-    setProcessing(true);
     final location = await _externalPathService.getPathOfDirectory();
     if (location == null) {
-      setProcessing(false);
       return false;
     }
 
@@ -188,32 +204,31 @@ class CustomContentModel extends SafeChangeNotifier {
     final body = <OpmlOutline>[];
     final category = OpmlOutlineBuilder();
 
-    for (var podcast in _libraryService.podcasts.entries) {
-      category.addChild(
-        OpmlOutlineBuilder()
-            .type('rss')
-            .title(podcast.value.firstOrNull?.album ?? '')
-            .text(podcast.value.firstOrNull?.artist ?? '')
-            .xmlUrl(podcast.key)
-            .build(),
-      );
+    for (var podcast in _libraryService.podcasts) {
+      final name = _libraryService.getSubscribedPodcastName(podcast);
+      final artist = _libraryService.getSubscribedPodcastArtist(podcast);
+      final builder = OpmlOutlineBuilder().type('rss').xmlUrl(podcast);
+      if (name != null) {
+        builder.title(name);
+      }
+      if (artist != null) {
+        builder.text(artist);
+      }
+      category.addChild(builder.build());
     }
 
     body.add(category.type('rss').title('Podcasts').text('Podcasts').build());
 
     final opml = OpmlDocument(head: head, body: body);
     final xml = opml.toXmlString(pretty: true);
     file.writeAsStringSync(xml);
-    setProcessing(false);
+
     return true;
   }
 
   Future<bool> exportStarredStationsToOpmlFile() async {
-    if (_processing) return false;
-    setProcessing(true);
     final location = await _externalPathService.getPathOfDirectory();
     if (location == null) {
-      setProcessing(false);
       return false;
     }
 
@@ -236,17 +251,14 @@ class CustomContentModel extends SafeChangeNotifier {
     final opml = OpmlDocument(head: head, body: body);
     final xml = opml.toXmlString(pretty: true);
     file.writeAsStringSync(xml);
-    setProcessing(false);
+
     return true;
   }
 
   Future<void> importStarredStationsFromOpmlFile() async {
-    if (_processing) return;
-    setProcessing(true);
     final path = await _externalPathService.getPathOfFile();
 
     if (path == null) {
-      setProcessing(false);
       return;
     }
     final file = File(path);
@@ -264,7 +276,6 @@ class CustomContentModel extends SafeChangeNotifier {
         _libraryService.addStarredStations(starredStations);
       }
     }
-    setProcessing(false);
   }
 
   String? _playlistName;
@@ -278,7 +289,6 @@ class CustomContentModel extends SafeChangeNotifier {
   void reset() {
     _playlists = [];
     _playlistName = null;
-    _processing = false;
     notifyListeners();
   }
 }

lib/custom_content/view/custom_playlists_section.dart

@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
@@ -90,9 +91,12 @@ class CustomPlaylistsSection extends StatelessWidget with WatchItMixin {
           ],
         ),
         TextButton(
-          onPressed: () {
-            di<CustomContentModel>().addPlaylists();
-          },
+          onPressed: () => showFutureLoadingDialog(
+            context: context,
+            future: () => di<CustomContentModel>().addPlaylists(),
+            backLabel: context.l10n.back,
+            title: context.l10n.importingPlaylistsPleaseWait,
+          ),
           child: Text(l10n.loadFromFileOptional),
         ),
         ...playlists.map((e) {