mirror of
https://github.com/KRTirtho/spotube.git
synced 2025-09-12 23:45:18 +00:00
fix: inaccessible streaming url causing rapid skips
Now it filters the inaccessible streaming urls out so weird stuff won't happen
This commit is contained in:
parent
2a0853026a
commit
e2c0ddef24
@ -39,6 +39,8 @@ class TrackSourceQuery with _$TrackSourceQuery {
|
|||||||
|
|
||||||
/// Parses [SpotubeMedia]'s [uri] property to create a [TrackSourceQuery].
|
/// Parses [SpotubeMedia]'s [uri] property to create a [TrackSourceQuery].
|
||||||
factory TrackSourceQuery.parseUri(String url) {
|
factory TrackSourceQuery.parseUri(String url) {
|
||||||
|
AppLogger.log.d("TrackSourceQuery parse $url");
|
||||||
|
|
||||||
final isLocal = !url.startsWith("http");
|
final isLocal = !url.startsWith("http");
|
||||||
|
|
||||||
if (isLocal) {
|
if (isLocal) {
|
||||||
|
@ -215,16 +215,12 @@ class ServerPlaybackRoutes {
|
|||||||
? activeSourcedTrack?.source
|
? activeSourcedTrack?.source
|
||||||
: await ref.read(
|
: await ref.read(
|
||||||
trackSourcesProvider(
|
trackSourcesProvider(
|
||||||
TrackSourceQuery.parseUri(request.url.toString()),
|
//! Use [Request.requestedUri] as it contains full https url.
|
||||||
|
//! [Request.url] will exclude and starts relatively. (streams/<trackId>... basically)
|
||||||
|
TrackSourceQuery.parseUri(request.requestedUri.toString()),
|
||||||
).future,
|
).future,
|
||||||
);
|
);
|
||||||
|
|
||||||
// This will be automatically updated by the notifier.
|
|
||||||
// if (playlist.activeTrack?.id == sourcedTrack?.query.id &&
|
|
||||||
// sourcedTrack != null) {
|
|
||||||
// ref.read(activeTrackSourcesProvider.notifier).update(sourcedTrack);
|
|
||||||
// }
|
|
||||||
|
|
||||||
final (bytes: audioBytes, response: res) =
|
final (bytes: audioBytes, response: res) =
|
||||||
await streamTrack(sourcedTrack!, request.headers);
|
await streamTrack(sourcedTrack!, request.headers);
|
||||||
|
|
||||||
|
@ -84,6 +84,8 @@ abstract class SourcedTrack extends BasicSourcedTrack {
|
|||||||
onlyCleanArtist: true,
|
onlyCleanArtist: true,
|
||||||
).trim();
|
).trim();
|
||||||
|
|
||||||
|
assert(title.trim().isNotEmpty, "Title should not be empty");
|
||||||
|
|
||||||
return "$title - ${track.artists.join(", ")}";
|
return "$title - ${track.artists.join(", ")}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,7 +201,10 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
final searchedVideos =
|
final searchedVideos =
|
||||||
await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
|
await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
|
||||||
if (searchedVideos.isNotEmpty) {
|
if (searchedVideos.isNotEmpty) {
|
||||||
isrcResults.addAll(searchedVideos
|
AppLogger.log
|
||||||
|
.d("${track.title} ISRC $isrc Total ${searchedVideos.length}");
|
||||||
|
|
||||||
|
final filteredMatches = searchedVideos
|
||||||
.map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
|
.map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
|
||||||
.map((YoutubeVideoInfo videoInfo) {
|
.map((YoutubeVideoInfo videoInfo) {
|
||||||
final ytWords = videoInfo.title
|
final ytWords = videoInfo.title
|
||||||
@ -225,8 +228,16 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
})
|
})
|
||||||
.whereType<YoutubeVideoInfo>()
|
.nonNulls
|
||||||
.toList());
|
.toList();
|
||||||
|
|
||||||
|
for (final match in filteredMatches) {
|
||||||
|
AppLogger.log.d(
|
||||||
|
"ISRC MATCH: ${match.id} ${match.title} by ${match.channelName} ${match.duration}",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
isrcResults.addAll(filteredMatches);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return isrcResults;
|
return isrcResults;
|
||||||
@ -247,7 +258,14 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
videoResults.addAll(isrcResults);
|
videoResults.addAll(isrcResults);
|
||||||
|
|
||||||
if (isrcResults.isEmpty) {
|
if (isrcResults.isEmpty) {
|
||||||
|
AppLogger.log.w("No ISRC results found, falling back to SongLink");
|
||||||
|
|
||||||
final links = await SongLinkService.links(query.id);
|
final links = await SongLinkService.links(query.id);
|
||||||
|
|
||||||
|
for (final link in links) {
|
||||||
|
AppLogger.log.d("SongLink ${query.id} ${link.platform} ${link.url}");
|
||||||
|
}
|
||||||
|
|
||||||
final ytLink = links.firstWhereOrNull(
|
final ytLink = links.firstWhereOrNull(
|
||||||
(link) => link.platform == "youtube",
|
(link) => link.platform == "youtube",
|
||||||
);
|
);
|
||||||
@ -262,6 +280,8 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
// Ignore this error and continue with the search
|
// Ignore this error and continue with the search
|
||||||
AppLogger.reportError(e, stack);
|
AppLogger.reportError(e, stack);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
AppLogger.log.w("No YouTube link found in SongLink results");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
import 'dart:isolate';
|
import 'dart:isolate';
|
||||||
|
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:spotube/services/dio/dio.dart';
|
||||||
|
import 'package:spotube/services/logger/logger.dart';
|
||||||
import 'package:spotube/services/youtube_engine/youtube_engine.dart';
|
import 'package:spotube/services/youtube_engine/youtube_engine.dart';
|
||||||
import 'package:youtube_explode_dart/youtube_explode_dart.dart';
|
import 'package:youtube_explode_dart/youtube_explode_dart.dart';
|
||||||
|
|
||||||
@ -152,27 +155,51 @@ class YouTubeExplodeEngine implements YouTubeEngine {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
return StreamManifest(
|
final accessibleStreams = <AudioOnlyStreamInfo>[];
|
||||||
streamManifest.audioOnly.map((stream) {
|
|
||||||
return AudioOnlyStreamInfo(
|
for (final stream in streamManifest.audioOnly) {
|
||||||
stream.videoId,
|
// Call dio head request to check if the stream is accessible
|
||||||
stream.tag,
|
final response = await globalDio.headUri(
|
||||||
stream.url,
|
stream.url,
|
||||||
stream.container,
|
options: Options(
|
||||||
stream.size,
|
followRedirects: true,
|
||||||
stream.bitrate,
|
validateStatus: (status) {
|
||||||
stream.audioCodec,
|
return status != null && status < 500;
|
||||||
switch (stream.bitrate.bitsPerSecond) {
|
|
||||||
> 130 * 1024 => "high",
|
|
||||||
> 64 * 1024 => "medium",
|
|
||||||
_ => "low",
|
|
||||||
},
|
},
|
||||||
stream.fragments,
|
),
|
||||||
stream.codec,
|
);
|
||||||
stream.audioTrack,
|
|
||||||
|
AppLogger.log.d(
|
||||||
|
"Stream $videoId Status ${response.statusCode} Codec ${stream.audioCodec} "
|
||||||
|
"Bitrate ${stream.bitrate} Container ${stream.container}",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.statusCode != null &&
|
||||||
|
response.statusCode! >= 200 &&
|
||||||
|
response.statusCode! < 400) {
|
||||||
|
accessibleStreams.add(
|
||||||
|
AudioOnlyStreamInfo(
|
||||||
|
stream.videoId,
|
||||||
|
stream.tag,
|
||||||
|
stream.url,
|
||||||
|
stream.container,
|
||||||
|
stream.size,
|
||||||
|
stream.bitrate,
|
||||||
|
stream.audioCodec,
|
||||||
|
switch (stream.bitrate.bitsPerSecond) {
|
||||||
|
> 130 * 1024 => "high",
|
||||||
|
> 64 * 1024 => "medium",
|
||||||
|
_ => "low",
|
||||||
|
},
|
||||||
|
stream.fragments,
|
||||||
|
stream.codec,
|
||||||
|
stream.audioTrack,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}),
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
|
return StreamManifest(accessibleStreams);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
Loading…
Reference in New Issue
Block a user