lib/services/sourced_track/sourced_track.dart

@@ -5,7 +5,6 @@ import 'package:rhythm_box/providers/database.dart';
 import 'package:rhythm_box/providers/error_notifier.dart';
 import 'package:rhythm_box/providers/user_preferences.dart';
 import 'package:rhythm_box/services/database/database.dart';
-import 'package:rhythm_box/services/server/active_sourced_track.dart';
 import 'package:rhythm_box/services/sourced_track/sources/kugou.dart';
 import 'package:rhythm_box/services/sourced_track/sources/netease.dart';
 import 'package:rhythm_box/services/utils.dart';
@@ -82,31 +81,14 @@ abstract class SourcedTrack extends Track {
     };
   }
 
-  static Future<SourcedTrack?> reRoutineFetchFromTrack(
+  static Type getTrackBySourceInfo(SourceInfo info) {
-      Track track, SourceMatchTableData cachedSource) {
-    final preferences = Get.find<UserPreferencesProvider>().state.value;
-    final ytOrPiped = preferences.audioSource == AudioSource.piped
-        ? PipedSourcedTrack.fetchFromTrack
-        : YoutubeSourcedTrack.fetchFromTrack;
     final sourceInfoTrackMap = {
-      SourceType.youtube: ytOrPiped,
+      YoutubeSourceInfo: YoutubeSourcedTrack,
-      SourceType.youtubeMusic: ytOrPiped,
+      PipedSourceInfo: PipedSourcedTrack,
-      SourceType.netease: NeteaseSourcedTrack.fetchFromTrack,
+      NeteaseSourceInfo: NeteaseSourcedTrack,
-      SourceType.kugou: KugouSourcedTrack.fetchFromTrack,
+      KugouSourceInfo: KugouSourcedTrack,
     };
-    return sourceInfoTrackMap[cachedSource.sourceType]!(track: track);
+    return sourceInfoTrackMap[info.runtimeType]!;
-  }
-
-  Future<SourcedTrack?> reRoutineSwapSiblings(SourceInfo info) {
-    final sourceInfoTrackMap = {
-      YoutubeSourceInfo: YoutubeSourcedTrack.fetchFromTrack,
-      PipedSourceInfo: PipedSourcedTrack.fetchFromTrack,
-      NeteaseSourceInfo: NeteaseSourcedTrack.fetchFromTrack,
-      KugouSourceInfo: KugouSourcedTrack.fetchFromTrack,
-    };
-    return sourceInfoTrackMap[info.runtimeType]!(
-      track: Get.find<ActiveSourcedTrackProvider>().state.value!,
-    );
   }
 
   static String getSearchTerm(Track track) {
@@ -188,7 +170,7 @@ abstract class SourcedTrack extends Track {
 
       return switch (audioSource) {
         AudioSource.netease =>
-          await fetchFromTrack(track: track, fallbackTo: AudioSource.youtube),
+          await fetchFromTrack(track: track, fallbackTo: AudioSource.kugou),
         AudioSource.kugou =>
           await fetchFromTrack(track: track, fallbackTo: AudioSource.youtube),
         _ =>

lib/services/sourced_track/sources/kugou.dart

@@ -51,7 +51,7 @@ class KugouSourcedTrack extends SourcedTrack {
     return client;
   }
 
-  static Future<SourcedTrack> fetchFromTrack({
+  static Future<KugouSourcedTrack> fetchFromTrack({
     required Track track,
   }) async {
     final DatabaseProvider db = Get.find();
@@ -77,7 +77,6 @@ class KugouSourcedTrack extends SourcedTrack {
               sourceId: siblings.first.info.id,
               sourceType: const Value(SourceType.kugou),
             ),
-            mode: InsertMode.insertOrReplace,
           );
 
       return KugouSourcedTrack(
@@ -86,11 +85,6 @@ class KugouSourcedTrack extends SourcedTrack {
         sourceInfo: siblings.first.info,
         track: track,
       );
-    } else if (cachedSource.sourceType != SourceType.kugou) {
-      final out =
-          await SourcedTrack.reRoutineFetchFromTrack(track, cachedSource);
-      if (out == null) throw TrackNotFoundError(track);
-      return out;
     }
 
     return KugouSourcedTrack(
@@ -177,7 +171,8 @@ class KugouSourcedTrack extends SourcedTrack {
   @override
   Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
     if (sibling is! KugouSourceInfo) {
-      return reRoutineSwapSiblings(sibling);
+      return (SourcedTrack.getTrackBySourceInfo(sibling) as SourcedTrack)
+          .swapWithSibling(sibling);
     }
 
     if (sibling.id == sourceInfo.id) {

lib/services/sourced_track/sources/netease.dart

@@ -73,7 +73,7 @@ class NeteaseSourcedTrack extends SourcedTrack {
     return _lookedUpRealIp!;
   }
 
-  static Future<SourcedTrack> fetchFromTrack({
+  static Future<NeteaseSourcedTrack> fetchFromTrack({
     required Track track,
   }) async {
     final DatabaseProvider db = Get.find();
@@ -105,7 +105,6 @@ class NeteaseSourcedTrack extends SourcedTrack {
               sourceId: siblings.first.info.id,
               sourceType: const Value(SourceType.netease),
             ),
-            mode: InsertMode.insertOrReplace,
           );
 
       return NeteaseSourcedTrack(
@@ -114,16 +113,10 @@ class NeteaseSourcedTrack extends SourcedTrack {
         sourceInfo: siblings.first.info,
         track: track,
       );
-    } else if (cachedSource.sourceType != SourceType.netease) {
-      final out =
-          await SourcedTrack.reRoutineFetchFromTrack(track, cachedSource);
-      if (out == null) throw TrackNotFoundError(track);
-      return out;
     }
 
     final client = getClient();
     final resp = await client.get('/song/detail?ids=${cachedSource.sourceId}');
-    if (resp.body?['songs'] == null) throw TrackNotFoundError(track);
     final item = (resp.body['songs'] as List<dynamic>).firstOrNull;
 
     if (item == null) throw TrackNotFoundError(track);
@@ -175,7 +168,7 @@ class NeteaseSourcedTrack extends SourcedTrack {
 
     final client = getClient();
     final resp = await client.get(
-      '/search?keywords=${Uri.encodeComponent(query)}&realIP=${await NeteaseSourcedTrack.lookupRealIp()}',
+      '/search?keywords=${Uri.encodeComponent(query)}&realIP=${NeteaseSourcedTrack.lookupRealIp()}',
     );
     if (resp.body?['code'] == 405) throw TrackNotFoundError(track);
     final results = resp.body['result']['songs'];
@@ -209,7 +202,8 @@ class NeteaseSourcedTrack extends SourcedTrack {
   @override
   Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
     if (sibling is! NeteaseSourceInfo) {
-      return reRoutineSwapSiblings(sibling);
+      return (SourcedTrack.getTrackBySourceInfo(sibling) as SourcedTrack)
+          .swapWithSibling(sibling);
     }
 
     if (sibling.id == sourceInfo.id) {

lib/services/sourced_track/sources/piped.dart

@@ -57,14 +57,6 @@ class PipedSourcedTrack extends SourcedTrack {
 
     final preferences = Get.find<UserPreferencesProvider>().state.value;
 
-    if (cachedSource?.sourceType != SourceType.youtube &&
-        cachedSource?.sourceType != SourceType.youtubeMusic) {
-      final out =
-          await SourcedTrack.reRoutineFetchFromTrack(track, cachedSource!);
-      if (out == null) throw TrackNotFoundError(track);
-      return out;
-    }
-
     if (cachedSource == null) {
       final siblings = await fetchSiblings(track: track);
       if (siblings.isEmpty) {
@@ -81,7 +73,6 @@ class PipedSourcedTrack extends SourcedTrack {
                     : SourceType.youtubeMusic,
               ),
             ),
-            mode: InsertMode.insertOrReplace,
           );
 
       return PipedSourcedTrack(
@@ -265,7 +256,8 @@ class PipedSourcedTrack extends SourcedTrack {
   @override
   Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
     if (sibling is! PipedSourceInfo) {
-      return reRoutineSwapSiblings(sibling);
+      return (SourcedTrack.getTrackBySourceInfo(sibling) as SourcedTrack)
+          .swapWithSibling(sibling);
     }
 
     if (sibling.id == sourceInfo.id) {

lib/services/sourced_track/sources/youtube.dart

@@ -43,7 +43,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
     required super.track,
   });
 
-  static Future<SourcedTrack> fetchFromTrack({
+  static Future<YoutubeSourcedTrack> fetchFromTrack({
     required Track track,
   }) async {
     final DatabaseProvider db = Get.find();
@@ -78,11 +78,6 @@ class YoutubeSourcedTrack extends SourcedTrack {
         sourceInfo: siblings.first.info,
         track: track,
       );
-    } else if (cachedSource.sourceType != SourceType.youtube) {
-      final out =
-          await SourcedTrack.reRoutineFetchFromTrack(track, cachedSource);
-      if (out == null) throw TrackNotFoundError(track);
-      return out;
     }
 
     final item = await youtubeClient.videos.get(cachedSource.sourceId);
@@ -276,7 +271,8 @@ class YoutubeSourcedTrack extends SourcedTrack {
   @override
   Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
     if (sibling is! YoutubeSourceInfo) {
-      return reRoutineSwapSiblings(sibling);
+      return (SourcedTrack.getTrackBySourceInfo(sibling) as SourcedTrack)
+          .swapWithSibling(sibling);
     }
 
     if (sibling.id == sourceInfo.id) {

lib/widgets/player/sibling_tracks.dart

@@ -120,7 +120,7 @@ class _SiblingTracksState extends State<SiblingTracks> {
       } else if (preferences.audioSource == AudioSource.netease) {
         final client = NeteaseSourcedTrack.getClient();
         final resp = await client.get(
-            '/search?keywords=${Uri.encodeComponent(searchTerm)}&realIP=${await NeteaseSourcedTrack.lookupRealIp()}');
+            '/search?keywords=${Uri.encodeComponent(searchTerm)}&realIP=${NeteaseSourcedTrack.lookupRealIp()}');
         final searchResults = resp.body['result']['songs']
             .map(NeteaseSourcedTrack.toSourceInfo)
             .toList();

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+18
+version: 1.0.0+15
 
 environment:
   sdk: ^3.5.0
@@ -180,3 +180,4 @@ flutter_native_splash:
   color: "#fef8f5"
   color_dark: "#18120d"
   image: assets/icon-w-shadow.png
+