🐛 Bug fixes on looking up ips

🐛 Fix fallback source switch causing error

README.md

@@ -5,19 +5,30 @@ Yet another spotify third-party client. Support multi-platform because built wit
 This project is inspired by and taken supported by [spotube](https://spotube.krtirtho.dev).
 Their original app is good enough. But I just want to redesign the user interface and make it ready add to more features and more backend support.
 
+## Highlight
+
+Compare to original spotube. This project added more audio source e.g. netease cloud music, kugou and provide the ability to use in China Mainland.
+
+At the same time, this project also focus on playing experience of VOCALOID songs.
+We improve the search and rank algorithm to make the querying will less pick the cover version instead of original ones.
+
+Due to the end service of jiosaavn in Asian region (maybe other regions also affected). We removed the jiosaavn audio source.
+
 ## Roadmap
 
 - [x] Playing music
-    - [x] Add netease music as source
-    - [ ] Add bilibili as source
-    - [ ] Add kuwo music as source
-    - [ ] Add kugo music as source
+  - [x] Add netease music as source
+  - [ ] Add bilibili as source
+  - [ ] Add kuwo music as source
+  - [x] Add kugou music as source
+  - [x] Optimize fallback strategy
 - [x] Re-design user interface
-    - [x] Simplified UI and UX
-    - [x] Support for large screen device
+  - [x] Simplified UI and UX
+  - [x] Support for large screen device
 
 ## License
 
 This project is open-sourced under APGLv3 license. The original spotube project is open-sourced under license BSD-Clause4 and copyright by Kingkor Roy Tirtho.
 
-This project is all rights reversed by LittleSheep and Solsynth LLC.
+This project is all rights reversed by LittleSheep and Solsynth LLC.
+

lib/providers/error_notifier.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:developer';
 
 import 'package:flutter/material.dart';
@@ -6,12 +7,16 @@ import 'package:get/get.dart';
 class ErrorNotifier extends GetxController {
   Rx<MaterialBanner?> showing = Rx(null);
 
+  Timer? _autoDismissTimer;
+
   void logError(String msg, {StackTrace? trace}) {
     log('$msg${trace != null ? '\nTrace:\n$trace' : ''}');
     showError(msg);
   }
 
   void showError(String msg) {
+    _autoDismissTimer?.cancel();
+
     showing.value = MaterialBanner(
       dividerColor: Colors.transparent,
       leading: const Icon(Icons.error),
@@ -34,5 +39,9 @@ class ErrorNotifier extends GetxController {
         ),
       ],
     );
+
+    _autoDismissTimer = Timer(const Duration(seconds: 3), () {
+      showing.value = null;
+    });
   }
 }

lib/providers/user_preferences.dart

@@ -178,4 +178,8 @@ class UserPreferencesProvider extends GetxController {
     setData(PreferencesTableCompanion(playerWakelock: Value(wakelock)));
     WakelockPlus.toggle(enable: wakelock);
   }
+
+  void setOverrideCacheProvider(bool override) {
+    setData(PreferencesTableCompanion(overrideCacheProvider: Value(override)));
+  }
 }

lib/screens/settings.dart

@@ -220,6 +220,44 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 ),
               ),
               const Divider(thickness: 0.3, height: 1),
