lasers
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix fallback method is not tried on exception 

in YoutubeChannelInfoItem.getUrl()
This commit is contained in:
Stypox 2019-08-27 12:01:00 +02:00 committed by Tobias Groza
parent 6d504e0883
commit 94e7f0d3ab
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelInfoItemExtractor.java
View File

@ -56,19 +56,25 @@ public class YoutubeChannelInfoItemExtractor implements ChannelInfoItemExtractor
@Override @Override
public String getUrl() throws ParsingException { public String getUrl() throws ParsingException {
String buttonTrackingUrl = el.select("button[class*=\"yt-uix-button\"]").first() try {
.attr("abs:data-href"); String buttonTrackingUrl = el.select("button[class*=\"yt-uix-button\"]").first()
.attr("abs:data-href");
Pattern channelIdPattern = Pattern.compile("(?:.*?)\\%252Fchannel\\%252F([A-Za-z0-9\\-\\_]+)(?:.*)"); Pattern channelIdPattern = Pattern.compile("(?:.*?)\\%252Fchannel\\%252F([A-Za-z0-9\\-\\_]+)(?:.*)");
Matcher match = channelIdPattern.matcher(buttonTrackingUrl); Matcher match = channelIdPattern.matcher(buttonTrackingUrl);
if (match.matches()) { if (match.matches()) {
return YoutubeChannelExtractor.CHANNEL_URL_BASE + match.group(1); return YoutubeChannelExtractor.CHANNEL_URL_BASE + match.group(1);
} else { }
} catch(Throwable ignored) {}
try {
// fallback method just in case youtube changes things; it should never run and tests will fail // fallback method just in case youtube changes things; it should never run and tests will fail
// provides an url with "/user/NAME", that is inconsistent with stream and channel extractor // provides an url with "/user/NAME", that is inconsistent with stream and channel extractor
return el.select("a[class*=\"yt-uix-tile-link\"]").first() return el.select("a[class*=\"yt-uix-tile-link\"]").first()
.attr("abs:href"); .attr("abs:href");
} catch (Throwable e) {
throw new ParsingException("Could not get channel url", e);
} }
} }