Skip to content

Commit 1da0190

Browse files
authored
Merge pull request #980 from TeamNewPipe/fix/yt/unavailable
[YouTube] Fix extracting the detailed error message for unavailable streams
2 parents 60fb30f + 5abea22 commit 1da0190

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,8 @@ private void checkPlayabilityStatus(final JsonObject youtubePlayerResponse,
943943
}
944944
}
945945

946-
if (status.equalsIgnoreCase("unplayable") && reason != null) {
946+
if ((status.equalsIgnoreCase("unplayable") || status.equalsIgnoreCase("error"))
947+
&& reason != null) {
947948
if (reason.contains("Music Premium")) {
948949
throw new YoutubeMusicPremiumContentException();
949950
}
@@ -963,6 +964,10 @@ private void checkPlayabilityStatus(final JsonObject youtubePlayerResponse,
963964
if (detailedErrorMessage != null && detailedErrorMessage.contains("country")) {
964965
throw new GeographicRestrictionException(
965966
"This video is not available in client's country.");
967+
} else if (detailedErrorMessage != null) {
968+
throw new ContentNotAvailableException(detailedErrorMessage);
969+
} else {
970+
throw new ContentNotAvailableException(reason);
966971
}
967972
}
968973
}

0 commit comments

Comments
 (0)