+              Obx(
+                () => CheckboxListTile(
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+                  secondary: const Icon(Icons.update),
+                  title: const Text('Override Cache Provider'),
+                  subtitle: const Text(
+                      'Decide whether use original cached source or query a new one from current audio provider'),
+                  value: _preferences.state.value.overrideCacheProvider,
+                  onChanged: (value) =>
+                      _preferences.setOverrideCacheProvider(value ?? false),
+                ),
+              ),
+              Obx(
+                () => Column(
+                  children: [
+                    const ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 24),
+                      leading: Icon(Icons.cloud),
+                      title: Text('Netease Cloud Music API'),
+                      subtitle: Text(
+                          'Use your own endpoint to prevent IP throttling and more'),
+                    ),
+                    TextFormField(
+                      initialValue: _preferences.state.value.neteaseApiInstance,
+                      decoration: const InputDecoration(
+                        hintText: 'Endpoint URL',
+                        isDense: true,
+                      ),
+                      onChanged: (value) {
+                        _preferences.setNeteaseApiInstance(value);
+                      },
+                      onTapOutside: (_) =>
+                          FocusManager.instance.primaryFocus?.unfocus(),
+                    ).paddingOnly(left: 24, right: 24, bottom: 12),
+                  ],
+                ),
+              ),
+              const Divider(thickness: 0.3, height: 1),
               Obx(
                 () => SwitchListTile(
                   contentPadding: const EdgeInsets.symmetric(horizontal: 24),

lib/services/database/database.dart

@@ -55,7 +55,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase() : super(_openConnection());
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 2;
 
   @override
   MigrationStrategy get migration {
@@ -63,7 +63,14 @@ class AppDatabase extends _$AppDatabase {
       onCreate: (Migrator m) async {
         await m.createAll();
       },
-      onUpgrade: (Migrator m, int from, int to) async {},
+      onUpgrade: (Migrator m, int from, int to) async {
+        if (from < 2) {
+          await m.addColumn(
+            preferencesTable,
+            preferencesTable.overrideCacheProvider,
+          );
+        }
+      },
     );
   }
 }

lib/services/database/database.g.dart

@@ -640,6 +640,16 @@ class $PreferencesTableTable extends PreferencesTable
       defaultConstraints: GeneratedColumn.constraintIsAlways(
           'CHECK ("player_wakelock" IN (0, 1))'),
       defaultValue: const Constant(true));
+  static const VerificationMeta _overrideCacheProviderMeta =
+      const VerificationMeta('overrideCacheProvider');
+  @override
+  late final GeneratedColumn<bool> overrideCacheProvider =
+      GeneratedColumn<bool>('override_cache_provider', aliasedName, false,
+          type: DriftSqlType.bool,
+          requiredDuringInsert: false,
+          defaultConstraints: GeneratedColumn.constraintIsAlways(
+              'CHECK ("override_cache_provider" IN (0, 1))'),
+          defaultValue: const Constant(true));
   @override
   List<GeneratedColumn> get $columns => [
         id,
@@ -665,7 +675,8 @@ class $PreferencesTableTable extends PreferencesTable
         streamMusicCodec,
         downloadMusicCodec,
         endlessPlayback,
-        playerWakelock
+        playerWakelock,
+        overrideCacheProvider
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -760,6 +771,12 @@ class $PreferencesTableTable extends PreferencesTable
           playerWakelock.isAcceptableOrUnknown(
               data['player_wakelock']!, _playerWakelockMeta));
     }
+    if (data.containsKey('override_cache_provider')) {
+      context.handle(
+          _overrideCacheProviderMeta,
+          overrideCacheProvider.isAcceptableOrUnknown(
+              data['override_cache_provider']!, _overrideCacheProviderMeta));
+    }
     return context;
   }
 
@@ -830,6 +847,9 @@ class $PreferencesTableTable extends PreferencesTable
           .read(DriftSqlType.bool, data['${effectivePrefix}endless_playback'])!,
       playerWakelock: attachedDatabase.typeMapping
           .read(DriftSqlType.bool, data['${effectivePrefix}player_wakelock'])!,
+      overrideCacheProvider: attachedDatabase.typeMapping.read(
+          DriftSqlType.bool,
+          data['${effectivePrefix}override_cache_provider'])!,
     );
   }
 
@@ -894,6 +914,7 @@ class PreferencesTableData extends DataClass
   final SourceCodecs downloadMusicCodec;
   final bool endlessPlayback;
   final bool playerWakelock;
+  final bool overrideCacheProvider;
   const PreferencesTableData(
       {required this.id,
       required this.audioQuality,
@@ -918,7 +939,8 @@ class PreferencesTableData extends DataClass
       required this.streamMusicCodec,
       required this.downloadMusicCodec,
       required this.endlessPlayback,
-      required this.playerWakelock});
+      required this.playerWakelock,
+      required this.overrideCacheProvider});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -986,6 +1008,7 @@ class PreferencesTableData extends DataClass
     }
     map['endless_playback'] = Variable<bool>(endlessPlayback);
     map['player_wakelock'] = Variable<bool>(playerWakelock);
+    map['override_cache_provider'] = Variable<bool>(overrideCacheProvider);
     return map;
   }
 
@@ -1015,6 +1038,7 @@ class PreferencesTableData extends DataClass
       downloadMusicCodec: Value(downloadMusicCodec),
       endlessPlayback: Value(endlessPlayback),
       playerWakelock: Value(playerWakelock),
