mirror of
https://github.com/KRTirtho/spotube.git
synced 2025-09-13 07:55:18 +00:00
fix(playback): skip network requests if cached file already exists
This commit is contained in:
parent
345c6ac714
commit
f870e12011
@ -48,6 +48,7 @@ class ServerPlaybackRoutes {
|
|||||||
|
|
||||||
Future<({dio_lib.Response<Uint8List> response, Uint8List? bytes})>
|
Future<({dio_lib.Response<Uint8List> response, Uint8List? bytes})>
|
||||||
streamTrack(
|
streamTrack(
|
||||||
|
Request request,
|
||||||
SourcedTrack track,
|
SourcedTrack track,
|
||||||
Map<String, dynamic> headers,
|
Map<String, dynamic> headers,
|
||||||
) async {
|
) async {
|
||||||
@ -59,35 +60,6 @@ class ServerPlaybackRoutes {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
final trackPartialCacheFile = File("${trackCacheFile.path}.part");
|
|
||||||
|
|
||||||
String? url = track.url;
|
|
||||||
|
|
||||||
url ??= await ref
|
|
||||||
.read(trackSourcesProvider(track.query).notifier)
|
|
||||||
.swapWithNextSibling()
|
|
||||||
.then((track) => track.url!);
|
|
||||||
|
|
||||||
var options = Options(
|
|
||||||
headers: {
|
|
||||||
...headers,
|
|
||||||
"user-agent": _randomUserAgent,
|
|
||||||
"Cache-Control": "max-age=3600",
|
|
||||||
"Connection": "keep-alive",
|
|
||||||
"host": Uri.parse(url!).host,
|
|
||||||
},
|
|
||||||
responseType: ResponseType.bytes,
|
|
||||||
validateStatus: (status) => status! < 400,
|
|
||||||
);
|
|
||||||
|
|
||||||
final headersRes = await Future<dio_lib.Response?>.value(
|
|
||||||
dio.head(
|
|
||||||
url,
|
|
||||||
options: options,
|
|
||||||
),
|
|
||||||
).catchError((_) async => null);
|
|
||||||
|
|
||||||
final contentLength = headersRes?.headers.value("content-length");
|
|
||||||
|
|
||||||
if (await trackCacheFile.exists() && userPreferences.cacheMusic) {
|
if (await trackCacheFile.exists() && userPreferences.cacheMusic) {
|
||||||
final bytes = await trackCacheFile.readAsBytes();
|
final bytes = await trackCacheFile.readAsBytes();
|
||||||
@ -102,12 +74,51 @@ class ServerPlaybackRoutes {
|
|||||||
"accept-ranges": ["bytes"],
|
"accept-ranges": ["bytes"],
|
||||||
"content-range": ["bytes 0-$cachedFileLength/$cachedFileLength"],
|
"content-range": ["bytes 0-$cachedFileLength/$cachedFileLength"],
|
||||||
}),
|
}),
|
||||||
requestOptions: RequestOptions(path: url),
|
requestOptions: RequestOptions(path: request.requestedUri.toString()),
|
||||||
),
|
),
|
||||||
bytes: bytes,
|
bytes: bytes,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final trackPartialCacheFile = File("${trackCacheFile.path}.part");
|
||||||
|
|
||||||
|
String url = track.url ??
|
||||||
|
await ref
|
||||||
|
.read(trackSourcesProvider(track.query).notifier)
|
||||||
|
.swapWithNextSibling()
|
||||||
|
.then((track) => track.url!);
|
||||||
|
|
||||||
|
var options = Options(
|
||||||
|
headers: {
|
||||||
|
...headers,
|
||||||
|
"user-agent": _randomUserAgent,
|
||||||
|
"Cache-Control": "max-age=3600",
|
||||||
|
"Connection": "keep-alive",
|
||||||
|
"host": Uri.parse(url).host,
|
||||||
|
},
|
||||||
|
responseType: ResponseType.bytes,
|
||||||
|
validateStatus: (status) => status! < 400,
|
||||||
|
);
|
||||||
|
|
||||||
|
final contentLengthRes = await Future<dio_lib.Response?>.value(
|
||||||
|
dio.head(
|
||||||
|
url,
|
||||||
|
options: options,
|
||||||
|
),
|
||||||
|
).catchError((e, stack) async {
|
||||||
|
AppLogger.reportError(e, stack);
|
||||||
|
|
||||||
|
final sourcedTrack = await ref
|
||||||
|
.read(trackSourcesProvider(track.query).notifier)
|
||||||
|
.refreshStreamingUrl();
|
||||||
|
|
||||||
|
url = sourcedTrack.url!;
|
||||||
|
|
||||||
|
return dio.head(url, options: options);
|
||||||
|
});
|
||||||
|
|
||||||
|
final contentLength = contentLengthRes?.headers.value("content-length");
|
||||||
|
|
||||||
/// Forcing partial content range as mpv sometimes greedily wants
|
/// Forcing partial content range as mpv sometimes greedily wants
|
||||||
/// everything at one go. Slows down overall streaming.
|
/// everything at one go. Slows down overall streaming.
|
||||||
final range = RangeHeader.parse(headers["range"] ?? "");
|
final range = RangeHeader.parse(headers["range"] ?? "");
|
||||||
@ -123,33 +134,7 @@ class ServerPlaybackRoutes {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
final res = await dio
|
final res = await dio.get<Uint8List>(url, options: options);
|
||||||
.get<Uint8List>(
|
|
||||||
url,
|
|
||||||
options: options.copyWith(headers: {
|
|
||||||
...?options.headers,
|
|
||||||
"user-agent": _randomUserAgent,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.catchError((e, stack) async {
|
|
||||||
AppLogger.reportError(e, stack);
|
|
||||||
final sourcedTrack = await ref
|
|
||||||
.read(trackSourcesProvider(track.query).notifier)
|
|
||||||
.refreshStreamingUrl();
|
|
||||||
|
|
||||||
// It gets updated by itself.
|
|
||||||
// if (playlist.activeTrack?.id == sourcedTrack.query.id) {
|
|
||||||
// ref.read(activeTrackSourcesProvider.notifier).update(sourcedTrack);
|
|
||||||
// }
|
|
||||||
|
|
||||||
return await dio.get<Uint8List>(
|
|
||||||
sourcedTrack.url!,
|
|
||||||
options: options.copyWith(headers: {
|
|
||||||
...?options.headers,
|
|
||||||
"user-agent": _randomUserAgent,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
final bytes = res.data;
|
final bytes = res.data;
|
||||||
|
|
||||||
@ -228,8 +213,11 @@ class ServerPlaybackRoutes {
|
|||||||
).future,
|
).future,
|
||||||
);
|
);
|
||||||
|
|
||||||
final (bytes: audioBytes, response: res) =
|
final (bytes: audioBytes, response: res) = await streamTrack(
|
||||||
await streamTrack(sourcedTrack!, request.headers);
|
request,
|
||||||
|
sourcedTrack!,
|
||||||
|
request.headers,
|
||||||
|
);
|
||||||
|
|
||||||
return Response(
|
return Response(
|
||||||
res.statusCode!,
|
res.statusCode!,
|
||||||
|
Loading…
Reference in New Issue
Block a user