From 880b9510880c9809dbd23e232bdbdb31d827d75c Mon Sep 17 00:00:00 2001 From: wb9688 Date: Thu, 27 Feb 2020 09:53:59 +0100 Subject: [PATCH] Fix getUploaderAvatarUrl() in YoutubeStreamExtractor --- .../extractors/YoutubeStreamExtractor.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java index 9f52386d4..e92283673 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java @@ -435,27 +435,12 @@ public class YoutubeStreamExtractor extends StreamExtractor { @Override public String getUploaderAvatarUrl() throws ParsingException { assertPageFetched(); - - String uploaderAvatarUrl = null; try { - uploaderAvatarUrl = initialData.getObject("contents").getObject("twoColumnWatchNextResults").getObject("secondaryResults") - .getObject("secondaryResults").getArray("results").getObject(0).getObject("compactAutoplayRenderer") - .getArray("contents").getObject(0).getObject("compactVideoRenderer").getObject("channelThumbnail") - .getArray("thumbnails").getObject(0).getString("url"); - if (uploaderAvatarUrl != null && !uploaderAvatarUrl.isEmpty()) { - return uploaderAvatarUrl; - } - } catch (Exception ignored) {} - - try { - uploaderAvatarUrl = getVideoSecondaryInfoRenderer().getObject("owner").getObject("videoOwnerRenderer") + return getVideoSecondaryInfoRenderer().getObject("owner").getObject("videoOwnerRenderer") .getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url"); - } catch (Exception ignored) {} - - if (uploaderAvatarUrl == null) { - throw new ParsingException("Could not get uploader avatar url"); + } catch (Exception e) { + throw new ParsingException("Could not get uploader avatar url", e); } - return uploaderAvatarUrl; } @Nonnull