be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

-Fixed tests 

-Simplified subtitle extraction url
This commit is contained in:
John Zhen Mo 2018-02-01 19:07:57 -08:00
parent 1f1bbaad57
commit b3699cdcfc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
View File

@ -716,7 +716,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
final Document listing = Jsoup.parse(pageContent, listingUrl); final Document listing = Jsoup.parse(pageContent, listingUrl);
final Elements tracks = listing.select("track"); final Elements tracks = listing.select("track");
List<Subtitles> subtitles = new ArrayList<>(tracks.size() * 5); List<Subtitles> subtitles = new ArrayList<>(tracks.size() * 2);
for (final Element track : tracks) { for (final Element track : tracks) {
final String languageCode = track.attr("lang_code"); final String languageCode = track.attr("lang_code");
subtitles.add(getVideoSubtitlesUrl(id, languageCode, SubtitlesFormat.TTML)); subtitles.add(getVideoSubtitlesUrl(id, languageCode, SubtitlesFormat.TTML));
@ -761,7 +761,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
@Nonnull @Nonnull
private static Subtitles getVideoSubtitlesUrl(final String id, final String locale, final SubtitlesFormat format) { private static Subtitles getVideoSubtitlesUrl(final String id, final String locale, final SubtitlesFormat format) {
final String url = "https://www.youtube.com/api/timedtext?lang=" + locale + final String url = "https://www.youtube.com/api/timedtext?lang=" + locale +
"&fmt=" + format.getExtension() + "&name=&v=" + id; "&fmt=" + format.getExtension() + "&v=" + id;
// These are all non-generated // These are all non-generated
return new Subtitles(format, locale, url, false); return new Subtitles(format, locale, url, false);
} }

4
src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
View File

@ -109,12 +109,12 @@ public class SoundcloudStreamExtractorDefaultTest {
@Test @Test
public void testGetSubtitlesListDefault() throws IOException, ExtractionException { public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
assertTrue(extractor.getSubtitlesDefault() == null); assertTrue(extractor.getSubtitlesDefault().isEmpty());
} }
@Test @Test
public void testGetSubtitlesList() throws IOException, ExtractionException { public void testGetSubtitlesList() throws IOException, ExtractionException {
// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null); assertTrue(extractor.getSubtitlesDefault().isEmpty());
} }
} }

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

@ -153,6 +153,6 @@ public class YoutubeStreamExtractorDefaultTest {
@Test @Test
public void testGetSubtitlesList() throws IOException, ExtractionException { public void testGetSubtitlesList() throws IOException, ExtractionException {
// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT).isEmpty()); assertTrue(extractor.getSubtitlesDefault().isEmpty());
} }
} }