Skip to content

Commit 49c2eb5

Browse files
committed
fix failing watch links
1 parent 1e7bcfb commit 49c2eb5

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,10 @@ private String parseHtmlAndGetFullLinks(String descriptionHtml)
177177
// if link is null the a tag is a hashtag.
178178
// They refer to the youtube search. We do not handle them.
179179
a.text(link);
180-
180+
} else if(redirectLink.toString().contains("https://www.youtube.com/")) {
181+
a.text(redirectLink.toString());
181182
}
182-
} else if(redirectLink.toString().contains("watch?v=")
183-
|| redirectLink.toString().contains("https://www.youtube.com/")) {
184-
// Another posibility is that this link is pointing to another video
185-
// we need to put the redirectLink in here explicitly in order to add the domain part to the link.
183+
} else if(redirectLink.toString().contains("https://www.youtube.com/")) {
186184
a.text(redirectLink.toString());
187185
}
188186
}

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static class DescriptionTestPewdiepie {
176176
public static void setUp() throws Exception {
177177
NewPipe.init(Downloader.getInstance());
178178
extractor = (YoutubeStreamExtractor) YouTube
179-
.getStreamExtractor("https://www.youtube.com/watch?v=dJY8iT341F4");
179+
.getStreamExtractor("https://www.youtube.com/watch?v=LUldijpMUew");
180180
extractor.fetchPage();
181181
}
182182

@@ -189,14 +189,14 @@ public void testGetDescription() throws ParsingException {
189189
@Test
190190
public void testGetFullLinksInDescriptlion() throws ParsingException {
191191
assertTrue(extractor.getDescription().contains("https://www.reddit.com/r/PewdiepieSubmissions/"));
192-
assertTrue(extractor.getDescription().contains("https://www.youtube.com/channel/UC3e8EMTOn4g6ZSKggHTnNng"));
192+
assertTrue(extractor.getDescription().contains("https://www.youtube.com/channel/UCeKXymg6S6Pt4EjjOlA759w"));
193+
assertTrue(extractor.getDescription().contains("https://www.youtube.com/watch?v=N6hVmn9FM7o"));
194+
assertTrue(extractor.getDescription().contains("https://usa.clutchchairz.com/product/pewdiepie-edition-throttle-series/"));
193195

194196
assertFalse(extractor.getDescription().contains("https://www.reddit.com/r/PewdiepieSub..."));
197+
assertFalse(extractor.getDescription().contains("https://www.youtube.com/channel/UCeKX..."));
198+
assertFalse(extractor.getDescription().contains("https://www.youtube.com/watch?v=qpaV3..."));
195199
assertFalse(extractor.getDescription().contains("https://usa.clutchchairz.com/product/..."));
196-
assertFalse(extractor.getDescription().contains("https://europe.clutchchairz.com/en/pr..."));
197-
assertFalse(extractor.getDescription().contains("https://canada.clutchchairz.com/produ..."));
198-
assertFalse(extractor.getDescription().contains("http://store.steampowered.com/app/703..."));
199-
assertFalse(extractor.getDescription().contains("https://www.youtube.com/channel/UC3e8..."));
200200
}
201201
}
202202
}

0 commit comments

Comments
 (0)