mirror of
https://github.com/TeamNewPipe/NewPipeExtractor.git
synced 2024-12-14 14:20:33 +05:30
Merge branch 'master' into peertube
This commit is contained in:
commit
c4e502b9d2
@ -227,7 +227,7 @@ public abstract class StreamingService {
|
|||||||
public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler) throws ExtractionException {
|
public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler) throws ExtractionException {
|
||||||
return getChannelExtractor(linkHandler, NewPipe.getPreferredLocalization());
|
return getChannelExtractor(linkHandler, NewPipe.getPreferredLocalization());
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler) throws ExtractionException {
|
public PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler) throws ExtractionException {
|
||||||
return getPlaylistExtractor(linkHandler, NewPipe.getPreferredLocalization());
|
return getPlaylistExtractor(linkHandler, NewPipe.getPreferredLocalization());
|
||||||
}
|
}
|
||||||
@ -307,8 +307,6 @@ public abstract class StreamingService {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* figure out where the link is pointing to (a channel, video, playlist, etc.)
|
|
||||||
/**
|
/**
|
||||||
* Figures out where the link is pointing to (a channel, a video, a playlist, etc.)
|
* Figures out where the link is pointing to (a channel, a video, a playlist, etc.)
|
||||||
* @param url the url on which it should be decided of which link type it is
|
* @param url the url on which it should be decided of which link type it is
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import static java.util.Arrays.asList;
|
|
||||||
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
|
|
||||||
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
|
|
||||||
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
|
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.StreamingService;
|
import org.schabi.newpipe.extractor.StreamingService;
|
||||||
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
||||||
@ -38,6 +33,10 @@ import org.schabi.newpipe.extractor.stream.StreamExtractor;
|
|||||||
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
|
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
|
||||||
import org.schabi.newpipe.extractor.utils.Localization;
|
import org.schabi.newpipe.extractor.utils.Localization;
|
||||||
|
|
||||||
|
import static java.util.Arrays.asList;
|
||||||
|
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
|
||||||
|
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
|
||||||
|
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Created by Christian Schabesberger on 23.08.15.
|
* Created by Christian Schabesberger on 23.08.15.
|
||||||
@ -140,15 +139,16 @@ public class YoutubeService extends StreamingService {
|
|||||||
return new YoutubeSubscriptionExtractor(this);
|
return new YoutubeSubscriptionExtractor(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ListLinkHandlerFactory getCommentsLHFactory() {
|
public ListLinkHandlerFactory getCommentsLHFactory() {
|
||||||
return YoutubeCommentsLinkHandlerFactory.getInstance();
|
return YoutubeCommentsLinkHandlerFactory.getInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CommentsExtractor getCommentsExtractor(ListLinkHandler urlIdHandler, Localization localization) throws ExtractionException {
|
public CommentsExtractor getCommentsExtractor(ListLinkHandler urlIdHandler, Localization localization)
|
||||||
return new YoutubeCommentsExtractor(this, urlIdHandler, localization);
|
throws ExtractionException {
|
||||||
}
|
return new YoutubeCommentsExtractor(this, urlIdHandler, localization);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isCommentsSupported() {
|
public boolean isCommentsSupported() {
|
||||||
|
@ -35,6 +35,7 @@ import com.grack.nanojson.JsonParser;
|
|||||||
|
|
||||||
public class YoutubeCommentsExtractor extends CommentsExtractor {
|
public class YoutubeCommentsExtractor extends CommentsExtractor {
|
||||||
|
|
||||||
|
// using the mobile site for comments because it loads faster and uses get requests instead of post
|
||||||
private static final String USER_AGENT = "Mozilla/5.0 (Android 8.1.0; Mobile; rv:62.0) Gecko/62.0 Firefox/62.0";
|
private static final String USER_AGENT = "Mozilla/5.0 (Android 8.1.0; Mobile; rv:62.0) Gecko/62.0 Firefox/62.0";
|
||||||
private static final Pattern YT_CLIENT_NAME_PATTERN = Pattern.compile("INNERTUBE_CONTEXT_CLIENT_NAME\\\":(.*?)[,}]");
|
private static final Pattern YT_CLIENT_NAME_PATTERN = Pattern.compile("INNERTUBE_CONTEXT_CLIENT_NAME\\\":(.*?)[,}]");
|
||||||
|
|
||||||
|
@ -568,9 +568,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
|||||||
private final static String DECYRYPTION_SIGNATURE_FUNCTION_REGEX =
|
private final static String DECYRYPTION_SIGNATURE_FUNCTION_REGEX =
|
||||||
"(\\w+)\\s*=\\s*function\\((\\w+)\\)\\{\\s*\\2=\\s*\\2\\.split\\(\"\"\\)\\s*;";
|
"(\\w+)\\s*=\\s*function\\((\\w+)\\)\\{\\s*\\2=\\s*\\2\\.split\\(\"\"\\)\\s*;";
|
||||||
private final static String DECRYPTION_AKAMAIZED_STRING_REGEX =
|
private final static String DECRYPTION_AKAMAIZED_STRING_REGEX =
|
||||||
"yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
|
"yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
|
||||||
private final static String DECRYPTION_AKAMAIZED_SHORT_STRING_REGEX =
|
private final static String DECRYPTION_AKAMAIZED_SHORT_STRING_REGEX =
|
||||||
"\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
|
"\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
|
||||||
|
|
||||||
private volatile String decryptionCode = "";
|
private volatile String decryptionCode = "";
|
||||||
|
|
||||||
|
@ -270,8 +270,8 @@ public class StreamInfo extends Info {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private StreamType streamType;
|
private StreamType streamType;
|
||||||
private String thumbnailUrl;
|
private String thumbnailUrl = "";
|
||||||
private String uploadDate;
|
private String uploadDate = "";
|
||||||
private long duration = -1;
|
private long duration = -1;
|
||||||
private int ageLimit = -1;
|
private int ageLimit = -1;
|
||||||
private String description;
|
private String description;
|
||||||
@ -280,26 +280,26 @@ public class StreamInfo extends Info {
|
|||||||
private long likeCount = -1;
|
private long likeCount = -1;
|
||||||
private long dislikeCount = -1;
|
private long dislikeCount = -1;
|
||||||
|
|
||||||
private String uploaderName;
|
private String uploaderName = "";
|
||||||
private String uploaderUrl;
|
private String uploaderUrl = "";
|
||||||
private String uploaderAvatarUrl;
|
private String uploaderAvatarUrl = "";
|
||||||
|
|
||||||
private List<VideoStream> videoStreams;
|
private List<VideoStream> videoStreams = new ArrayList<>();
|
||||||
private List<AudioStream> audioStreams;
|
private List<AudioStream> audioStreams = new ArrayList<>();
|
||||||
private List<VideoStream> videoOnlyStreams;
|
private List<VideoStream> videoOnlyStreams = new ArrayList<>();
|
||||||
|
|
||||||
private String dashMpdUrl;
|
private String dashMpdUrl = "";
|
||||||
private List<VideoStream> segmentedVideoStreams;
|
private List<VideoStream> segmentedVideoStreams = new ArrayList<>();
|
||||||
private List<AudioStream> segmentedAudioStreams;
|
private List<AudioStream> segmentedAudioStreams = new ArrayList<>();
|
||||||
private List<VideoStream> segmentedVideoOnlyStreams;
|
private List<VideoStream> segmentedVideoOnlyStreams = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
private String hlsUrl;
|
private String hlsUrl = "";
|
||||||
private StreamInfoItem nextVideo;
|
private StreamInfoItem nextVideo;
|
||||||
private List<InfoItem> relatedStreams;
|
private List<InfoItem> relatedStreams = new ArrayList<>();
|
||||||
|
|
||||||
private long startPosition = 0;
|
private long startPosition = 0;
|
||||||
private List<SubtitlesStream> subtitles;
|
private List<SubtitlesStream> subtitles = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the stream type
|
* Get the stream type
|
||||||
|
@ -1,67 +0,0 @@
|
|||||||
package org.schabi.newpipe.extractor.services.youtube;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Created by Christian Schabesberger on 30.12.15.
|
|
||||||
*
|
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
|
||||||
* YoutubeVideoExtractorDefault.java is part of NewPipe.
|
|
||||||
*
|
|
||||||
* NewPipe is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* NewPipe is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import org.junit.BeforeClass;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.schabi.newpipe.Downloader;
|
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
|
||||||
import org.schabi.newpipe.extractor.stream.StreamExtractor;
|
|
||||||
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.utils.Localization;
|
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
|
||||||
import static org.junit.Assert.assertTrue;
|
|
||||||
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test for {@link StreamExtractor}
|
|
||||||
*/
|
|
||||||
public class YoutubeStreamExtractorDASHTest {
|
|
||||||
private static StreamInfo info;
|
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
public static void setUp() throws Exception {
|
|
||||||
NewPipe.init(Downloader.getInstance(), new Localization("GB", "en"));
|
|
||||||
info = StreamInfo.getInfo(YouTube, "https://www.youtube.com/watch?v=00Q4SUnVQK4");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testGetDashMpd() {
|
|
||||||
assertTrue(info.getDashMpdUrl(),
|
|
||||||
info.getDashMpdUrl() != null && !info.getDashMpdUrl().isEmpty());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testRegularStreams() {
|
|
||||||
assertEquals(0, info.getAudioStreams().size());
|
|
||||||
assertEquals(0, info.getVideoOnlyStreams().size());
|
|
||||||
assertEquals(4, info.getVideoStreams().size());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testSegmentedStreams() {
|
|
||||||
assertEquals(2, info.getSegmentedAudioStreams().size());
|
|
||||||
assertEquals(3, info.getSegmentedVideoOnlyStreams().size());
|
|
||||||
assertEquals(0, info.getSegmentedVideoStreams().size());
|
|
||||||
}
|
|
||||||
}
|
|
@ -43,6 +43,9 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
|
|||||||
*/
|
*/
|
||||||
public class YoutubeStreamExtractorDefaultTest {
|
public class YoutubeStreamExtractorDefaultTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for {@link StreamExtractor}
|
||||||
|
*/
|
||||||
public static class AdeleHello {
|
public static class AdeleHello {
|
||||||
private static YoutubeStreamExtractor extractor;
|
private static YoutubeStreamExtractor extractor;
|
||||||
|
|
||||||
|
@ -13,6 +13,9 @@ import static java.util.Collections.singletonList;
|
|||||||
import static junit.framework.TestCase.assertTrue;
|
import static junit.framework.TestCase.assertTrue;
|
||||||
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
|
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for {@link YoutubeSearchExtractor}
|
||||||
|
*/
|
||||||
public class YoutubeSearchCountTest {
|
public class YoutubeSearchCountTest {
|
||||||
public static class YoutubeChannelViewCountTest extends YoutubeSearchExtractorBaseTest {
|
public static class YoutubeChannelViewCountTest extends YoutubeSearchExtractorBaseTest {
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
@ -28,7 +31,7 @@ public class YoutubeSearchCountTest {
|
|||||||
public void testViewCount() {
|
public void testViewCount() {
|
||||||
ChannelInfoItem ci = (ChannelInfoItem) itemsPage.getItems().get(0);
|
ChannelInfoItem ci = (ChannelInfoItem) itemsPage.getItems().get(0);
|
||||||
assertTrue("Count does not fit: " + Long.toString(ci.getSubscriberCount()),
|
assertTrue("Count does not fit: " + Long.toString(ci.getSubscriberCount()),
|
||||||
69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 73043316);
|
69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 103043316);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -62,7 +62,9 @@ public class YoutubeSearchExtractorDefaultTest extends YoutubeSearchExtractorBas
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testResultList_FirstElement() {
|
public void testResultList_FirstElement() {
|
||||||
InfoItem firstInfoItem = itemsPage.getItems().get(1);
|
InfoItem firstInfoItem = itemsPage.getItems().get(0);
|
||||||
|
if(! (firstInfoItem instanceof ChannelInfoItem))
|
||||||
|
firstInfoItem = itemsPage.getItems().get(1);
|
||||||
|
|
||||||
// The channel should be the first item
|
// The channel should be the first item
|
||||||
assertTrue(firstInfoItem instanceof ChannelInfoItem);
|
assertTrue(firstInfoItem instanceof ChannelInfoItem);
|
||||||
|
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,6 @@
|
|||||||
|
#Fri Jan 18 11:51:40 CET 2019
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
|
||||||
|
Loading…
Reference in New Issue
Block a user