+      overrideCacheProvider: Value(overrideCacheProvider),
     );
   }
 
@@ -1058,6 +1082,8 @@ class PreferencesTableData extends DataClass
           .fromJson(serializer.fromJson<String>(json['downloadMusicCodec'])),
       endlessPlayback: serializer.fromJson<bool>(json['endlessPlayback']),
       playerWakelock: serializer.fromJson<bool>(json['playerWakelock']),
+      overrideCacheProvider:
+          serializer.fromJson<bool>(json['overrideCacheProvider']),
     );
   }
   @override
@@ -1100,6 +1126,7 @@ class PreferencesTableData extends DataClass
           .toJson(downloadMusicCodec)),
       'endlessPlayback': serializer.toJson<bool>(endlessPlayback),
       'playerWakelock': serializer.toJson<bool>(playerWakelock),
+      'overrideCacheProvider': serializer.toJson<bool>(overrideCacheProvider),
     };
   }
 
@@ -1127,7 +1154,8 @@ class PreferencesTableData extends DataClass
           SourceCodecs? streamMusicCodec,
           SourceCodecs? downloadMusicCodec,
           bool? endlessPlayback,
-          bool? playerWakelock}) =>
+          bool? playerWakelock,
+          bool? overrideCacheProvider}) =>
       PreferencesTableData(
         id: id ?? this.id,
         audioQuality: audioQuality ?? this.audioQuality,
@@ -1153,6 +1181,8 @@ class PreferencesTableData extends DataClass
         downloadMusicCodec: downloadMusicCodec ?? this.downloadMusicCodec,
         endlessPlayback: endlessPlayback ?? this.endlessPlayback,
         playerWakelock: playerWakelock ?? this.playerWakelock,
+        overrideCacheProvider:
+            overrideCacheProvider ?? this.overrideCacheProvider,
       );
   PreferencesTableData copyWithCompanion(PreferencesTableCompanion data) {
     return PreferencesTableData(
@@ -1216,6 +1246,9 @@ class PreferencesTableData extends DataClass
       playerWakelock: data.playerWakelock.present
           ? data.playerWakelock.value
           : this.playerWakelock,
+      overrideCacheProvider: data.overrideCacheProvider.present
+          ? data.overrideCacheProvider.value
+          : this.overrideCacheProvider,
     );
   }
 
@@ -1245,7 +1278,8 @@ class PreferencesTableData extends DataClass
           ..write('streamMusicCodec: $streamMusicCodec, ')
           ..write('downloadMusicCodec: $downloadMusicCodec, ')
           ..write('endlessPlayback: $endlessPlayback, ')
-          ..write('playerWakelock: $playerWakelock')
+          ..write('playerWakelock: $playerWakelock, ')
+          ..write('overrideCacheProvider: $overrideCacheProvider')
           ..write(')'))
         .toString();
   }
@@ -1275,7 +1309,8 @@ class PreferencesTableData extends DataClass
         streamMusicCodec,
         downloadMusicCodec,
         endlessPlayback,
-        playerWakelock
+        playerWakelock,
+        overrideCacheProvider
       ]);
   @override
   bool operator ==(Object other) =>
@@ -1304,7 +1339,8 @@ class PreferencesTableData extends DataClass
           other.streamMusicCodec == this.streamMusicCodec &&
           other.downloadMusicCodec == this.downloadMusicCodec &&
           other.endlessPlayback == this.endlessPlayback &&
-          other.playerWakelock == this.playerWakelock);
+          other.playerWakelock == this.playerWakelock &&
+          other.overrideCacheProvider == this.overrideCacheProvider);
 }
 
 class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
@@ -1332,6 +1368,7 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
   final Value<SourceCodecs> downloadMusicCodec;
   final Value<bool> endlessPlayback;
   final Value<bool> playerWakelock;
