CypherpunkSamurai/NewPipeExtractor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #980 from TeamNewPipe/fix/yt/unavailable

Browse source 
[YouTube] Fix extracting the detailed error message for unavailable streams
This commit is contained in:
Tobi 2022-11-28 10:07:34 +01:00 committed by GitHub
commit 1da0190056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -943,7 +943,8 @@ public class YoutubeStreamExtractor extends StreamExtractor {
} }
} }
if (status.equalsIgnoreCase("unplayable") && reason != null) { if ((status.equalsIgnoreCase("unplayable") || status.equalsIgnoreCase("error"))
&& reason != null) {
if (reason.contains("Music Premium")) { if (reason.contains("Music Premium")) {
throw new YoutubeMusicPremiumContentException(); throw new YoutubeMusicPremiumContentException();
} }
@ -963,6 +964,10 @@ public class YoutubeStreamExtractor extends StreamExtractor {
if (detailedErrorMessage != null && detailedErrorMessage.contains("country")) { if (detailedErrorMessage != null && detailedErrorMessage.contains("country")) {
throw new GeographicRestrictionException( throw new GeographicRestrictionException(
"This video is not available in client's country."); "This video is not available in client's country.");
} else if (detailedErrorMessage != null) {
throw new ContentNotAvailableException(detailedErrorMessage);
} else {
throw new ContentNotAvailableException(reason);
} }
} }
} }