Merge ff252d6b14 into ca6924f5a9

cli/commands/install-dependencies.dart

@@ -39,11 +39,6 @@ class InstallDependenciesCommand extends Command {
 
     switch (argResults!.option("platform")) {
       case "windows":
-        await shell.run(
-          """
-          choco install innosetup -y
-          """,
-        );
         break;
       case "linux":
         await shell.run(

lib/l10n/app_en.arb

@@ -462,6 +462,5 @@
   "configure_your_own_metadata_plugin": "Configure your own playlist/album/artist/feed metadata provider",
   "audio_scrobblers": "Audio Scrobblers",
   "scrobbling": "Scrobbling",
-  "source": "Source: ",
+  "source": "Source: "
-  "uncompressed": "Uncompressed"
 }

lib/l10n/generated/app_localizations.dart

@@ -2936,12 +2936,6 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Source: '**
   String get source;
-
-  /// No description provided for @uncompressed.
-  ///
-  /// In en, this message translates to:
-  /// **'Uncompressed'**
-  String get uncompressed;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/generated/app_localizations_ar.dart

@@ -1540,7 +1540,4 @@ class AppLocalizationsAr extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_bn.dart

@@ -1541,7 +1541,4 @@ class AppLocalizationsBn extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ca.dart

@@ -1551,7 +1551,4 @@ class AppLocalizationsCa extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_cs.dart

@@ -1541,7 +1541,4 @@ class AppLocalizationsCs extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_de.dart

@@ -1553,7 +1553,4 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_en.dart

@@ -1539,7 +1539,4 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_es.dart

@@ -1554,7 +1554,4 @@ class AppLocalizationsEs extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_eu.dart

@@ -1551,7 +1551,4 @@ class AppLocalizationsEu extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_fa.dart

@@ -1539,7 +1539,4 @@ class AppLocalizationsFa extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_fi.dart

@@ -1539,7 +1539,4 @@ class AppLocalizationsFi extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_fr.dart

@@ -1559,7 +1559,4 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_hi.dart

@@ -1545,7 +1545,4 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_id.dart

@@ -1547,7 +1547,4 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_it.dart

@@ -1546,7 +1546,4 @@ class AppLocalizationsIt extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ja.dart

@@ -1510,7 +1510,4 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ka.dart

@@ -1548,7 +1548,4 @@ class AppLocalizationsKa extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ko.dart

@@ -1514,7 +1514,4 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ne.dart

@@ -1551,7 +1551,4 @@ class AppLocalizationsNe extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_nl.dart

@@ -1545,7 +1545,4 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_pl.dart

@@ -1547,7 +1547,4 @@ class AppLocalizationsPl extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_pt.dart

@@ -1544,7 +1544,4 @@ class AppLocalizationsPt extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ru.dart

@@ -1547,7 +1547,4 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_ta.dart

@@ -1553,7 +1553,4 @@ class AppLocalizationsTa extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_th.dart

@@ -1536,7 +1536,4 @@ class AppLocalizationsTh extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_tl.dart

@@ -1554,7 +1554,4 @@ class AppLocalizationsTl extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_tr.dart

@@ -1547,7 +1547,4 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_uk.dart

@@ -1543,7 +1543,4 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_vi.dart

@@ -1549,7 +1549,4 @@ class AppLocalizationsVi extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }

lib/l10n/generated/app_localizations_zh.dart

@@ -1503,9 +1503,6 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get source => 'Source: ';
-
-  @override
-  String get uncompressed => 'Uncompressed';
 }
 
 /// The translations for Chinese, as used in Taiwan (`zh_TW`).

lib/models/database/tables/preferences.dart

@@ -12,14 +12,12 @@ enum CloseBehavior {
 }
 
 enum AudioSource {
-  youtube("YouTube"),
+  youtube,
-  piped("Piped"),
+  piped,
-  jiosaavn("JioSaavn"),
+  jiosaavn,
-  invidious("Invidious"),
+  invidious;
-  dabMusic("DAB Music");
 
-  final String label;
+  String get label => name[0].toUpperCase() + name.substring(1);
-  const AudioSource(this.label);
 }
 
 enum YoutubeClientEngine {
@@ -41,6 +39,14 @@ enum YoutubeClientEngine {
   }
 }
 