+  final Value<bool> overrideCacheProvider;
   const PreferencesTableCompanion({
     this.id = const Value.absent(),
     this.audioQuality = const Value.absent(),
@@ -1357,6 +1394,7 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
     this.downloadMusicCodec = const Value.absent(),
     this.endlessPlayback = const Value.absent(),
     this.playerWakelock = const Value.absent(),
+    this.overrideCacheProvider = const Value.absent(),
   });
   PreferencesTableCompanion.insert({
     this.id = const Value.absent(),
@@ -1383,6 +1421,7 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
     this.downloadMusicCodec = const Value.absent(),
     this.endlessPlayback = const Value.absent(),
     this.playerWakelock = const Value.absent(),
+    this.overrideCacheProvider = const Value.absent(),
   });
   static Insertable<PreferencesTableData> custom({
     Expression<int>? id,
@@ -1409,6 +1448,7 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
     Expression<String>? downloadMusicCodec,
     Expression<bool>? endlessPlayback,
     Expression<bool>? playerWakelock,
+    Expression<bool>? overrideCacheProvider,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
@@ -1439,6 +1479,8 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
         'download_music_codec': downloadMusicCodec,
       if (endlessPlayback != null) 'endless_playback': endlessPlayback,
       if (playerWakelock != null) 'player_wakelock': playerWakelock,
+      if (overrideCacheProvider != null)
+        'override_cache_provider': overrideCacheProvider,
     });
   }
 
@@ -1466,7 +1508,8 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
       Value<SourceCodecs>? streamMusicCodec,
       Value<SourceCodecs>? downloadMusicCodec,
       Value<bool>? endlessPlayback,
-      Value<bool>? playerWakelock}) {
+      Value<bool>? playerWakelock,
+      Value<bool>? overrideCacheProvider}) {
     return PreferencesTableCompanion(
       id: id ?? this.id,
       audioQuality: audioQuality ?? this.audioQuality,
@@ -1492,6 +1535,8 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
       downloadMusicCodec: downloadMusicCodec ?? this.downloadMusicCodec,
       endlessPlayback: endlessPlayback ?? this.endlessPlayback,
       playerWakelock: playerWakelock ?? this.playerWakelock,
+      overrideCacheProvider:
+          overrideCacheProvider ?? this.overrideCacheProvider,
     );
   }
 
@@ -1589,6 +1634,10 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
     if (playerWakelock.present) {
       map['player_wakelock'] = Variable<bool>(playerWakelock.value);
     }
+    if (overrideCacheProvider.present) {
+      map['override_cache_provider'] =
+          Variable<bool>(overrideCacheProvider.value);
+    }
     return map;
   }
 
@@ -1618,7 +1667,8 @@ class PreferencesTableCompanion extends UpdateCompanion<PreferencesTableData> {
           ..write('streamMusicCodec: $streamMusicCodec, ')
           ..write('downloadMusicCodec: $downloadMusicCodec, ')
           ..write('endlessPlayback: $endlessPlayback, ')
-          ..write('playerWakelock: $playerWakelock')
+          ..write('playerWakelock: $playerWakelock, ')
+          ..write('overrideCacheProvider: $overrideCacheProvider')
           ..write(')'))
         .toString();
   }
@@ -4109,6 +4159,7 @@ typedef $$PreferencesTableTableCreateCompanionBuilder
   Value<SourceCodecs> downloadMusicCodec,
   Value<bool> endlessPlayback,
   Value<bool> playerWakelock,
+  Value<bool> overrideCacheProvider,
 });
 typedef $$PreferencesTableTableUpdateCompanionBuilder
     = PreferencesTableCompanion Function({
@@ -4136,6 +4187,7 @@ typedef $$PreferencesTableTableUpdateCompanionBuilder
   Value<SourceCodecs> downloadMusicCodec,
   Value<bool> endlessPlayback,
   Value<bool> playerWakelock,
+  Value<bool> overrideCacheProvider,
 });
 
 class $$PreferencesTableTableTableManager extends RootTableManager<
@@ -4180,6 +4232,7 @@ class $$PreferencesTableTableTableManager extends RootTableManager<
             Value<SourceCodecs> downloadMusicCodec = const Value.absent(),
             Value<bool> endlessPlayback = const Value.absent(),
             Value<bool> playerWakelock = const Value.absent(),
