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

Merge pull request #583 from TeamNewPipe/peertube_playlist 

Fix some tests and bugs
This commit is contained in:
Tobi 2021-03-25 21:53:41 +01:00 committed by GitHub
parent d4f83a1782 070a40e181
commit e2500fb7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeParsingHelper.java
View File

@ -86,7 +86,13 @@ public class PeertubeParsingHelper {
for (final Object c : contents) { for (final Object c : contents) {
if (c instanceof JsonObject) { if (c instanceof JsonObject) {
final JsonObject item = (JsonObject) c; JsonObject item = (JsonObject) c;
// PeerTube playlists have the stream info encapsulated in an "video" object
if (item.has("video")) {
item = item.getObject("video");
}
PeertubeStreamInfoItemExtractor extractor; PeertubeStreamInfoItemExtractor extractor;
if (sepia) { if (sepia) {
extractor = new PeertubeSepiaStreamInfoItemExtractor(item, baseUrl); extractor = new PeertubeSepiaStreamInfoItemExtractor(item, baseUrl);

5
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMixPlaylistExtractor.java
View File

@ -13,6 +13,7 @@ import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler; import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
import org.schabi.newpipe.extractor.localization.TimeAgoParser; import org.schabi.newpipe.extractor.localization.TimeAgoParser;
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor; import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector; import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
import org.schabi.newpipe.extractor.utils.JsonUtils; import org.schabi.newpipe.extractor.utils.JsonUtils;
@ -67,8 +68,8 @@ public class YoutubeMixPlaylistExtractor extends PlaylistExtractor {
@Nonnull @Nonnull
@Override @Override
public String getName() throws ParsingException { public String getName() throws ParsingException {
final String name = playlistData.getString("title"); final String name = YoutubeParsingHelper.getTextAtKey(playlistData, "title");
if (name == null) { if (isNullOrEmpty(name)) {
throw new ParsingException("Could not get playlist name"); throw new ParsingException("Could not get playlist name");
} }
return name; return name;

11
extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCLiveStreamListExtractorTest.java
View File

@ -9,8 +9,6 @@ import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.schabi.newpipe.extractor.ServiceList.MediaCCC; import static org.schabi.newpipe.extractor.ServiceList.MediaCCC;
public class MediaCCCLiveStreamListExtractorTest { public class MediaCCCLiveStreamListExtractorTest {
@ -23,15 +21,10 @@ public class MediaCCCLiveStreamListExtractorTest {
extractor.fetchPage(); extractor.fetchPage();
} }
@Test @Test
public void getConferencesListTest() throws Exception { public void getConferencesListTest() throws Exception {
final List<InfoItem> a = extractor.getInitialPage().getItems(); final List<InfoItem> items = extractor.getInitialPage().getItems();
for (int i = 0; i < a.size(); i++) { // just test if there is an exception thrown
final InfoItem b = a.get(i);
assertNotNull(a.get(i).getName());
assertTrue(a.get(i).getName().length() >= 1);
}
} }
} }

3
extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCRecentListExtractorTest.java
View File

@ -32,7 +32,8 @@ public class MediaCCCRecentListExtractorTest {
for (final StreamInfoItem item: items) { for (final StreamInfoItem item: items) {
assertFalse(isNullOrEmpty(item.getName())); assertFalse(isNullOrEmpty(item.getName()));
assertTrue(item.getDuration() > 0); assertTrue(item.getDuration() > 0);
assertTrue(item.getUploadDate().offsetDateTime().isBefore(OffsetDateTime.now())); // Disabled for now, because sometimes videos are uploaded, but their release date is in the future
// assertTrue(item.getUploadDate().offsetDateTime().isBefore(OffsetDateTime.now()));
} }
} }