+enum MusicCodec {
+  m4a._("M4a (Best for downloaded music)"),
+  weba._("WebA (Best for streamed music)\nDoesn't support audio metadata");
+
+  final String label;
+  const MusicCodec._(this.label);
+}
+
 enum SearchMode {
   youtube._("YouTube"),
   youtubeMusic._("YouTube Music");

lib/models/database/tables/source_match.dart

@@ -3,8 +3,7 @@ part of '../database.dart';
 enum SourceType {
   youtube._("YouTube"),
   youtubeMusic._("YouTube Music"),
-  jiosaavn._("JioSaavn"),
+  jiosaavn._("JioSaavn");
-  dabMusic._("DAB Music");
 
   final String label;
 

lib/pages/settings/sections/playback.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart' show ListTile;
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:piped_client/piped_client.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/models/database/database.dart';
@@ -44,11 +44,6 @@ class SettingsPlaybackSection extends HookConsumerWidget {
           title: Text(context.l10n.audio_quality),
           value: preferences.audioQuality,
           options: [
-            if (preferences.audioSource == AudioSource.dabMusic)
-              SelectItemButton(
-                value: SourceQualities.uncompressed,
-                child: Text(context.l10n.uncompressed),
-              ),
             SelectItemButton(
               value: SourceQualities.high,
               child: Text(context.l10n.high),
@@ -401,9 +396,7 @@ class SettingsPlaybackSection extends HookConsumerWidget {
             onChanged: preferencesNotifier.setNormalizeAudio,
           ),
         ),
-        if (const [AudioSource.jiosaavn, AudioSource.dabMusic]
+        if (preferences.audioSource != AudioSource.jiosaavn) ...[
-                .contains(preferences.audioSource) ==
-            false) ...[
           AdaptiveSelectTile<SourceCodecs>(
             popupConstraints: const BoxConstraints(maxWidth: 300),
             secondary: const Icon(SpotubeIcons.stream),

lib/provider/server/routes/playback.dart

@@ -101,7 +101,10 @@ class ServerPlaybackRoutes {
     );
 
     final contentLengthRes = await Future<dio_lib.Response?>.value(
-      dio.head(url, options: options),
+      dio.head(
+        url,
+        options: options,
+      ),
     ).catchError((e, stack) async {
       AppLogger.reportError(e, stack);
 
@@ -132,17 +135,19 @@ class ServerPlaybackRoutes {
       );
     }
 
-    if (headers["range"] == "bytes=0-") {
+    final contentLength = contentLengthRes?.headers.value("content-length");
-      final bufferSize =
+
-          userPreferences.audioQuality == SourceQualities.uncompressed
+    /// Forcing partial content range as mpv sometimes greedily wants
-              ? 6 * 1024 * 1024
+    /// everything at one go. Slows down overall streaming.
-              : 4 * 1024 * 1024;
+    final range = RangeHeader.parse(headers["range"] ?? "");
-      final endRange = min(bufferSize,
+    final contentPartialLength = int.tryParse(contentLength ?? "");
-          int.parse(contentLengthRes?.headers.value("content-length") ?? "0"));
+    if ((range.end == null) &&
+        contentPartialLength != null &&
+        range.start == 0) {
       options = options.copyWith(
         headers: {
-          ...options.headers ?? {},
+          ...?options.headers,
-          "range": "bytes=0-$endRange",
+          "range": "$range${(contentPartialLength * 0.3).ceil()}",
         },
       );
     }

lib/provider/user_preferences/user_preferences_provider.dart

@@ -54,7 +54,6 @@ class UserPreferencesNotifier extends Notifier<PreferencesTableData> {
           }
 
           await audioPlayer.setAudioNormalization(state.normalizeAudio);
-          await _updatePlayerBufferSize(event.audioQuality, state.audioQuality);
         } catch (e, stack) {
           AppLogger.reportError(e, stack);
         }
@@ -80,24 +79,6 @@ class UserPreferencesNotifier extends Notifier<PreferencesTableData> {
     });
   }
 
-  /// Sets audio player's buffer size based on the selected audio quality
-  /// Uncompressed quality gets a larger buffer size for smoother playback
-  /// while other qualities use a standard buffer size.
-  Future<void> _updatePlayerBufferSize(
-    SourceQualities newQuality,
-    SourceQualities oldQuality,
-  ) async {
-    if (newQuality == SourceQualities.uncompressed) {
-      audioPlayer.setDemuxerBufferSize(6 * 1024 * 1024); // 6MB
-      return;
-    }
-
-    if (oldQuality == SourceQualities.uncompressed &&
-        newQuality != SourceQualities.uncompressed) {
-      audioPlayer.setDemuxerBufferSize(4 * 1024 * 1024); // 4MB
-    }
-  }
-
   Future<void> setData(PreferencesTableCompanion data) async {
     final db = ref.read(databaseProvider);
 
@@ -174,7 +155,6 @@ class UserPreferencesNotifier extends Notifier<PreferencesTableData> {
 
   void setAudioQuality(SourceQualities quality) {
     setData(PreferencesTableCompanion(audioQuality: Value(quality)));
-    _updatePlayerBufferSize(quality, state.audioQuality);
   }
 
   void setDownloadLocation(String downloadDir) {
@@ -224,11 +204,6 @@ class UserPreferencesNotifier extends Notifier<PreferencesTableData> {
   }
 
   void setAudioSource(AudioSource type) {
-    // Only allow uncompressed quality for DAB Music
-    if (type != AudioSource.dabMusic &&
-        state.audioQuality == SourceQualities.uncompressed) {
-      setAudioQuality(SourceQualities.high);
-    }
     setData(PreferencesTableCompanion(audioSource: Value(type)));
   }
 

lib/services/audio_player/audio_player.dart

@@ -56,7 +56,6 @@ abstract class AudioPlayerInterface {
           configuration: const mk.PlayerConfiguration(
             title: "Spotube",
             logLevel: kDebugMode ? mk.MPVLogLevel.info : mk.MPVLogLevel.error,
-            bufferSize: 4 * 1024 * 1024, // 4MB buffer
           ),
         ) {
     _mkPlayer.stream.error.listen((event) {

lib/services/audio_player/audio_player_impl.dart

@@ -131,8 +131,4 @@ class SpotubeAudioPlayer extends AudioPlayerInterface
   Future<void> setAudioNormalization(bool normalize) async {
     await _mkPlayer.setAudioNormalization(normalize);
   }
-
-  Future<void> setDemuxerBufferSize(int sizeInBytes) async {
-    await _mkPlayer.setDemuxerBufferSize(sizeInBytes);
-  }
 }

lib/services/audio_player/custom_player.dart

@@ -133,12 +133,4 @@ class CustomPlayer extends Player {
       await nativePlayer.setProperty('af', '');
     }
   }
-
-  Future<void> setDemuxerBufferSize(int sizeInBytes) async {
-    await nativePlayer.setProperty('demuxer-max-bytes', sizeInBytes.toString());
-    await nativePlayer.setProperty(
-      'demuxer-max-back-bytes',
-      sizeInBytes.toString(),
-    );
-  }
 }

lib/services/sourced_track/enums.dart

@@ -2,16 +2,13 @@ import 'package:spotube/models/playback/track_sources.dart';
 
 enum SourceCodecs {
   m4a._("M4a (Best for downloaded music)"),
-  weba._("WebA (Best for streamed music)\nDoesn't support audio metadata"),
+  weba._("WebA (Best for streamed music)\nDoesn't support audio metadata");
-  mp3._("MP3 (Widely supported audio format)"),
-  flac._("FLAC (Lossless, best quality)\nLarge file size");
 
   final String label;
   const SourceCodecs._(this.label);
 }
 
 enum SourceQualities {
-  uncompressed(3),
   high(2),
   medium(1),
   low(0);

lib/services/sourced_track/sourced_track.dart

@@ -5,7 +5,6 @@ import 'package:spotube/models/playback/track_sources.dart';
 import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
 
 import 'package:spotube/services/sourced_track/enums.dart';
-import 'package:spotube/services/sourced_track/sources/dab_music.dart';
 import 'package:spotube/services/sourced_track/sources/invidious.dart';
 import 'package:spotube/services/sourced_track/sources/jiosaavn.dart';
 import 'package:spotube/services/sourced_track/sources/piped.dart';
@@ -75,14 +74,6 @@ abstract class SourcedTrack extends BasicSourcedTrack {
           query: query,
           sources: sources,
         ),
-      AudioSource.dabMusic => DABMusicSourcedTrack(
-          ref: ref,
-          source: source,
-          siblings: siblings,
-          info: info,
-          query: query,
-          sources: sources,
-        ),
     };
   }
 
@@ -113,8 +104,6 @@ abstract class SourcedTrack extends BasicSourcedTrack {
           await InvidiousSourcedTrack.fetchFromTrack(query: query, ref: ref),
         AudioSource.jiosaavn =>
           await JioSaavnSourcedTrack.fetchFromTrack(query: query, ref: ref),
-        AudioSource.dabMusic =>
-          await DABMusicSourcedTrack.fetchFromTrack(query: query, ref: ref),
       };
     } catch (e) {
       if (preferences.audioSource == AudioSource.youtube) {
@@ -140,8 +129,6 @@ abstract class SourcedTrack extends BasicSourcedTrack {
         JioSaavnSourcedTrack.fetchSiblings(query: query, ref: ref),
       AudioSource.invidious =>
         InvidiousSourcedTrack.fetchSiblings(query: query, ref: ref),
-      AudioSource.dabMusic =>
-        DABMusicSourcedTrack.fetchSiblings(query: query, ref: ref),
     };
   }
 
@@ -211,14 +198,9 @@ abstract class SourcedTrack extends BasicSourcedTrack {
   SourceCodecs get codec {
     final preferences = ref.read(userPreferencesProvider);
 
-    return switch (preferences.audioSource) {
+    return preferences.audioSource == AudioSource.jiosaavn
-      AudioSource.dabMusic =>
+        ? SourceCodecs.m4a
-        preferences.audioQuality == SourceQualities.uncompressed
+        : preferences.streamMusicCodec;
-            ? SourceCodecs.flac
-            : SourceCodecs.mp3,
-      AudioSource.jiosaavn => SourceCodecs.m4a,
-      _ => preferences.streamMusicCodec
-    };
   }
 
   TrackSource get activeTrackSource {

lib/services/sourced_track/sources/dab_music.dart

@@ -1,206 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:dio/dio.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:spotube/models/database/database.dart';
-import 'package:spotube/models/playback/track_sources.dart';
-import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
-import 'package:spotube/services/logger/logger.dart';
-import 'package:spotube/services/sourced_track/enums.dart';
-import 'package:spotube/services/sourced_track/exceptions.dart';
-import 'package:spotube/services/sourced_track/sourced_track.dart';
-import 'package:dab_music_api/dab_music_api.dart';
-
-final dabMusicApiClient = DabMusicApiClient(
-  Dio(),
-  baseUrl: "https://dab.yeet.su/api",
-);
-
-/// Only Music source that can't support database caching due to having no endpoint.
-/// But ISRC search is 100% reliable so caching is actually not necessary.
-class DABMusicSourcedTrack extends SourcedTrack {
-  DABMusicSourcedTrack({
-    required super.ref,
-    required super.source,
-    required super.siblings,
-    required super.info,
-    required super.query,
-    required super.sources,
-  });
-
-  static Future<SourcedTrack> fetchFromTrack({
-    required TrackSourceQuery query,
-    required Ref ref,
-  }) async {
-    try {
-      final siblings = await fetchSiblings(ref: ref, query: query);
-
-      if (siblings.isEmpty) {
-        throw TrackNotFoundError(query);
-      }
-      return DABMusicSourcedTrack(
-        ref: ref,
-        siblings: siblings.map((s) => s.info).skip(1).toList(),
-        sources: siblings.first.source!,
-        info: siblings.first.info,
-        query: query,
-        source: AudioSource.dabMusic,
-      );
-    } catch (e, stackTrace) {
-      AppLogger.reportError(e, stackTrace);
-      rethrow;
-    }
-  }
-
-  static Future<List<TrackSource>> fetchSources(
-    String id,
-    SourceQualities quality,
-  ) async {
-    try {
-      final isUncompressed = quality == SourceQualities.uncompressed;
-      final streamResponse = await dabMusicApiClient.music.getStream(
-        trackId: id,
-        quality: isUncompressed ? "27" : "5",
-      );
-      if (streamResponse.url == null) {
-        throw Exception("No stream URL found for track ID: $id");
-      }
-      return [
-        TrackSource(
-          url: streamResponse.url!,
-          quality: isUncompressed
-              ? SourceQualities.uncompressed
-              : SourceQualities.high,
-          bitrate: isUncompressed ? "2998kbps" : "320kbps",
-          codec: isUncompressed ? SourceCodecs.flac : SourceCodecs.mp3,
-        ),
-      ];
-    } catch (e, stackTrace) {
-      AppLogger.reportError(e, stackTrace);
-      rethrow;
-    }
-  }
-
-  static Future<SiblingType> toSiblingType(
-    Ref ref,
-    int index,
-    Track result,
-  ) async {
-    try {
-      List<TrackSource>? source;
-      if (index == 0) {
-        source = await fetchSources(
-          result.id.toString(),
-          ref.read(userPreferencesProvider).audioQuality,
-        );
-      }
-
-      final SiblingType sibling = (
-        info: TrackSourceInfo(
-          artists: result.artist!,
-          durationMs: Duration(seconds: result.duration!).inMilliseconds,
-          id: result.id.toString(),
-          pageUrl: "https://dab.yeet.su/music/${result.id}",
-          thumbnail: result.albumCover!,
-          title: result.title!,
-        ),
-        source: source,
-      );
-
-      return sibling;
-    } catch (e, stackTrace) {
-      AppLogger.reportError(e, stackTrace);
-      rethrow;
-    }
-  }
-
-  static Future<List<SiblingType>> fetchSiblings({
-    required TrackSourceQuery query,
-    required Ref ref,
-  }) async {
-    try {
-      List<Track> results = [];
-
-      if (query.isrc.isNotEmpty) {
-        final res =
-            await dabMusicApiClient.music.getSearch(q: query.isrc, limit: 1);
-        results = res.tracks ?? <Track>[];
-      }
-
-      if (results.isEmpty) {
-        final res = await dabMusicApiClient.music.getSearch(
-          q: SourcedTrack.getSearchTerm(query),
-          limit: 5,
-        );
-        results = res.tracks ?? <Track>[];
-      }
-
-      if (results.isEmpty) {
-        return [];
-      }
-
-      final matchedResults =
-          results.mapIndexed((index, d) => toSiblingType(ref, index, d));
-
-      return Future.wait(matchedResults);
-    } catch (e, stackTrace) {
-      AppLogger.reportError(e, stackTrace);
-      rethrow;
-    }
-  }
-
-  @override
-  Future<DABMusicSourcedTrack> copyWithSibling() async {
-    if (siblings.isNotEmpty) {
-      return this;
-    }
-    final fetchedSiblings = await fetchSiblings(ref: ref, query: query);
-
-    return DABMusicSourcedTrack(
-      ref: ref,
-      siblings: fetchedSiblings
-          .where((s) => s.info.id != info.id)
-          .map((s) => s.info)
-          .toList(),
-      source: source,
-      info: info,
-      query: query,
-      sources: sources,
-    );
-  }
-
-  @override
-  Future<DABMusicSourcedTrack?> swapWithSibling(TrackSourceInfo sibling) async {
-    if (sibling.id == this.info.id) {
-      return null;
-    }
-
-    // a sibling source that was fetched from the search results
-    final isStepSibling = siblings.none((s) => s.id == sibling.id);
-
-    final newSourceInfo = isStepSibling
-        ? sibling
-        : siblings.firstWhere((s) => s.id == sibling.id);
-    final newSiblings = siblings.where((s) => s.id != sibling.id).toList()
-      ..insert(0, this.info);
-
-    final source = await fetchSources(
-      sibling.id,
-      ref.read(userPreferencesProvider).audioQuality,
-    );
-
-    return DABMusicSourcedTrack(
-      ref: ref,
-      siblings: newSiblings,
-      sources: source,
-      info: newSourceInfo,
-      query: query,
-      source: AudioSource.dabMusic,
-    );
-  }
-
-  @override
-  Future<SourcedTrack> refreshStream() async {
-    // There's no need to refresh the stream for DABMusicSourcedTrack
-    return this;
-  }
-}

pubspec.lock

@@ -458,15 +458,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
-  dab_music_api:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "55f96368b7465eec2e5e81774f9f2a7b18acc4ab"
-      url: "https://github.com/KRTirtho/dab_music_api.git"
-    source: git
-    version: "0.1.0"
   dart_des:
     dependency: transitive
     description:
@@ -2055,14 +2046,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
-  retrofit:
-    dependency: transitive
-    description:
-      name: retrofit
-      sha256: "699cf44ec6c7fc7d248740932eca75d334e36bdafe0a8b3e9ff93100591c8a25"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.7.2"
   riverpod:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -24,10 +24,6 @@ dependencies:
   bonsoir: ^5.1.10
   cached_network_image: ^3.3.1
   connectivity_plus: ^6.1.2
-  dab_music_api:
-    git:
-      url: https://github.com/KRTirtho/dab_music_api.git
-      ref: main
   desktop_webview_window:
     git:
       path: packages/desktop_webview_window

untranslated_messages.json

@@ -1,147 +1,118 @@
 {
   "ar": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "bn": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ca": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "cs": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "de": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "es": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "eu": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "fa": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "fi": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "fr": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "hi": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "id": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "it": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ja": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ka": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ko": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ne": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "nl": [
     "audio_source",
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "pl": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "pt": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ru": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "ta": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "th": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "tl": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "tr": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "uk": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "vi": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "zh": [
-    "source",
+    "source"
-    "uncompressed"
   ],
 
   "zh_TW": [
-    "source",
+    "source"
-    "uncompressed"
   ]
 }