+            Value<bool> overrideCacheProvider = const Value.absent(),
           }) =>
               PreferencesTableCompanion(
             id: id,
@@ -4206,6 +4259,7 @@ class $$PreferencesTableTableTableManager extends RootTableManager<
             downloadMusicCodec: downloadMusicCodec,
             endlessPlayback: endlessPlayback,
             playerWakelock: playerWakelock,
+            overrideCacheProvider: overrideCacheProvider,
           ),
           createCompanionCallback: ({
             Value<int> id = const Value.absent(),
@@ -4232,6 +4286,7 @@ class $$PreferencesTableTableTableManager extends RootTableManager<
             Value<SourceCodecs> downloadMusicCodec = const Value.absent(),
             Value<bool> endlessPlayback = const Value.absent(),
             Value<bool> playerWakelock = const Value.absent(),
+            Value<bool> overrideCacheProvider = const Value.absent(),
           }) =>
               PreferencesTableCompanion.insert(
             id: id,
@@ -4258,6 +4313,7 @@ class $$PreferencesTableTableTableManager extends RootTableManager<
             downloadMusicCodec: downloadMusicCodec,
             endlessPlayback: endlessPlayback,
             playerWakelock: playerWakelock,
+            overrideCacheProvider: overrideCacheProvider,
           ),
         ));
 }
@@ -4408,6 +4464,11 @@ class $$PreferencesTableTableFilterComposer
       column: $state.table.playerWakelock,
       builder: (column, joinBuilders) =>
           ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<bool> get overrideCacheProvider => $state.composableBuilder(
+      column: $state.table.overrideCacheProvider,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
 }
 
 class $$PreferencesTableTableOrderingComposer
@@ -4532,6 +4593,11 @@ class $$PreferencesTableTableOrderingComposer
       column: $state.table.playerWakelock,
       builder: (column, joinBuilders) =>
           ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<bool> get overrideCacheProvider => $state.composableBuilder(
+      column: $state.table.overrideCacheProvider,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
 }
 
 typedef $$ScrobblerTableTableCreateCompanionBuilder = ScrobblerTableCompanion

lib/services/database/tables/preferences.dart

@@ -90,6 +90,8 @@ class PreferencesTable extends Table {
       boolean().withDefault(const Constant(true))();
   BoolColumn get playerWakelock =>
       boolean().withDefault(const Constant(true))();
+  BoolColumn get overrideCacheProvider =>
+      boolean().withDefault(const Constant(true))();
 
   // Default values as PreferencesTableData
   static PreferencesTableData defaults() {
@@ -118,6 +120,7 @@ class PreferencesTable extends Table {
       downloadMusicCodec: SourceCodecs.m4a,
       endlessPlayback: true,
       playerWakelock: true,
+      overrideCacheProvider: true,
     );
   }
 }

lib/services/server/routes/playback.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:dio/dio.dart' hide Response;
 import 'package:flutter/foundation.dart';
@@ -41,8 +42,17 @@ class ServerPlaybackRoutesProvider {
         // Special processing for kugou to get real assets url
         final resp = await GetConnect(timeout: const Duration(seconds: 30))
             .get(sourcedTrack.url);
-        final realUrl =
-            KugouSourcedTrack.unescapeUrl(jsonDecode(resp.body)['url'][0]);
+        final urls = jsonDecode(resp.body)['url'];
+        if (urls?.isEmpty ?? true) {
+          Get.find<ErrorNotifier>().showError(
+            '[PlaybackServer] Unable get audio source via Kugou, probably cause by paid needed resources.',
+          );
+          return Response(
+            HttpStatus.notFound,
+            body: 'Unable get audio source via Kugou',
+          );
+        }
+        final realUrl = KugouSourcedTrack.unescapeUrl(urls.first);
         url = realUrl;
       }
 

lib/services/sourced_track/sourced_track.dart

@@ -1,8 +1,11 @@
 import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
 import 'package:get/get.dart';
+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';
@@ -79,6 +82,33 @@ abstract class SourcedTrack extends Track {
     };
   }
 
