ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2025-01-07 10:35:49 +01:00
Code Issues Projects Releases Wiki Activity

fix(YouTube - DeArrow): Correctly handle http status 304

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-01-08 12:34:22 +04:00
parent 2af3911395
commit 3e380dfce2
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java
View File

@ -28,7 +28,7 @@ import static app.revanced.integrations.shared.StringRef.str;
* Can show YouTube provided screen captures of beginning/middle/end of the video. * Can show YouTube provided screen captures of beginning/middle/end of the video.
* (ie: sd1.jpg, sd2.jpg, sd3.jpg). * (ie: sd1.jpg, sd2.jpg, sd3.jpg).
* <p> * <p>
* Or can show crowdsourced thumbnails provided by DeArrow (<a href="http://dearrow.ajay.app">...</a>). * Or can show crowd-sourced thumbnails provided by DeArrow (<a href="http://dearrow.ajay.app">...</a>).
* <p> * <p>
* Or can use DeArrow and fall back to screen captures if DeArrow is not available. * Or can use DeArrow and fall back to screen captures if DeArrow is not available.
* <p> * <p>
@ -234,39 +234,45 @@ public final class AlternativeThumbnailsPatch {
public static void handleCronetSuccess(UrlRequest request, @NonNull UrlResponseInfo responseInfo) { public static void handleCronetSuccess(UrlRequest request, @NonNull UrlResponseInfo responseInfo) {
try { try {
final int statusCode = responseInfo.getHttpStatusCode(); final int statusCode = responseInfo.getHttpStatusCode();
if (statusCode != 200) { if (statusCode == 200) {
String url = responseInfo.getUrl(); return;
}
if (usingDeArrow() && urlIsDeArrow(url)) { String url = responseInfo.getUrl();
Logger.printDebug(() -> "handleCronetSuccess, statusCode: " + statusCode);
handleDeArrowError(url, statusCode); if (usingDeArrow() && urlIsDeArrow(url)) {
Logger.printDebug(() -> "handleCronetSuccess, statusCode: " + statusCode);
if (statusCode == 304) {
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/304
return; // Normal response.
}
handleDeArrowError(url, statusCode);
return;
}
if (usingVideoStills() && statusCode == 404) {
// Fast alt thumbnails is enabled and the thumbnail is not available.
// The video is:
// - live stream
// - upcoming unreleased video
// - very old
// - very low view count
// Take note of this, so if the image reloads the original thumbnail will be used.
DecodedThumbnailUrl decodedUrl = DecodedThumbnailUrl.decodeImageUrl(url);
if (decodedUrl == null) {
return; // Not a thumbnail.
}
Logger.printDebug(() -> "handleCronetSuccess, image not available: " + url);
ThumbnailQuality quality = ThumbnailQuality.altImageNameToQuality(decodedUrl.imageQuality);
if (quality == null) {
// Video is a short or a seekbar thumbnail, but somehow did not load. Should not happen.
Logger.printDebug(() -> "Failed to recognize image quality of url: " + decodedUrl.sanitizedUrl);
return; return;
} }
if (usingVideoStills() && statusCode == 404) { VerifiedQualities.setAltThumbnailDoesNotExist(decodedUrl.videoId, quality);
// Fast alt thumbnails is enabled and the thumbnail is not available.
// The video is:
// - live stream
// - upcoming unreleased video
// - very old
// - very low view count
// Take note of this, so if the image reloads the original thumbnail will be used.
DecodedThumbnailUrl decodedUrl = DecodedThumbnailUrl.decodeImageUrl(url);
if (decodedUrl == null) {
return; // Not a thumbnail.
}
Logger.printDebug(() -> "handleCronetSuccess, image not available: " + url);
ThumbnailQuality quality = ThumbnailQuality.altImageNameToQuality(decodedUrl.imageQuality);
if (quality == null) {
// Video is a short or a seekbar thumbnail, but somehow did not load. Should not happen.
Logger.printDebug(() -> "Failed to recognize image quality of url: " + decodedUrl.sanitizedUrl);
return;
}
VerifiedQualities.setAltThumbnailDoesNotExist(decodedUrl.videoId, quality);
}
} }
} catch (Exception ex) { } catch (Exception ex) {
Logger.printException(() -> "Callback success error", ex); Logger.printException(() -> "Callback success error", ex);
@ -280,7 +286,7 @@ public final class AlternativeThumbnailsPatch {
* - A non-existent domain. * - A non-existent domain.
* - A url path of something incorrect (ie: /v1/nonExistentEndPoint). * - A url path of something incorrect (ie: /v1/nonExistentEndPoint).
* <p> * <p>
* Known limitation: YT uses an infinite timeout, so this hook is never called if a host never responds. * Cronet uses a very timeout (several minutes), so if the API never responds this hook can take a while to be called.
* But this does not appear to be a problem, as the DeArrow API has not been observed to 'go silent' * But this does not appear to be a problem, as the DeArrow API has not been observed to 'go silent'
* Instead if there's a problem it returns an error code status response, which is handled in this patch. * Instead if there's a problem it returns an error code status response, which is handled in this patch.
*/ */