From 8184555ee89fd30aaf886af9fc1d52c142fdebb0 Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Sat, 27 Jan 2024 21:48:38 +0600
Subject: [PATCH] feat: improve youtube/piped matching by suffixing "- Topic"

---
 lib/provider/piped_instances_provider.dart      | 10 ++++++++--
 lib/services/sourced_track/sources/piped.dart   |  2 +-
 lib/services/sourced_track/sources/youtube.dart |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/provider/piped_instances_provider.dart b/lib/provider/piped_instances_provider.dart
index 264b7048..d571f730 100644
--- a/lib/provider/piped_instances_provider.dart
+++ b/lib/provider/piped_instances_provider.dart
@@ -1,11 +1,17 @@
+import 'package:catcher_2/catcher_2.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:piped_client/piped_client.dart';
 import 'package:spotube/services/sourced_track/sources/piped.dart';
 
 final pipedInstancesFutureProvider = FutureProvider<List<PipedInstance>>(
   (ref) async {
-    final pipedClient = ref.watch(pipedProvider);
+    try {
+      final pipedClient = ref.watch(pipedProvider);
 
-    return await pipedClient.instanceList();
+      return await pipedClient.instanceList();
+    } catch (e, stack) {
+      Catcher2.reportCheckedError(e, stack);
+      return <PipedInstance>[];
+    }
   },
 );
diff --git a/lib/services/sourced_track/sources/piped.dart b/lib/services/sourced_track/sources/piped.dart
index 52364ce8..8a1ec1bc 100644
--- a/lib/services/sourced_track/sources/piped.dart
+++ b/lib/services/sourced_track/sources/piped.dart
@@ -160,7 +160,7 @@ class PipedSourcedTrack extends SourcedTrack {
     final query = SourcedTrack.getSearchTerm(track);
 
     final PipedSearchResult(items: searchResults) = await pipedClient.search(
-      query,
+      "$query - Topic",
       preference.searchMode == SearchMode.youtube
           ? PipedFilter.video
           : PipedFilter.musicSongs,
diff --git a/lib/services/sourced_track/sources/youtube.dart b/lib/services/sourced_track/sources/youtube.dart
index 8708fc03..f363937c 100644
--- a/lib/services/sourced_track/sources/youtube.dart
+++ b/lib/services/sourced_track/sources/youtube.dart
@@ -210,7 +210,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
     final query = SourcedTrack.getSearchTerm(track);
 
     final searchResults = await youtubeClient.search.search(
-      query,
+      "$query - Topic",
       filter: TypeFilters.video,
     );