+  static Future<SourcedTrack?> reRoutineFetchFromTrack(
+      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,
+      SourceType.youtubeMusic: ytOrPiped,
+      SourceType.netease: NeteaseSourcedTrack.fetchFromTrack,
+      SourceType.kugou: KugouSourcedTrack.fetchFromTrack,
+    };
+    return sourceInfoTrackMap[cachedSource.sourceType]!(track: track);
+  }
+
+  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) {
     final artists = (track.artists ?? [])
         .map((ar) => ar.name)
@@ -97,9 +127,43 @@ abstract class SourcedTrack extends Track {
 
   static Future<SourcedTrack> fetchFromTrack({
     required Track track,
+    AudioSource? fallbackTo,
   }) async {
     final preferences = Get.find<UserPreferencesProvider>().state.value;
-    final audioSource = preferences.audioSource;
+    var audioSource = preferences.audioSource;
+
+    if (!preferences.overrideCacheProvider && fallbackTo == null) {
+      final DatabaseProvider db = Get.find();
+      final cachedSource =
+          await (db.database.select(db.database.sourceMatchTable)
+                ..where((s) => s.trackId.equals(track.id!))
+                ..limit(1)
+                ..orderBy([
+                  (s) => OrderingTerm(
+                      expression: s.createdAt, mode: OrderingMode.desc),
+                ]))
+              .get()
+              .then((s) => s.firstOrNull);
+
+      final ytOrPiped = preferences.audioSource == AudioSource.youtube
+          ? AudioSource.youtube
+          : AudioSource.piped;
+      final sourceTypeTrackMap = {
+        SourceType.youtube: ytOrPiped,
+        SourceType.youtubeMusic: ytOrPiped,
+        SourceType.netease: AudioSource.netease,
+        SourceType.kugou: AudioSource.kugou,
+      };
+
+      if (cachedSource != null) {
+        final cachedAudioSource = sourceTypeTrackMap[cachedSource.sourceType]!;
+        audioSource = cachedAudioSource;
+      }
+    }
+
+    if (fallbackTo != null) {
+      audioSource = fallbackTo;
+    }
 
     try {
       return switch (audioSource) {
@@ -115,14 +179,20 @@ abstract class SourcedTrack extends Track {
       Get.find<ErrorNotifier>().showError(
         '${err.toString()} via ${preferences.audioSource.label}, querying in fallback sources...',
       );
-      return switch (preferences.audioSource) {
-        AudioSource.piped ||
-        AudioSource.youtube =>
-          await NeteaseSourcedTrack.fetchFromTrack(track: track),
+
+      if (fallbackTo != null) {
+        // Prevent infinite fallback
+        if (audioSource == AudioSource.youtube ||
+            audioSource == AudioSource.piped) rethrow;
+      }
+
+      return switch (audioSource) {
         AudioSource.netease =>
-          await KugouSourcedTrack.fetchFromTrack(track: track),
+          await fetchFromTrack(track: track, fallbackTo: AudioSource.youtube),
         AudioSource.kugou =>
-          await YoutubeSourcedTrack.fetchFromTrack(track: track),
+          await fetchFromTrack(track: track, fallbackTo: AudioSource.youtube),
+        _ =>
+          await fetchFromTrack(track: track, fallbackTo: AudioSource.netease),
       };
     } on HttpClientClosedException catch (_) {
       return await PipedSourcedTrack.fetchFromTrack(track: track);

lib/services/sourced_track/sources/kugou.dart

@@ -51,7 +51,7 @@ class KugouSourcedTrack extends SourcedTrack {
     return client;
   }
 
-  static Future<KugouSourcedTrack> fetchFromTrack({
+  static Future<SourcedTrack> fetchFromTrack({
     required Track track,
   }) async {
     final DatabaseProvider db = Get.find();
@@ -77,6 +77,7 @@ class KugouSourcedTrack extends SourcedTrack {
               sourceId: siblings.first.info.id,
               sourceType: const Value(SourceType.kugou),
             ),
+            mode: InsertMode.insertOrReplace,
           );
 
       return KugouSourcedTrack(
@@ -85,6 +86,11 @@ 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(
@@ -109,7 +115,9 @@ class KugouSourcedTrack extends SourcedTrack {
 
     final hash = manifest is SourceMatchTableData
         ? manifest.sourceId
-        : manifest?['hash'];
+        : manifest is KugouSourceInfo
+            ? manifest.id
+            : manifest?['hash'];
     final key = md5.convert(utf8.encode('${hash}kgcloudv2')).toString();
     final url =
         '$baseUrl/song/url?key=$key&hash=$hash&appid=1005&pid=2&cmd=25&behavior=play';
@@ -142,7 +150,8 @@ class KugouSourcedTrack extends SourcedTrack {
     // We can just trust kugou music for now
     // If we need to check is the result correct, refer to this code
     // https://github.com/KRTirtho/spotube/blob/9b024120601c0d381edeab4460cb22f87149d0f8/lib/services/sourced_track/sources/jiosaavn.dart#L129
-    final matchedResults = results.map(toSiblingType).toList();
+    final matchedResults =
+        results.where((x) => x['pay_type'] == 0).map(toSiblingType).toList();
 
     return matchedResults.cast<SiblingType>();
   }
@@ -166,7 +175,11 @@ class KugouSourcedTrack extends SourcedTrack {
   }
 
   @override
-  Future<KugouSourcedTrack?> swapWithSibling(SourceInfo sibling) async {
+  Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
+    if (sibling is! KugouSourceInfo) {
+      return reRoutineSwapSiblings(sibling);
+    }
+
     if (sibling.id == sourceInfo.id) {
       return null;
     }
@@ -181,7 +194,7 @@ class KugouSourcedTrack extends SourcedTrack {
       ..insert(0, sourceInfo);
 
     final info = newSourceInfo as KugouSourceInfo;
-    final source = toSourceMap(newSourceInfo.id);
+    final source = toSourceMap(newSourceInfo);
 
     final db = Get.find<DatabaseProvider>();
     await db.database.into(db.database.sourceMatchTable).insert(

lib/services/sourced_track/sources/netease.dart

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

lib/services/sourced_track/sources/piped.dart

@@ -57,6 +57,14 @@ 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) {
@@ -73,6 +81,7 @@ class PipedSourcedTrack extends SourcedTrack {
                     : SourceType.youtubeMusic,
               ),
             ),
+            mode: InsertMode.insertOrReplace,
           );
 
       return PipedSourcedTrack(
@@ -255,6 +264,10 @@ class PipedSourcedTrack extends SourcedTrack {
 
   @override
   Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
+    if (sibling is! PipedSourceInfo) {
+      return reRoutineSwapSiblings(sibling);
+    }
+
     if (sibling.id == sourceInfo.id) {
       return null;
     }

lib/services/sourced_track/sources/youtube.dart

@@ -43,7 +43,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
     required super.track,
   });
 
-  static Future<YoutubeSourcedTrack> fetchFromTrack({
+  static Future<SourcedTrack> fetchFromTrack({
     required Track track,
   }) async {
     final DatabaseProvider db = Get.find();
@@ -78,6 +78,11 @@ 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);
@@ -269,7 +274,11 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }
 
   @override
-  Future<YoutubeSourcedTrack?> swapWithSibling(SourceInfo sibling) async {
+  Future<SourcedTrack?> swapWithSibling(SourceInfo sibling) async {
+    if (sibling is! YoutubeSourceInfo) {
+      return reRoutineSwapSiblings(sibling);
+    }
+
     if (sibling.id == sourceInfo.id) {
       return null;
     }

lib/widgets/player/sibling_tracks.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
@@ -119,11 +120,32 @@ 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=${NeteaseSourcedTrack.lookupRealIp()}');
+            '/search?keywords=${Uri.encodeComponent(searchTerm)}&realIP=${await NeteaseSourcedTrack.lookupRealIp()}');
         final searchResults = resp.body['result']['songs']
             .map(NeteaseSourcedTrack.toSourceInfo)
             .toList();
 
+        final activeSourceInfo = (_activeTrack! as SourcedTrack).sourceInfo;
+        _siblings = List.from(
+          searchResults
+            ..removeWhere((element) => element.id == activeSourceInfo.id)
+            ..insert(
+              0,
+              activeSourceInfo,
+            ),
+          growable: true,
+        );
+      } else if (preferences.audioSource == AudioSource.kugou) {
+        final client = KugouSourcedTrack.getClient();
+        final resp = await client.get(
+          '/api/v3/search/song?keyword=${Uri.encodeComponent(searchTerm)}&page=1&pagesize=10',
+        );
+        final results = jsonDecode(resp.body)['data']['info'];
+        final searchResults = results
+            .where((x) => x['pay_type'] == 0)
+            .map(KugouSourcedTrack.toSourceInfo)
+            .toList();
+
         final activeSourceInfo = (_activeTrack! as SourcedTrack).sourceInfo;
         _siblings = List.from(
           searchResults

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+12
+version: 1.0.0+18
 
 environment:
   sdk: ^3.5.0
@@ -180,4 +180,3 @@ flutter_native_splash:
   color: "#fef8f5"
   color_dark: "#18120d"
   image: assets/icon-w-shadow.png
-