fix: replace remaining station url ids with uuid, fix discord error s…

…pam (#965)
ubuntu-flutter-community · Oct 20, 2024 · 04a0b5c · 04a0b5c
1 parent 8826781
commit 04a0b5c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 18 deletions.
diff --git a/lib/expose/expose_service.dart b/lib/expose/expose_service.dart
@@ -34,16 +34,34 @@ class ExposeService {
           ),
         );
       }
-    } on Exception catch (_) {}
+    } on Exception catch (e) {
+      _errorController.add(e.toString());
+    }
   }
 
   Future<void> connect() async {
-    await connectToDiscord();
+    try {
+      await _discordRPC?.connect();
+    } on Exception catch (e) {
+      _errorController.add(e.toString());
+    }
   }
 
-  Future<void> connectToDiscord() async => _discordRPC?.connect();
+  Future<void> connectToDiscord() async {
+    try {
+      await _discordRPC?.connect();
+    } on Exception catch (e) {
+      _errorController.add(e.toString());
+    }
+  }
 
-  Future<void> disconnectFromDiscord() async => _discordRPC?.disconnect();
+  Future<void> disconnectFromDiscord() async {
+    try {
+      await _discordRPC?.disconnect();
+    } on Exception catch (e) {
+      _errorController.add(e.toString());
+    }
+  }
 
   Future<void> dispose() async {
     await _discordRPC?.disconnect();

diff --git a/lib/radio/view/next_station_button.dart b/lib/radio/view/next_station_button.dart
@@ -25,10 +25,10 @@ class NextStationButton extends StatelessWidget with WatchItMixin {
                 if (host == null) return null;
                 return di<SearchModel>().nextSimilarStation(audio).then(
                   (station) {
-                    if (station == audio) return;
+                    if (station == audio || audio.uuid == null) return;
                     di<PlayerModel>().startPlaylist(
                       audios: [station],
-                      listName: station.uuid ?? station.toString(),
+                      listName: station.uuid!,
                     );
                   },
                 );

diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
@@ -86,11 +86,11 @@ class RadioHistoryTile extends StatelessWidget with PlayerMixin {
           if (libraryModel.selectedPageId == entry.value.icyUrl) return;
 
           di<SearchModel>().radioNameSearch(entry.value.icyName).then((v) {
-            if (v?.firstOrNull?.urlResolved != null) {
+            if (v?.firstOrNull?.stationUUID != null) {
               libraryModel.push(
                 builder: (_) =>
                     StationPage(station: Audio.fromStation(v.first)),
-                pageId: v!.first.urlResolved!,
+                pageId: v!.first.stationUUID,
               );
             }
           });

diff --git a/lib/radio/view/station_card.dart b/lib/radio/view/station_card.dart
@@ -28,17 +28,17 @@ class StationCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return AudioCard(
       bottom: AudioCardBottom(text: station?.title?.replaceAll('_', '') ?? ''),
-      onPlay: station?.url == null
+      onPlay: station?.uuid == null
           ? null
           : () => startPlaylist(
                 audios: [station!],
-                listName: station!.url!,
+                listName: station!.uuid!,
               ),
-      onTap: station?.url == null
+      onTap: station?.uuid == null
           ? null
           : () => di<LibraryModel>().push(
                 builder: (_) => StationPage(station: station!),
-                pageId: station!.url!,
+                pageId: station!.uuid!,
               ),
       image: SizedBox.expand(
         child: SafeNetworkImage(

diff --git a/lib/search/view/sliver_radio_search_results.dart b/lib/search/view/sliver_radio_search_results.dart
@@ -99,12 +99,14 @@ class _SliverRadioSearchResultsState extends State<SliverRadioSearchResults> {
           selected: currentAudio == station,
           pageId: station.description!,
           audio: station,
-          onTap: () {
-            di<PlayerModel>().startPlaylist(
-              audios: [station],
-              listName: station.title ?? station.description ?? station.url!,
-            ).then((_) => di<RadioModel>().clickStation(station));
-          },
+          onTap: station.uuid == null
+              ? null
+              : () {
+                  di<PlayerModel>().startPlaylist(
+                    audios: [station],
+                    listName: station.uuid!,
+                  ).then((_) => di<RadioModel>().clickStation(station));
+                },
         );
       },
     );