Refactor extractor
- Refactor info classes and extractors - Reformat and fix indentation - Organize packages and classes - Rename variables/methods and fix regex - Change the capitalization - Add methods to playlist extractor
This commit is contained in:
parent
7581c1200b
commit
21e542e7d2
53 changed files with 1043 additions and 902 deletions
|
@ -5,7 +5,7 @@ import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 28.01.16.
|
* Created by Christian Schabesberger on 28.01.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -27,26 +27,35 @@ import java.util.Map;
|
||||||
|
|
||||||
public interface Downloader {
|
public interface Downloader {
|
||||||
|
|
||||||
/**Download the text file at the supplied URL as in download(String),
|
/**
|
||||||
|
* Download the text file at the supplied URL as in download(String),
|
||||||
* but set the HTTP header field "Accept-Language" to the supplied string.
|
* but set the HTTP header field "Accept-Language" to the supplied string.
|
||||||
* @param siteUrl the URL of the text file to return the contents of
|
*
|
||||||
|
* @param siteUrl the URL of the text file to return the contents of
|
||||||
* @param language the language (usually a 2-character code) to set as the preferred language
|
* @param language the language (usually a 2-character code) to set as the preferred language
|
||||||
* @return the contents of the specified text file
|
* @return the contents of the specified text file
|
||||||
* @throws IOException*/
|
* @throws IOException
|
||||||
|
*/
|
||||||
String download(String siteUrl, String language) throws IOException, ReCaptchaException;
|
String download(String siteUrl, String language) throws IOException, ReCaptchaException;
|
||||||
|
|
||||||
/**Download the text file at the supplied URL as in download(String),
|
/**
|
||||||
|
* Download the text file at the supplied URL as in download(String),
|
||||||
* but set the HTTP header field "Accept-Language" to the supplied string.
|
* but set the HTTP header field "Accept-Language" to the supplied string.
|
||||||
* @param siteUrl the URL of the text file to return the contents of
|
*
|
||||||
|
* @param siteUrl the URL of the text file to return the contents of
|
||||||
* @param customProperties set request header properties
|
* @param customProperties set request header properties
|
||||||
* @return the contents of the specified text file
|
* @return the contents of the specified text file
|
||||||
* @throws IOException*/
|
* @throws IOException
|
||||||
|
*/
|
||||||
String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException;
|
String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException;
|
||||||
|
|
||||||
/**Download (via HTTP) the text file located at the supplied URL, and return its contents.
|
/**
|
||||||
|
* Download (via HTTP) the text file located at the supplied URL, and return its contents.
|
||||||
* Primarily intended for downloading web pages.
|
* Primarily intended for downloading web pages.
|
||||||
|
*
|
||||||
* @param siteUrl the URL of the text file to download
|
* @param siteUrl the URL of the text file to download
|
||||||
* @return the contents of the specified text file
|
* @return the contents of the specified text file
|
||||||
* @throws IOException*/
|
* @throws IOException
|
||||||
|
*/
|
||||||
String download(String siteUrl) throws IOException, ReCaptchaException;
|
String download(String siteUrl) throws IOException, ReCaptchaException;
|
||||||
}
|
}
|
||||||
|
|
35
Extractor.java
Normal file
35
Extractor.java
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public abstract class Extractor implements Serializable {
|
||||||
|
private final int serviceId;
|
||||||
|
private final String url;
|
||||||
|
private final UrlIdHandler urlIdHandler;
|
||||||
|
private final StreamInfoItemCollector previewInfoCollector;
|
||||||
|
|
||||||
|
public Extractor(UrlIdHandler urlIdHandler, int serviceId, String url) {
|
||||||
|
this.urlIdHandler = urlIdHandler;
|
||||||
|
this.serviceId = serviceId;
|
||||||
|
this.url = url;
|
||||||
|
this.previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUrl() {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UrlIdHandler getUrlIdHandler() {
|
||||||
|
return urlIdHandler;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getServiceId() {
|
||||||
|
return serviceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected StreamInfoItemCollector getStreamPreviewInfoCollector() {
|
||||||
|
return previewInfoCollector;
|
||||||
|
}
|
||||||
|
}
|
19
Info.java
Normal file
19
Info.java
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Vector;
|
||||||
|
|
||||||
|
public abstract class Info implements Serializable {
|
||||||
|
|
||||||
|
public int service_id = -1;
|
||||||
|
/**
|
||||||
|
* Id of this Info object <br>
|
||||||
|
* e.g. Youtube: https://www.youtube.com/watch?v=RER5qCTzZ7 > RER5qCTzZ7
|
||||||
|
*/
|
||||||
|
public String id = "";
|
||||||
|
public String url = "";
|
||||||
|
public String name = "";
|
||||||
|
|
||||||
|
public List<Throwable> errors = new Vector<>();
|
||||||
|
}
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by the-scrabi on 11.02.17.
|
* Created by the-scrabi on 11.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -22,7 +22,7 @@ import java.io.Serializable;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public interface InfoItem extends Serializable{
|
public interface InfoItem extends Serializable {
|
||||||
enum InfoType {
|
enum InfoType {
|
||||||
STREAM,
|
STREAM,
|
||||||
PLAYLIST,
|
PLAYLIST,
|
||||||
|
|
|
@ -5,7 +5,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.02.17.
|
* Created by Christian Schabesberger on 12.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -37,11 +37,13 @@ public class InfoItemCollector {
|
||||||
public List<InfoItem> getItemList() {
|
public List<InfoItem> getItemList() {
|
||||||
return itemList;
|
return itemList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Throwable> getErrors() {
|
public List<Throwable> getErrors() {
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addFromCollector(InfoItemCollector otherC) throws ExtractionException {
|
protected void addFromCollector(InfoItemCollector otherC) throws ExtractionException {
|
||||||
if(serviceId != otherC.serviceId) {
|
if (serviceId != otherC.serviceId) {
|
||||||
throw new ExtractionException("Service Id does not equal: "
|
throw new ExtractionException("Service Id does not equal: "
|
||||||
+ NewPipe.getNameOfService(serviceId)
|
+ NewPipe.getNameOfService(serviceId)
|
||||||
+ " and " + NewPipe.getNameOfService(otherC.serviceId));
|
+ " and " + NewPipe.getNameOfService(otherC.serviceId));
|
||||||
|
@ -49,12 +51,15 @@ public class InfoItemCollector {
|
||||||
errors.addAll(otherC.errors);
|
errors.addAll(otherC.errors);
|
||||||
itemList.addAll(otherC.itemList);
|
itemList.addAll(otherC.itemList);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addError(Exception e) {
|
protected void addError(Exception e) {
|
||||||
errors.add(e);
|
errors.add(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addItem(InfoItem item) {
|
protected void addItem(InfoItem item) {
|
||||||
itemList.add(item);
|
itemList.add(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int getServiceId() {
|
protected int getServiceId() {
|
||||||
return serviceId;
|
return serviceId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Adam Howard on 08/11/15.
|
* Created by Adam Howard on 08/11/15.
|
||||||
*
|
*
|
||||||
* Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
|
* Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
|
||||||
|
@ -22,7 +22,9 @@ package org.schabi.newpipe.extractor;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**Static data about various media formats support by Newpipe, eg mime type, extension*/
|
/**
|
||||||
|
* Static data about various media formats support by Newpipe, eg mime type, extension
|
||||||
|
*/
|
||||||
|
|
||||||
public enum MediaFormat {
|
public enum MediaFormat {
|
||||||
//video and audio combined formats
|
//video and audio combined formats
|
||||||
|
@ -48,35 +50,44 @@ public enum MediaFormat {
|
||||||
this.mimeType = mimeType;
|
this.mimeType = mimeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Return the friendly name of the media format with the supplied id
|
/**
|
||||||
|
* Return the friendly name of the media format with the supplied id
|
||||||
|
*
|
||||||
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
||||||
* @return the friendly name of the MediaFormat associated with this ids,
|
* @return the friendly name of the MediaFormat associated with this ids,
|
||||||
* or an empty String if none match it.*/
|
* or an empty String if none match it.
|
||||||
|
*/
|
||||||
public static String getNameById(int ident) {
|
public static String getNameById(int ident) {
|
||||||
for (MediaFormat vf : MediaFormat.values()) {
|
for (MediaFormat vf : MediaFormat.values()) {
|
||||||
if(vf.id == ident) return vf.name;
|
if (vf.id == ident) return vf.name;
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Return the file extension of the media format with the supplied id
|
/**
|
||||||
|
* Return the file extension of the media format with the supplied id
|
||||||
|
*
|
||||||
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
||||||
* @return the file extension of the MediaFormat associated with this ids,
|
* @return the file extension of the MediaFormat associated with this ids,
|
||||||
* or an empty String if none match it.*/
|
* or an empty String if none match it.
|
||||||
|
*/
|
||||||
public static String getSuffixById(int ident) {
|
public static String getSuffixById(int ident) {
|
||||||
for (MediaFormat vf : MediaFormat.values()) {
|
for (MediaFormat vf : MediaFormat.values()) {
|
||||||
if(vf.id == ident) return vf.suffix;
|
if (vf.id == ident) return vf.suffix;
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Return the MIME type of the media format with the supplied id
|
/**
|
||||||
|
* Return the MIME type of the media format with the supplied id
|
||||||
|
*
|
||||||
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
* @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
|
||||||
* @return the MIME type of the MediaFormat associated with this ids,
|
* @return the MIME type of the MediaFormat associated with this ids,
|
||||||
* or an empty String if none match it.*/
|
* or an empty String if none match it.
|
||||||
|
*/
|
||||||
public static String getMimeById(int ident) {
|
public static String getMimeById(int ident) {
|
||||||
for (MediaFormat vf : MediaFormat.values()) {
|
for (MediaFormat vf : MediaFormat.values()) {
|
||||||
if(vf.id == ident) return vf.mimeType;
|
if (vf.id == ident) return vf.mimeType;
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
31
NewPipe.java
31
NewPipe.java
|
@ -1,9 +1,8 @@
|
||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 23.08.15.
|
* Created by Christian Schabesberger on 23.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -23,34 +22,37 @@ import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**Provides access to the video streaming services supported by NewPipe.
|
/**
|
||||||
* Currently only Youtube until the API becomes more stable.*/
|
* Provides access to the video streaming services supported by NewPipe.
|
||||||
|
* Currently only Youtube until the API becomes more stable.
|
||||||
|
*/
|
||||||
|
|
||||||
@SuppressWarnings("ALL")
|
@SuppressWarnings("ALL")
|
||||||
public class NewPipe {
|
public class NewPipe {
|
||||||
|
private static final String TAG = NewPipe.class.toString();
|
||||||
|
|
||||||
private NewPipe() {
|
private NewPipe() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String TAG = NewPipe.class.toString();
|
|
||||||
|
|
||||||
|
|
||||||
private static Downloader downloader = null;
|
private static Downloader downloader = null;
|
||||||
|
|
||||||
public static StreamingService[] getServices() {
|
public static StreamingService[] getServices() {
|
||||||
return ServiceList.serviceList;
|
return ServiceList.serviceList;
|
||||||
}
|
}
|
||||||
public static StreamingService getService(int serviceId)throws ExtractionException {
|
|
||||||
for(StreamingService s : ServiceList.serviceList) {
|
public static StreamingService getService(int serviceId) throws ExtractionException {
|
||||||
if(s.getServiceId() == serviceId) {
|
for (StreamingService s : ServiceList.serviceList) {
|
||||||
|
if (s.getServiceId() == serviceId) {
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static StreamingService getService(String serviceName) throws ExtractionException {
|
public static StreamingService getService(String serviceName) throws ExtractionException {
|
||||||
return ServiceList.serviceList[getIdOfService(serviceName)];
|
return ServiceList.serviceList[getIdOfService(serviceName)];
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getNameOfService(int id) {
|
public static String getNameOfService(int id) {
|
||||||
try {
|
try {
|
||||||
return getService(id).getServiceInfo().name;
|
return getService(id).getServiceInfo().name;
|
||||||
|
@ -60,9 +62,10 @@ public class NewPipe {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getIdOfService(String serviceName) {
|
public static int getIdOfService(String serviceName) {
|
||||||
for(int i = 0; i < ServiceList.serviceList.length; i++) {
|
for (int i = 0; i < ServiceList.serviceList.length; i++) {
|
||||||
if(ServiceList.serviceList[i].getServiceInfo().name.equals(serviceName)) {
|
if (ServiceList.serviceList[i].getServiceInfo().name.equals(serviceName)) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,8 +81,8 @@ public class NewPipe {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static StreamingService getServiceByUrl(String url) {
|
public static StreamingService getServiceByUrl(String url) {
|
||||||
for(StreamingService s : ServiceList.serviceList) {
|
for (StreamingService s : ServiceList.serviceList) {
|
||||||
if(s.getLinkTypeByUrl(url) != StreamingService.LinkType.NONE) {
|
if (s.getLinkTypeByUrl(url) != StreamingService.LinkType.NONE) {
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
|
import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by the-scrabi on 18.02.17.
|
* Created by the-scrabi on 18.02.17.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -2,32 +2,12 @@ package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.playlist.PlayListExtractor;
|
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
|
||||||
import org.schabi.newpipe.extractor.search.SearchEngine;
|
import org.schabi.newpipe.extractor.search.SearchEngine;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
|
import org.schabi.newpipe.extractor.stream.StreamExtractor;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Christian Schabesberger on 23.08.15.
|
|
||||||
*
|
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
|
||||||
* StreamingService.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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public abstract class StreamingService {
|
public abstract class StreamingService {
|
||||||
public class ServiceInfo {
|
public class ServiceInfo {
|
||||||
public String name = "";
|
public String name = "";
|
||||||
|
@ -47,19 +27,16 @@ public abstract class StreamingService {
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract ServiceInfo getServiceInfo();
|
public abstract ServiceInfo getServiceInfo();
|
||||||
|
public abstract StreamExtractor getExtractorInstance(String url) throws IOException, ExtractionException;
|
||||||
public abstract StreamExtractor getExtractorInstance(String url)
|
|
||||||
throws IOException, ExtractionException;
|
|
||||||
public abstract SearchEngine getSearchEngineInstance();
|
public abstract SearchEngine getSearchEngineInstance();
|
||||||
public abstract UrlIdHandler getStreamUrlIdHandlerInstance();
|
public abstract UrlIdHandler getStreamUrlIdHandlerInstance();
|
||||||
public abstract UrlIdHandler getChannelUrlIdHandlerInstance();
|
public abstract UrlIdHandler getChannelUrlIdHandlerInstance();
|
||||||
public abstract UrlIdHandler getPlayListUrlIdHandlerInstance();
|
public abstract UrlIdHandler getPlaylistUrlIdHandlerInstance();
|
||||||
public abstract ChannelExtractor getChannelExtractorInstance(String url, int page)
|
public abstract ChannelExtractor getChannelExtractorInstance(String url) throws ExtractionException, IOException;
|
||||||
throws ExtractionException, IOException;
|
public abstract PlaylistExtractor getPlaylistExtractorInstance(String url) throws ExtractionException, IOException;
|
||||||
public abstract PlayListExtractor getPlayListExtractorInstance(String url, int page)
|
|
||||||
throws ExtractionException, IOException;
|
|
||||||
public abstract SuggestionExtractor getSuggestionExtractorInstance();
|
public abstract SuggestionExtractor getSuggestionExtractorInstance();
|
||||||
|
|
||||||
|
|
||||||
public final int getServiceId() {
|
public final int getServiceId() {
|
||||||
return serviceId;
|
return serviceId;
|
||||||
}
|
}
|
||||||
|
@ -70,11 +47,11 @@ public abstract class StreamingService {
|
||||||
public final LinkType getLinkTypeByUrl(String url) {
|
public final LinkType getLinkTypeByUrl(String url) {
|
||||||
UrlIdHandler sH = getStreamUrlIdHandlerInstance();
|
UrlIdHandler sH = getStreamUrlIdHandlerInstance();
|
||||||
UrlIdHandler cH = getChannelUrlIdHandlerInstance();
|
UrlIdHandler cH = getChannelUrlIdHandlerInstance();
|
||||||
UrlIdHandler pH = getPlayListUrlIdHandlerInstance();
|
UrlIdHandler pH = getPlaylistUrlIdHandlerInstance();
|
||||||
|
|
||||||
if(sH.acceptUrl(url)) {
|
if (sH.acceptUrl(url)) {
|
||||||
return LinkType.STREAM;
|
return LinkType.STREAM;
|
||||||
} else if(cH.acceptUrl(url)) {
|
} else if (cH.acceptUrl(url)) {
|
||||||
return LinkType.CHANNEL;
|
return LinkType.CHANNEL;
|
||||||
} else if (pH.acceptUrl(url)) {
|
} else if (pH.acceptUrl(url)) {
|
||||||
return LinkType.PLAYLIST;
|
return LinkType.PLAYLIST;
|
||||||
|
|
|
@ -5,7 +5,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 28.09.16.
|
* Created by Christian Schabesberger on 28.09.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -33,8 +33,7 @@ public abstract class SuggestionExtractor {
|
||||||
this.serviceId = serviceId;
|
this.serviceId = serviceId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract List<String> suggestionList(
|
public abstract List<String> suggestionList(String query, String contentCountry)
|
||||||
String query,String contentCountry)
|
|
||||||
throws ExtractionException, IOException;
|
throws ExtractionException, IOException;
|
||||||
|
|
||||||
public int getServiceId() {
|
public int getServiceId() {
|
||||||
|
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 26.07.16.
|
* Created by Christian Schabesberger on 26.07.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -28,8 +28,10 @@ public interface UrlIdHandler {
|
||||||
String getId(String siteUrl) throws ParsingException;
|
String getId(String siteUrl) throws ParsingException;
|
||||||
String cleanUrl(String siteUrl) throws ParsingException;
|
String cleanUrl(String siteUrl) throws ParsingException;
|
||||||
|
|
||||||
/**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
|
/**
|
||||||
Intent was meant to be watched with this Service.
|
* When a VIEW_ACTION is caught this function will test if the url delivered within the calling
|
||||||
Return false if this service shall not allow to be called through ACTIONs.*/
|
* Intent was meant to be watched with this Service.
|
||||||
|
* Return false if this service shall not allow to be called through ACTIONs.
|
||||||
|
*/
|
||||||
boolean acceptUrl(String videoUrl);
|
boolean acceptUrl(String videoUrl);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
package org.schabi.newpipe.extractor.channel;
|
package org.schabi.newpipe.extractor.channel;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Extractor;
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 25.07.16.
|
* Created by Christian Schabesberger on 25.07.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -27,36 +28,20 @@ import java.io.IOException;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public abstract class ChannelExtractor {
|
public abstract class ChannelExtractor extends Extractor {
|
||||||
private int serviceId;
|
|
||||||
private String url;
|
|
||||||
private UrlIdHandler urlIdHandler;
|
|
||||||
private StreamInfoItemCollector previewInfoCollector;
|
|
||||||
private int page = -1;
|
|
||||||
|
|
||||||
public ChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
|
public ChannelExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws ExtractionException, IOException {
|
||||||
throws ExtractionException, IOException {
|
super(urlIdHandler, serviceId, url);
|
||||||
this.url = url;
|
|
||||||
this.page = page;
|
|
||||||
this.serviceId = serviceId;
|
|
||||||
this.urlIdHandler = urlIdHandler;
|
|
||||||
previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUrl() { return url; }
|
|
||||||
public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
|
|
||||||
public StreamInfoItemCollector getStreamPreviewInfoCollector() {
|
|
||||||
return previewInfoCollector;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public abstract String getChannelId() throws ParsingException;
|
||||||
public abstract String getChannelName() throws ParsingException;
|
public abstract String getChannelName() throws ParsingException;
|
||||||
public abstract String getAvatarUrl() throws ParsingException;
|
public abstract String getAvatarUrl() throws ParsingException;
|
||||||
public abstract String getBannerUrl() throws ParsingException;
|
public abstract String getBannerUrl() throws ParsingException;
|
||||||
public abstract String getFeedUrl() throws ParsingException;
|
public abstract String getFeedUrl() throws ParsingException;
|
||||||
public abstract StreamInfoItemCollector getStreams() throws ParsingException;
|
public abstract StreamInfoItemCollector getStreams() throws ParsingException;
|
||||||
public abstract long getSubscriberCount() throws ParsingException;
|
public abstract long getSubscriberCount() throws ParsingException;
|
||||||
public abstract boolean hasNextPage() throws ParsingException;
|
public abstract boolean hasMoreStreams();
|
||||||
public int getServiceId() {
|
public abstract StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException;
|
||||||
return serviceId;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package org.schabi.newpipe.extractor.channel;
|
package org.schabi.newpipe.extractor.channel;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Info;
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 31.07.16.
|
* Created by Christian Schabesberger on 31.07.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -28,20 +27,23 @@ import java.util.Vector;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class ChannelInfo implements Serializable{
|
public class ChannelInfo extends Info {
|
||||||
public void addException(Exception e) {
|
|
||||||
errors.add(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ChannelInfo getInfo(ChannelExtractor extractor)
|
public static ChannelInfo getInfo(ChannelExtractor extractor)
|
||||||
throws ParsingException {
|
throws ParsingException {
|
||||||
ChannelInfo info = new ChannelInfo();
|
ChannelInfo info = new ChannelInfo();
|
||||||
|
|
||||||
// important data
|
// important data
|
||||||
info.service_id = extractor.getServiceId();
|
info.service_id = extractor.getServiceId();
|
||||||
info.channel_name = extractor.getChannelName();
|
info.url = extractor.getUrl();
|
||||||
info.hasNextPage = extractor.hasNextPage();
|
info.name = extractor.getChannelName();
|
||||||
|
info.hasMoreStreams = extractor.hasMoreStreams();
|
||||||
|
|
||||||
|
try {
|
||||||
|
info.id = extractor.getChannelId();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
info.avatar_url = extractor.getAvatarUrl();
|
info.avatar_url = extractor.getAvatarUrl();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -54,18 +56,18 @@ public class ChannelInfo implements Serializable{
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
info.feed_url = extractor.getFeedUrl();
|
info.feed_url = extractor.getFeedUrl();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
info.errors.add(e);
|
info.errors.add(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
StreamInfoItemCollector c = extractor.getStreams();
|
StreamInfoItemCollector c = extractor.getStreams();
|
||||||
info.related_streams = c.getItemList();
|
info.related_streams = c.getItemList();
|
||||||
info.errors.addAll(c.getErrors());
|
info.errors.addAll(c.getErrors());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
info.errors.add(e);
|
info.errors.add(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
info.subscriberCount = extractor.getSubscriberCount();
|
info.subscriber_count = extractor.getSubscriberCount();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
info.errors.add(e);
|
info.errors.add(e);
|
||||||
}
|
}
|
||||||
|
@ -73,14 +75,10 @@ public class ChannelInfo implements Serializable{
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int service_id = -1;
|
|
||||||
public String channel_name = "";
|
|
||||||
public String avatar_url = "";
|
public String avatar_url = "";
|
||||||
public String banner_url = "";
|
public String banner_url = "";
|
||||||
public String feed_url = "";
|
public String feed_url = "";
|
||||||
public List<InfoItem> related_streams = null;
|
public List<InfoItem> related_streams = null;
|
||||||
public long subscriberCount = -1;
|
public long subscriber_count = -1;
|
||||||
public boolean hasNextPage = false;
|
public boolean hasMoreStreams = false;
|
||||||
|
|
||||||
public List<Throwable> errors = new Vector<>();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.channel;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 11.02.17.
|
* Created by Christian Schabesberger on 11.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -30,14 +30,16 @@ public class ChannelInfoItem implements InfoItem {
|
||||||
public String webPageUrl = "";
|
public String webPageUrl = "";
|
||||||
public String description = "";
|
public String description = "";
|
||||||
public long subscriberCount = -1;
|
public long subscriberCount = -1;
|
||||||
public int videoAmount = -1;
|
public long viewCount = -1;
|
||||||
|
|
||||||
public InfoType infoType() {
|
public InfoType infoType() {
|
||||||
return InfoType.CHANNEL;
|
return InfoType.CHANNEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
return channelName;
|
return channelName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLink() {
|
public String getLink() {
|
||||||
return webPageUrl;
|
return webPageUrl;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,9 @@
|
||||||
package org.schabi.newpipe.extractor.channel;
|
package org.schabi.newpipe.extractor.channel;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItemCollector;
|
import org.schabi.newpipe.extractor.InfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
|
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.02.17.
|
* Created by Christian Schabesberger on 12.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -47,7 +43,7 @@ public class ChannelInfoItemCollector extends InfoItemCollector {
|
||||||
addError(e);
|
addError(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
resultItem.videoAmount = extractor.getVideoAmount();
|
resultItem.viewCount = extractor.getViewCount();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
addError(e);
|
addError(e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.channel;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.02.17.
|
* Created by Christian Schabesberger on 12.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -28,5 +28,5 @@ public interface ChannelInfoItemExtractor {
|
||||||
String getWebPageUrl() throws ParsingException;
|
String getWebPageUrl() throws ParsingException;
|
||||||
String getDescription() throws ParsingException;
|
String getDescription() throws ParsingException;
|
||||||
long getSubscriberCount() throws ParsingException;
|
long getSubscriberCount() throws ParsingException;
|
||||||
int getVideoAmount() throws ParsingException;
|
long getViewCount() throws ParsingException;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.exceptions;
|
package org.schabi.newpipe.extractor.exceptions;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 30.01.16.
|
* Created by Christian Schabesberger on 30.01.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -24,9 +24,11 @@ public class ExtractionException extends Exception {
|
||||||
public ExtractionException(String message) {
|
public ExtractionException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ExtractionException(Throwable cause) {
|
public ExtractionException(Throwable cause) {
|
||||||
super(cause);
|
super(cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ExtractionException(String message, Throwable cause) {
|
public ExtractionException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.exceptions;
|
package org.schabi.newpipe.extractor.exceptions;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.09.16.
|
* Created by Christian Schabesberger on 12.09.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -24,6 +24,7 @@ public class FoundAdException extends ParsingException {
|
||||||
public FoundAdException(String message) {
|
public FoundAdException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public FoundAdException(String message, Throwable cause) {
|
public FoundAdException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.exceptions;
|
package org.schabi.newpipe.extractor.exceptions;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 31.01.16.
|
* Created by Christian Schabesberger on 31.01.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -25,6 +25,7 @@ public class ParsingException extends ExtractionException {
|
||||||
public ParsingException(String message) {
|
public ParsingException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ParsingException(String message, Throwable cause) {
|
public ParsingException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.exceptions;
|
package org.schabi.newpipe.extractor.exceptions;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by beneth <bmauduit@beneth.fr> on 07.12.16.
|
* Created by beneth <bmauduit@beneth.fr> on 07.12.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
package org.schabi.newpipe.extractor.playlist;
|
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public abstract class PlayListExtractor {
|
|
||||||
|
|
||||||
private int serviceId;
|
|
||||||
private String url;
|
|
||||||
private UrlIdHandler urlIdHandler;
|
|
||||||
private StreamInfoItemCollector previewInfoCollector;
|
|
||||||
private int page = -1;
|
|
||||||
|
|
||||||
public PlayListExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
|
|
||||||
throws ExtractionException, IOException {
|
|
||||||
this.url = url;
|
|
||||||
this.page = page;
|
|
||||||
this.serviceId = serviceId;
|
|
||||||
this.urlIdHandler = urlIdHandler;
|
|
||||||
previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUrl() { return url; }
|
|
||||||
public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
|
|
||||||
public StreamInfoItemCollector getStreamPreviewInfoCollector() {
|
|
||||||
return previewInfoCollector;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract String getName() throws ParsingException;
|
|
||||||
public abstract String getAvatarUrl() throws ParsingException;
|
|
||||||
public abstract String getBannerUrl() throws ParsingException;
|
|
||||||
public abstract StreamInfoItemCollector getStreams() throws ParsingException;
|
|
||||||
public abstract boolean hasNextPage() throws ParsingException;
|
|
||||||
public int getServiceId() {
|
|
||||||
return serviceId;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,51 +0,0 @@
|
||||||
package org.schabi.newpipe.extractor.playlist;
|
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
public class PlayListInfo {
|
|
||||||
|
|
||||||
public void addException(Exception e) {
|
|
||||||
errors.add(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PlayListInfo getInfo(PlayListExtractor extractor) throws ParsingException {
|
|
||||||
PlayListInfo info = new PlayListInfo();
|
|
||||||
|
|
||||||
info.playList_name = extractor.getName();
|
|
||||||
info.hasNextPage = extractor.hasNextPage();
|
|
||||||
|
|
||||||
try {
|
|
||||||
info.avatar_url = extractor.getAvatarUrl();
|
|
||||||
} catch (Exception e) {
|
|
||||||
info.errors.add(e);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
info.banner_url = extractor.getBannerUrl();
|
|
||||||
} catch (Exception e) {
|
|
||||||
info.errors.add(e);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
StreamInfoItemCollector c = extractor.getStreams();
|
|
||||||
info.related_streams = c.getItemList();
|
|
||||||
info.errors.addAll(c.getErrors());
|
|
||||||
} catch(Exception e) {
|
|
||||||
info.errors.add(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int service_id = -1;
|
|
||||||
public String playList_name = "";
|
|
||||||
public String avatar_url = "";
|
|
||||||
public String banner_url = "";
|
|
||||||
public List<InfoItem> related_streams = null;
|
|
||||||
public boolean hasNextPage = false;
|
|
||||||
|
|
||||||
public List<Throwable> errors = new Vector<>();
|
|
||||||
}
|
|
29
playlist/PlaylistExtractor.java
Normal file
29
playlist/PlaylistExtractor.java
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
package org.schabi.newpipe.extractor.playlist;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Extractor;
|
||||||
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public abstract class PlaylistExtractor extends Extractor {
|
||||||
|
|
||||||
|
public PlaylistExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws ExtractionException, IOException {
|
||||||
|
super(urlIdHandler, serviceId, url);
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract String getPlaylistId() throws ParsingException;
|
||||||
|
public abstract String getPlaylistName() throws ParsingException;
|
||||||
|
public abstract String getAvatarUrl() throws ParsingException;
|
||||||
|
public abstract String getBannerUrl() throws ParsingException;
|
||||||
|
public abstract String getUploaderUrl() throws ParsingException;
|
||||||
|
public abstract String getUploaderName() throws ParsingException;
|
||||||
|
public abstract String getUploaderAvatarUrl() throws ParsingException;
|
||||||
|
public abstract StreamInfoItemCollector getStreams() throws ParsingException;
|
||||||
|
public abstract long getStreamsCount() throws ParsingException;
|
||||||
|
public abstract boolean hasMoreStreams();
|
||||||
|
public abstract StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException;
|
||||||
|
|
||||||
|
}
|
74
playlist/PlaylistInfo.java
Normal file
74
playlist/PlaylistInfo.java
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
package org.schabi.newpipe.extractor.playlist;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Info;
|
||||||
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PlaylistInfo extends Info {
|
||||||
|
|
||||||
|
public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingException {
|
||||||
|
PlaylistInfo info = new PlaylistInfo();
|
||||||
|
|
||||||
|
info.service_id = extractor.getServiceId();
|
||||||
|
info.url = extractor.getUrl();
|
||||||
|
info.name = extractor.getPlaylistName();
|
||||||
|
info.hasMoreStreams = extractor.hasMoreStreams();
|
||||||
|
|
||||||
|
try {
|
||||||
|
info.id = extractor.getPlaylistId();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.streams_count = extractor.getStreamsCount();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.avatar_url = extractor.getAvatarUrl();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.uploader_url = extractor.getUploaderUrl();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.uploader_name = extractor.getUploaderName();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.uploader_avatar_url = extractor.getUploaderAvatarUrl();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
info.banner_url = extractor.getBannerUrl();
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
StreamInfoItemCollector c = extractor.getStreams();
|
||||||
|
info.related_streams = c.getItemList();
|
||||||
|
info.errors.addAll(c.getErrors());
|
||||||
|
} catch (Exception e) {
|
||||||
|
info.errors.add(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String avatar_url = "";
|
||||||
|
public String banner_url = "";
|
||||||
|
public String uploader_url = "";
|
||||||
|
public String uploader_name = "";
|
||||||
|
public String uploader_avatar_url = "";
|
||||||
|
public long streams_count = 0;
|
||||||
|
public List<InfoItem> related_streams = null;
|
||||||
|
public boolean hasMoreStreams = false;
|
||||||
|
}
|
|
@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.playlist;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
|
|
||||||
public class PlayListInfoItem implements InfoItem {
|
public class PlaylistInfoItem implements InfoItem {
|
||||||
|
|
||||||
public int serviceId = -1;
|
public int serviceId = -1;
|
||||||
public String name = "";
|
public String name = "";
|
||||||
|
@ -12,9 +12,11 @@ public class PlayListInfoItem implements InfoItem {
|
||||||
public InfoType infoType() {
|
public InfoType infoType() {
|
||||||
return InfoType.PLAYLIST;
|
return InfoType.PLAYLIST;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLink() {
|
public String getLink() {
|
||||||
return webPageUrl;
|
return webPageUrl;
|
||||||
}
|
}
|
|
@ -1,18 +1,17 @@
|
||||||
package org.schabi.newpipe.extractor.playlist;
|
package org.schabi.newpipe.extractor.playlist;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItemCollector;
|
import org.schabi.newpipe.extractor.InfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
public class PlayListInfoItemCollector extends InfoItemCollector {
|
public class PlaylistInfoItemCollector extends InfoItemCollector {
|
||||||
public PlayListInfoItemCollector(int serviceId) {
|
public PlaylistInfoItemCollector(int serviceId) {
|
||||||
super(serviceId);
|
super(serviceId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayListInfoItem extract(PlayListInfoItemExtractor extractor) throws ParsingException {
|
public PlaylistInfoItem extract(PlaylistInfoItemExtractor extractor) throws ParsingException {
|
||||||
final PlayListInfoItem resultItem = new PlayListInfoItem();
|
final PlaylistInfoItem resultItem = new PlaylistInfoItem();
|
||||||
|
|
||||||
resultItem.name = extractor.getPlayListName();
|
resultItem.name = extractor.getPlaylistName();
|
||||||
resultItem.serviceId = getServiceId();
|
resultItem.serviceId = getServiceId();
|
||||||
resultItem.webPageUrl = extractor.getWebPageUrl();
|
resultItem.webPageUrl = extractor.getWebPageUrl();
|
||||||
try {
|
try {
|
||||||
|
@ -23,7 +22,7 @@ public class PlayListInfoItemCollector extends InfoItemCollector {
|
||||||
return resultItem;
|
return resultItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void commit(PlayListInfoItemExtractor extractor) throws ParsingException {
|
public void commit(PlaylistInfoItemExtractor extractor) throws ParsingException {
|
||||||
try {
|
try {
|
||||||
addItem(extract(extractor));
|
addItem(extract(extractor));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
|
@ -2,8 +2,8 @@ package org.schabi.newpipe.extractor.playlist;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
public interface PlayListInfoItemExtractor {
|
public interface PlaylistInfoItemExtractor {
|
||||||
String getThumbnailUrl() throws ParsingException;
|
String getThumbnailUrl() throws ParsingException;
|
||||||
String getPlayListName() throws ParsingException;
|
String getPlaylistName() throws ParsingException;
|
||||||
String getWebPageUrl() throws ParsingException;
|
String getWebPageUrl() throws ParsingException;
|
||||||
}
|
}
|
|
@ -6,11 +6,10 @@ import org.schabi.newpipe.extractor.channel.ChannelInfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.02.17.
|
* Created by Christian Schabesberger on 12.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -60,7 +59,7 @@ public class InfoItemSearchCollector extends InfoItemCollector {
|
||||||
public void commit(StreamInfoItemExtractor extractor) {
|
public void commit(StreamInfoItemExtractor extractor) {
|
||||||
try {
|
try {
|
||||||
result.resultList.add(streamCollector.extract(extractor));
|
result.resultList.add(streamCollector.extract(extractor));
|
||||||
} catch(FoundAdException ae) {
|
} catch (FoundAdException ae) {
|
||||||
System.err.println("Found add");
|
System.err.println("Found add");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
addError(e);
|
addError(e);
|
||||||
|
@ -70,7 +69,7 @@ public class InfoItemSearchCollector extends InfoItemCollector {
|
||||||
public void commit(ChannelInfoItemExtractor extractor) {
|
public void commit(ChannelInfoItemExtractor extractor) {
|
||||||
try {
|
try {
|
||||||
result.resultList.add(channelCollector.extract(extractor));
|
result.resultList.add(channelCollector.extract(extractor));
|
||||||
} catch(FoundAdException ae) {
|
} catch (FoundAdException ae) {
|
||||||
System.err.println("Found add");
|
System.err.println("Found add");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
addError(e);
|
addError(e);
|
||||||
|
|
|
@ -2,12 +2,11 @@ package org.schabi.newpipe.extractor.search;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 10.08.15.
|
* Created by Christian Schabesberger on 10.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -37,15 +36,17 @@ public abstract class SearchEngine {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private InfoItemSearchCollector collector;
|
private InfoItemSearchCollector collector;
|
||||||
|
|
||||||
public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
|
public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
|
||||||
collector = new InfoItemSearchCollector(urlIdHandler, serviceId);
|
collector = new InfoItemSearchCollector(urlIdHandler, serviceId);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected InfoItemSearchCollector getInfoItemSearchCollector() {
|
protected InfoItemSearchCollector getInfoItemSearchCollector() {
|
||||||
return collector;
|
return collector;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Result search(String query, int page);
|
//Result search(String query, int page);
|
||||||
public abstract InfoItemSearchCollector search(
|
public abstract InfoItemSearchCollector search(
|
||||||
String query, int page, String contentCountry, EnumSet<Filter> filter)
|
String query, int page, String contentCountry, EnumSet<Filter> filter)
|
||||||
|
|
|
@ -2,14 +2,13 @@ package org.schabi.newpipe.extractor.search;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 29.02.16.
|
* Created by Christian Schabesberger on 29.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -37,9 +36,9 @@ public class SearchResult {
|
||||||
SearchResult result = engine
|
SearchResult result = engine
|
||||||
.search(query, page, languageCode, filter)
|
.search(query, page, languageCode, filter)
|
||||||
.getSearchResult();
|
.getSearchResult();
|
||||||
if(result.resultList.isEmpty()) {
|
if (result.resultList.isEmpty()) {
|
||||||
if(result.suggestion.isEmpty()) {
|
if (result.suggestion.isEmpty()) {
|
||||||
if(result.errors.isEmpty()) {
|
if (result.errors.isEmpty()) {
|
||||||
throw new ExtractionException("Empty result despite no error");
|
throw new ExtractionException("Empty result despite no error");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,27 +1,26 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import org.jsoup.Jsoup;
|
import org.jsoup.Jsoup;
|
||||||
import org.jsoup.nodes.Document;
|
import org.jsoup.nodes.Document;
|
||||||
import org.jsoup.nodes.Element;
|
import org.jsoup.nodes.Element;
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.Downloader;
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
import org.schabi.newpipe.extractor.stream.AbstractStreamInfo;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 25.07.16.
|
* Created by Christian Schabesberger on 25.07.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -41,79 +40,55 @@ import java.io.IOException;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@SuppressWarnings("WeakerAccess")
|
||||||
public class YoutubeChannelExtractor extends ChannelExtractor {
|
public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
|
private static final String CHANNEL_FEED_BASE = "https://www.youtube.com/feeds/videos.xml?channel_id=";
|
||||||
|
|
||||||
private static final String TAG = YoutubeChannelExtractor.class.toString();
|
private Document doc;
|
||||||
|
/**
|
||||||
|
* It's lazily initialized (when getNextStreams is called)
|
||||||
|
*/
|
||||||
|
private Document nextStreamsAjax;
|
||||||
|
private String nextStreamsUrl = "";
|
||||||
|
|
||||||
// private CSSOMParser cssParser = new CSSOMParser(new SACParserCSS3());
|
/*//////////////////////////////////////////////////////////////////////////
|
||||||
|
// Variables for cache purposes (not "select" the current document all over again)
|
||||||
|
//////////////////////////////////////////////////////////////////////////*/
|
||||||
|
private String channelId;
|
||||||
|
private String channelName;
|
||||||
|
private String avatarUrl;
|
||||||
|
private String bannerUrl;
|
||||||
|
private String feedUrl;
|
||||||
|
private long subscriberCount = -1;
|
||||||
|
|
||||||
private Document doc = null;
|
|
||||||
|
|
||||||
private boolean isAjaxPage = false;
|
public YoutubeChannelExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws ExtractionException, IOException {
|
||||||
private static String userUrl = "";
|
super(urlIdHandler, urlIdHandler.cleanUrl(url), serviceId);
|
||||||
private static String channelName = "";
|
fetchDocument();
|
||||||
private static String avatarUrl = "";
|
}
|
||||||
private static String bannerUrl = "";
|
|
||||||
private static String feedUrl = "";
|
|
||||||
private static long subscriberCount = -1;
|
|
||||||
// the fist page is html all other pages are ajax. Every new page can be requested by sending
|
|
||||||
// this request url.
|
|
||||||
private static String nextPageUrl = "";
|
|
||||||
|
|
||||||
public YoutubeChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
|
@Override
|
||||||
throws ExtractionException, IOException {
|
public String getChannelId() throws ParsingException {
|
||||||
super(urlIdHandler, url, page, serviceId);
|
try {
|
||||||
|
if (channelId == null) {
|
||||||
Downloader downloader = NewPipe.getDownloader();
|
channelId = getUrlIdHandler().getId(getUrl());
|
||||||
|
|
||||||
url = urlIdHandler.cleanUrl(url) ; //+ "/video?veiw=0&flow=list&sort=dd";
|
|
||||||
|
|
||||||
if(page == 0) {
|
|
||||||
if (isUserUrl(url)) {
|
|
||||||
userUrl = url;
|
|
||||||
} else {
|
|
||||||
// we first need to get the user url. Otherwise we can't find videos
|
|
||||||
String channelPageContent = downloader.download(url);
|
|
||||||
Document channelDoc = Jsoup.parse(channelPageContent, url);
|
|
||||||
userUrl = getUserUrl(channelDoc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
userUrl = userUrl + "/videos?veiw=0&flow=list&sort=dd&live_view=10000";
|
return channelId;
|
||||||
String pageContent = downloader.download(userUrl);
|
} catch (Exception e) {
|
||||||
doc = Jsoup.parse(pageContent, userUrl);
|
throw new ParsingException("Could not get channel id");
|
||||||
nextPageUrl = getNextPageUrl(doc);
|
|
||||||
isAjaxPage = false;
|
|
||||||
} else {
|
|
||||||
String ajaxDataRaw = downloader.download(nextPageUrl);
|
|
||||||
JSONObject ajaxData;
|
|
||||||
try {
|
|
||||||
ajaxData = new JSONObject(ajaxDataRaw);
|
|
||||||
String htmlDataRaw = ajaxData.getString("content_html");
|
|
||||||
doc = Jsoup.parse(htmlDataRaw, nextPageUrl);
|
|
||||||
|
|
||||||
String nextPageHtmlDataRaw = ajaxData.getString("load_more_widget_html");
|
|
||||||
if(!nextPageHtmlDataRaw.isEmpty()) {
|
|
||||||
Document nextPageData = Jsoup.parse(nextPageHtmlDataRaw, nextPageUrl);
|
|
||||||
nextPageUrl = getNextPageUrl(nextPageData);
|
|
||||||
} else {
|
|
||||||
nextPageUrl = "";
|
|
||||||
}
|
|
||||||
} catch (JSONException e) {
|
|
||||||
throw new ParsingException("Could not parse json data for next page", e);
|
|
||||||
}
|
|
||||||
isAjaxPage = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getChannelName() throws ParsingException {
|
public String getChannelName() throws ParsingException {
|
||||||
try {
|
try {
|
||||||
if(!isAjaxPage) {
|
if (channelName == null) {
|
||||||
channelName = doc.select("span[class=\"qualified-channel-title-text\"]").first()
|
channelName = doc.select("span[class=\"qualified-channel-title-text\"]").first().select("a").first().text();
|
||||||
.select("a").first().text();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return channelName;
|
return channelName;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get channel name");
|
throw new ParsingException("Could not get channel name");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,12 +96,12 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
@Override
|
@Override
|
||||||
public String getAvatarUrl() throws ParsingException {
|
public String getAvatarUrl() throws ParsingException {
|
||||||
try {
|
try {
|
||||||
if(!isAjaxPage) {
|
if (avatarUrl == null) {
|
||||||
avatarUrl = doc.select("img[class=\"channel-header-profile-image\"]")
|
avatarUrl = doc.select("img[class=\"channel-header-profile-image\"]").first().attr("abs:src");
|
||||||
.first().attr("abs:src");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return avatarUrl;
|
return avatarUrl;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get avatar", e);
|
throw new ParsingException("Could not get avatar", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -134,19 +109,16 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
@Override
|
@Override
|
||||||
public String getBannerUrl() throws ParsingException {
|
public String getBannerUrl() throws ParsingException {
|
||||||
try {
|
try {
|
||||||
if(!isAjaxPage) {
|
if (bannerUrl == null) {
|
||||||
Element el = doc.select("div[id=\"gh-banner\"]").first().select("style").first();
|
Element el = doc.select("div[id=\"gh-banner\"]").first().select("style").first();
|
||||||
String cssContent = el.html();
|
String cssContent = el.html();
|
||||||
String url = "https:" + Parser.matchGroup1("url\\(([^)]+)\\)", cssContent);
|
String url = "https:" + Parser.matchGroup1("url\\(([^)]+)\\)", cssContent);
|
||||||
|
|
||||||
if (url.contains("s.ytimg.com") || url.contains("default_banner")) {
|
bannerUrl = url.contains("s.ytimg.com") || url.contains("default_banner") ? null : url;
|
||||||
bannerUrl = null;
|
|
||||||
} else {
|
|
||||||
bannerUrl = url;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return bannerUrl;
|
return bannerUrl;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get Banner", e);
|
throw new ParsingException("Could not get Banner", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -154,14 +126,105 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
@Override
|
@Override
|
||||||
public StreamInfoItemCollector getStreams() throws ParsingException {
|
public StreamInfoItemCollector getStreams() throws ParsingException {
|
||||||
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
||||||
Element ul;
|
Element ul = doc.select("ul[id=\"browse-items-primary\"]").first();
|
||||||
if(isAjaxPage) {
|
collectStreamsFrom(collector, ul);
|
||||||
ul = doc.select("body").first();
|
return collector;
|
||||||
} else {
|
}
|
||||||
ul = doc.select("ul[id=\"browse-items-primary\"]").first();
|
|
||||||
|
@Override
|
||||||
|
public long getSubscriberCount() throws ParsingException {
|
||||||
|
|
||||||
|
if (subscriberCount == -1) {
|
||||||
|
Element el = doc.select("span[class*=\"yt-subscription-button-subscriber-count\"]").first();
|
||||||
|
if (el != null) {
|
||||||
|
subscriberCount = Long.parseLong(el.text().replaceAll("\\D+", ""));
|
||||||
|
} else {
|
||||||
|
throw new ParsingException("Could not get subscriber count");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(final Element li : ul.children()) {
|
return subscriberCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getFeedUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (feedUrl == null) {
|
||||||
|
String channelId = doc.getElementsByClass("yt-uix-subscription-button").first().attr("data-channel-external-id");
|
||||||
|
feedUrl = channelId == null ? "" : CHANNEL_FEED_BASE + channelId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return feedUrl;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get feed url", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasMoreStreams() {
|
||||||
|
return nextStreamsUrl != null && !nextStreamsUrl.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException {
|
||||||
|
if (!hasMoreStreams()) throw new ExtractionException("Channel doesn't have more streams");
|
||||||
|
|
||||||
|
StreamInfoItemCollector collector = new StreamInfoItemCollector(getUrlIdHandler(), getServiceId());
|
||||||
|
setupNextStreamsAjax(NewPipe.getDownloader());
|
||||||
|
collectStreamsFrom(collector, nextStreamsAjax.select("body").first());
|
||||||
|
|
||||||
|
return collector;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setupNextStreamsAjax(Downloader downloader) throws IOException, ReCaptchaException, ParsingException {
|
||||||
|
String ajaxDataRaw = downloader.download(nextStreamsUrl);
|
||||||
|
try {
|
||||||
|
JSONObject ajaxData = new JSONObject(ajaxDataRaw);
|
||||||
|
|
||||||
|
String htmlDataRaw = ajaxData.getString("content_html");
|
||||||
|
nextStreamsAjax = Jsoup.parse(htmlDataRaw, nextStreamsUrl);
|
||||||
|
|
||||||
|
String nextStreamsHtmlDataRaw = ajaxData.getString("load_more_widget_html");
|
||||||
|
if (!nextStreamsHtmlDataRaw.isEmpty()) {
|
||||||
|
Document nextStreamsData = Jsoup.parse(nextStreamsHtmlDataRaw, nextStreamsUrl);
|
||||||
|
nextStreamsUrl = getNextStreamsUrl(nextStreamsData);
|
||||||
|
} else {
|
||||||
|
nextStreamsUrl = "";
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
throw new ParsingException("Could not parse json data for next streams", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getNextStreamsUrl(Document d) throws ParsingException {
|
||||||
|
try {
|
||||||
|
Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
|
||||||
|
if (button != null) {
|
||||||
|
return button.attr("abs:data-uix-load-more-href");
|
||||||
|
} else {
|
||||||
|
// Sometimes channels are simply so small, they don't have a more streams/videos
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("could not get next streams' url", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void fetchDocument() throws IOException, ReCaptchaException, ParsingException {
|
||||||
|
Downloader downloader = NewPipe.getDownloader();
|
||||||
|
|
||||||
|
String userUrl = getUrl() + "/videos?view=0&flow=list&sort=dd&live_view=10000";
|
||||||
|
String pageContent = downloader.download(userUrl);
|
||||||
|
doc = Jsoup.parse(pageContent, userUrl);
|
||||||
|
|
||||||
|
nextStreamsUrl = getNextStreamsUrl(doc);
|
||||||
|
nextStreamsAjax = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void collectStreamsFrom(StreamInfoItemCollector collector, Element element) throws ParsingException {
|
||||||
|
collector.getItemList().clear();
|
||||||
|
|
||||||
|
for (final Element li : element.children()) {
|
||||||
if (li.select("div[class=\"feed-item-dismissable\"]").first() != null) {
|
if (li.select("div[class=\"feed-item-dismissable\"]").first() != null) {
|
||||||
collector.commit(new StreamInfoItemExtractor() {
|
collector.commit(new StreamInfoItemExtractor() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -201,8 +264,8 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
try {
|
try {
|
||||||
return YoutubeParsingHelper.parseDurationString(
|
return YoutubeParsingHelper.parseDurationString(
|
||||||
li.select("span[class=\"video-time\"]").first().text());
|
li.select("span[class=\"video-time\"]").first().text());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
if(isLiveStream(li)) {
|
if (isLiveStream(li)) {
|
||||||
// -1 for no duration
|
// -1 for no duration
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -221,13 +284,13 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
try {
|
try {
|
||||||
Element meta = li.select("div[class=\"yt-lockup-meta\"]").first();
|
Element meta = li.select("div[class=\"yt-lockup-meta\"]").first();
|
||||||
Element li = meta.select("li").first();
|
Element li = meta.select("li").first();
|
||||||
if (li == null && meta != null) {
|
if (li == null) {
|
||||||
//this means we have a youtube red video
|
//this means we have a youtube red video
|
||||||
return "";
|
return "";
|
||||||
}else {
|
} else {
|
||||||
return li.text();
|
return li.text();
|
||||||
}
|
}
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get upload date", e);
|
throw new ParsingException("Could not get upload date", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -244,16 +307,13 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
output = Parser.matchGroup1("([0-9,\\. ]*)", input)
|
output = input.replaceAll("\\D+", "");
|
||||||
.replace(" ", "")
|
|
||||||
.replace(".", "")
|
|
||||||
.replace(",", "");
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return Long.parseLong(output);
|
return Long.parseLong(output);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
// if this happens the video probably has no views
|
// if this happens the video probably has no views
|
||||||
if(!input.isEmpty()) {
|
if (!input.isEmpty()) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
throw new ParsingException("Could not handle input: " + input, e);
|
throw new ParsingException("Could not handle input: " + input, e);
|
||||||
|
@ -283,10 +343,10 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
private boolean isLiveStream(Element item) {
|
private boolean isLiveStream(Element item) {
|
||||||
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
||||||
|
|
||||||
if(bla == null) {
|
if (bla == null) {
|
||||||
// sometimes livestreams dont have badges but sill are live streams
|
// sometimes livestreams dont have badges but sill are live streams
|
||||||
// if video time is not available we most likly have an offline livestream
|
// if video time is not available we most likly have an offline livestream
|
||||||
if(item.select("span[class*=\"video-time\"]").first() == null) {
|
if (item.select("span[class*=\"video-time\"]").first() == null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -295,63 +355,5 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return collector;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getSubscriberCount() throws ParsingException {
|
|
||||||
Element el = doc.select("span[class*=\"yt-subscription-button-subscriber-count\"]")
|
|
||||||
.first();
|
|
||||||
if(el != null) {
|
|
||||||
subscriberCount = Long.parseLong(el.text().replaceAll("\\D+",""));
|
|
||||||
} else if(el == null && subscriberCount == -1) {
|
|
||||||
throw new ParsingException("Could not get subscriber count");
|
|
||||||
}
|
|
||||||
return subscriberCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getFeedUrl() throws ParsingException {
|
|
||||||
try {
|
|
||||||
if(userUrl.contains("channel")) {
|
|
||||||
//channels don't have feeds in youtube, only user can provide such
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
if(!isAjaxPage) {
|
|
||||||
feedUrl = doc.select("link[title=\"RSS\"]").first().attr("abs:href");
|
|
||||||
}
|
|
||||||
return feedUrl;
|
|
||||||
} catch(Exception e) {
|
|
||||||
throw new ParsingException("Could not get feed url", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasNextPage() throws ParsingException {
|
|
||||||
return !nextPageUrl.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getUserUrl(Document d) throws ParsingException {
|
|
||||||
return d.select("span[class=\"qualified-channel-title-text\"]").first()
|
|
||||||
.select("a").first().attr("abs:href");
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isUserUrl(String url) throws ParsingException {
|
|
||||||
return url.contains("/user/");
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getNextPageUrl(Document d) throws ParsingException {
|
|
||||||
try {
|
|
||||||
Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
|
|
||||||
if(button != null) {
|
|
||||||
return button.attr("abs:data-uix-load-more-href");
|
|
||||||
} else {
|
|
||||||
// sometimes channels are simply so small, they don't have a second/next4q page
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
|
||||||
throw new ParsingException("could not load next page url", e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
import org.jsoup.nodes.Element;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.jsoup.nodes.Element;
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 12.02.17.
|
* Created by Christian Schabesberger on 12.02.17.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -32,49 +31,55 @@ public class YoutubeChannelInfoItemExtractor implements ChannelInfoItemExtractor
|
||||||
this.el = el;
|
this.el = el;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String getThumbnailUrl() throws ParsingException {
|
public String getThumbnailUrl() throws ParsingException {
|
||||||
Element img = el.select("span[class*=\"yt-thumb-simple\"]").first()
|
Element img = el.select("span[class*=\"yt-thumb-simple\"]").first()
|
||||||
.select("img").first();
|
.select("img").first();
|
||||||
|
|
||||||
String url = img.attr("abs:src");
|
String url = img.attr("abs:src");
|
||||||
|
|
||||||
if(url.contains("gif")) {
|
if (url.contains("gif")) {
|
||||||
url = img.attr("abs:data-thumb");
|
url = img.attr("abs:data-thumb");
|
||||||
}
|
}
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String getChannelName() throws ParsingException {
|
public String getChannelName() throws ParsingException {
|
||||||
return el.select("a[class*=\"yt-uix-tile-link\"]").first()
|
return el.select("a[class*=\"yt-uix-tile-link\"]").first()
|
||||||
.text();
|
.text();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String getWebPageUrl() throws ParsingException {
|
public String getWebPageUrl() throws ParsingException {
|
||||||
return el.select("a[class*=\"yt-uix-tile-link\"]").first()
|
return el.select("a[class*=\"yt-uix-tile-link\"]").first()
|
||||||
.attr("abs:href");
|
.attr("abs:href");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public long getSubscriberCount() throws ParsingException {
|
public long getSubscriberCount() throws ParsingException {
|
||||||
Element subsEl = el.select("span[class*=\"yt-subscriber-count\"]").first();
|
Element subsEl = el.select("span[class*=\"yt-subscriber-count\"]").first();
|
||||||
if(subsEl == null) {
|
if (subsEl == null) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
return Integer.parseInt(subsEl.text().replaceAll("\\D+",""));
|
return Long.parseLong(subsEl.text().replaceAll("\\D+", ""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getVideoAmount() throws ParsingException {
|
@Override
|
||||||
|
public long getViewCount() throws ParsingException {
|
||||||
Element metaEl = el.select("ul[class*=\"yt-lockup-meta-info\"]").first();
|
Element metaEl = el.select("ul[class*=\"yt-lockup-meta-info\"]").first();
|
||||||
if(metaEl == null) {
|
if (metaEl == null) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
return Integer.parseInt(metaEl.text().replaceAll("\\D+",""));
|
return Long.parseLong(metaEl.text().replaceAll("\\D+", ""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String getDescription() throws ParsingException {
|
public String getDescription() throws ParsingException {
|
||||||
Element desEl = el.select("div[class*=\"yt-lockup-description\"]").first();
|
Element desEl = el.select("div[class*=\"yt-lockup-description\"]").first();
|
||||||
if(desEl == null) {
|
if (desEl == null) {
|
||||||
return "";
|
return "";
|
||||||
} else {
|
} else {
|
||||||
return desEl.text();
|
return desEl.text();
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 25.07.16.
|
* Created by Christian Schabesberger on 25.07.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -35,13 +35,13 @@ public class YoutubeChannelUrlIdHandler implements UrlIdHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String cleanUrl(String siteUrl) throws ParsingException {
|
public String cleanUrl(String siteUrl) throws ParsingException {
|
||||||
return getUrl(getId(siteUrl));
|
return getUrl(getId(siteUrl));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean acceptUrl(String videoUrl) {
|
public boolean acceptUrl(String videoUrl) {
|
||||||
return (videoUrl.contains("youtube") ||
|
return (videoUrl.contains("youtube") ||
|
||||||
videoUrl.contains("youtu.be")) &&
|
videoUrl.contains("youtu.be")) &&
|
||||||
( videoUrl.contains("/user/") ||
|
(videoUrl.contains("/user/") ||
|
||||||
videoUrl.contains("/channel/"));
|
videoUrl.contains("/channel/"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 02.03.16.
|
* Created by Christian Schabesberger on 02.03.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -36,7 +36,7 @@ public class YoutubeParsingHelper {
|
||||||
String minutes = "0";
|
String minutes = "0";
|
||||||
String seconds;
|
String seconds;
|
||||||
|
|
||||||
switch(splitInput.length) {
|
switch (splitInput.length) {
|
||||||
case 4:
|
case 4:
|
||||||
days = splitInput[0];
|
days = splitInput[0];
|
||||||
hours = splitInput[1];
|
hours = splitInput[1];
|
||||||
|
|
|
@ -1,223 +0,0 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
|
||||||
|
|
||||||
import org.json.JSONException;
|
|
||||||
import org.json.JSONObject;
|
|
||||||
import org.jsoup.Jsoup;
|
|
||||||
import org.jsoup.nodes.Document;
|
|
||||||
import org.jsoup.nodes.Element;
|
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.Downloader;
|
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
|
||||||
import org.schabi.newpipe.extractor.playlist.PlayListExtractor;
|
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class YoutubePlayListExtractor extends PlayListExtractor {
|
|
||||||
|
|
||||||
private String TAG = YoutubePlayListExtractor.class.toString();
|
|
||||||
|
|
||||||
private Document doc = null;
|
|
||||||
|
|
||||||
private boolean isAjaxPage = false;
|
|
||||||
private static String name = "";
|
|
||||||
private static String feedUrl = "";
|
|
||||||
private static String avatarUrl = "";
|
|
||||||
private static String bannerUrl = "";
|
|
||||||
private static String nextPageUrl = "";
|
|
||||||
|
|
||||||
public YoutubePlayListExtractor(UrlIdHandler urlIdHandler,
|
|
||||||
String url, int page, int serviceId) throws IOException, ExtractionException {
|
|
||||||
super(urlIdHandler, url, page, serviceId);
|
|
||||||
Downloader downloader = NewPipe.getDownloader();
|
|
||||||
url = urlIdHandler.cleanUrl(url);
|
|
||||||
if(page == 0) {
|
|
||||||
String channelPageContent = downloader.download(url);
|
|
||||||
doc = Jsoup.parse(channelPageContent, url);
|
|
||||||
nextPageUrl = getNextPageUrl(doc);
|
|
||||||
isAjaxPage = false;
|
|
||||||
} else {
|
|
||||||
String ajaxDataRaw = downloader.download(nextPageUrl);
|
|
||||||
JSONObject ajaxData;
|
|
||||||
try {
|
|
||||||
ajaxData = new JSONObject(ajaxDataRaw);
|
|
||||||
final String htmlDataRaw = "<table><tbody id=\"pl-load-more-destination\">" + ajaxData.getString("content_html") + "</tbody></table>";
|
|
||||||
doc = Jsoup.parse(htmlDataRaw, nextPageUrl);
|
|
||||||
final String nextPageHtmlDataRaw = ajaxData.getString("load_more_widget_html");
|
|
||||||
if(!nextPageHtmlDataRaw.isEmpty()) {
|
|
||||||
final Document nextPageData = Jsoup.parse(nextPageHtmlDataRaw, nextPageUrl);
|
|
||||||
nextPageUrl = getNextPageUrl(nextPageData);
|
|
||||||
} else {
|
|
||||||
nextPageUrl = "";
|
|
||||||
}
|
|
||||||
} catch (JSONException e) {
|
|
||||||
throw new ParsingException("Could not parse json data for next page", e);
|
|
||||||
}
|
|
||||||
isAjaxPage = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() throws ParsingException {
|
|
||||||
try {
|
|
||||||
if (!isAjaxPage) {
|
|
||||||
name = doc.select("span[class=\"qualified-channel-title-text\"]").first()
|
|
||||||
.select("a").first().text() + " - " +
|
|
||||||
doc.select("meta[name=title]").first().attr("content");
|
|
||||||
}
|
|
||||||
return name;
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ParsingException("Could not get playlist name");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getAvatarUrl() throws ParsingException {
|
|
||||||
try {
|
|
||||||
if(!isAjaxPage) {
|
|
||||||
avatarUrl = doc.select("div[id=gh-banner] img[class=channel-header-profile-image]").first().attr("src");
|
|
||||||
if(avatarUrl.startsWith("//")) {
|
|
||||||
avatarUrl = "https:" + avatarUrl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return avatarUrl;
|
|
||||||
} catch(Exception e) {
|
|
||||||
throw new ParsingException("Could not get playlist Avatar");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getBannerUrl() throws ParsingException {
|
|
||||||
try {
|
|
||||||
if(!isAjaxPage) {
|
|
||||||
Element el = doc.select("div[id=\"gh-banner\"] style").first();
|
|
||||||
String cssContent = el.html();
|
|
||||||
String url = "https:" + Parser.matchGroup1("url\\((.*)\\)", cssContent);
|
|
||||||
if (url.contains("s.ytimg.com")) {
|
|
||||||
bannerUrl = null;
|
|
||||||
} else {
|
|
||||||
bannerUrl = url.substring(0, url.indexOf(");"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bannerUrl;
|
|
||||||
} catch(Exception e) {
|
|
||||||
throw new ParsingException("Could not get playlist Banner");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public StreamInfoItemCollector getStreams() throws ParsingException {
|
|
||||||
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
|
||||||
Element tbody = doc.select("tbody[id=\"pl-load-more-destination\"]").first();
|
|
||||||
final YoutubeStreamUrlIdHandler youtubeStreamUrlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
|
|
||||||
for(final Element li : tbody.children()) {
|
|
||||||
collector.commit(new StreamInfoItemExtractor() {
|
|
||||||
@Override
|
|
||||||
public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
|
|
||||||
return AbstractStreamInfo.StreamType.VIDEO_STREAM;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getWebPageUrl() throws ParsingException {
|
|
||||||
try {
|
|
||||||
return youtubeStreamUrlIdHandler.getUrl(li.attr("data-video-id"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ParsingException("Could not get web page url for the video", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getTitle() throws ParsingException {
|
|
||||||
try {
|
|
||||||
return li.attr("data-title");
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ParsingException("Could not get title", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getDuration() throws ParsingException {
|
|
||||||
try {
|
|
||||||
return YoutubeParsingHelper.parseDurationString(
|
|
||||||
li.select("div[class=\"timestamp\"] span").first().text().trim());
|
|
||||||
} catch(Exception e) {
|
|
||||||
if(isLiveStream(li)) {
|
|
||||||
// -1 for no duration
|
|
||||||
return -1;
|
|
||||||
} else {
|
|
||||||
throw new ParsingException("Could not get Duration: " + getTitle(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUploader() throws ParsingException {
|
|
||||||
return li.select("div[class=pl-video-owner] a").text();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUploadDate() throws ParsingException {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getViewCount() throws ParsingException {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getThumbnailUrl() throws ParsingException {
|
|
||||||
try {
|
|
||||||
return "https://i.ytimg.com/vi/" + youtubeStreamUrlIdHandler.getId(getWebPageUrl()) + "/hqdefault.jpg";
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ParsingException("Could not get thumbnail url", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAd() throws ParsingException {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isLiveStream(Element item) {
|
|
||||||
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
|
||||||
|
|
||||||
if(bla == null) {
|
|
||||||
// sometimes livestreams dont have badges but sill are live streams
|
|
||||||
// if video time is not available we most likly have an offline livestream
|
|
||||||
if(item.select("span[class*=\"video-time\"]").first() == null) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bla != null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return collector;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasNextPage() throws ParsingException {
|
|
||||||
return nextPageUrl != null && !nextPageUrl.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getNextPageUrl(Document d) throws ParsingException {
|
|
||||||
try {
|
|
||||||
Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
|
|
||||||
if(button != null) {
|
|
||||||
return "https://www.youtube.com" + button.attr("data-uix-load-more-href");
|
|
||||||
} else {
|
|
||||||
// sometimes channels are simply so small, they don't have a second/next4q page
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
|
||||||
throw new ParsingException("could not load next page url", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
332
services/youtube/YoutubePlaylistExtractor.java
Normal file
332
services/youtube/YoutubePlaylistExtractor.java
Normal file
|
@ -0,0 +1,332 @@
|
||||||
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
import org.jsoup.Jsoup;
|
||||||
|
import org.jsoup.nodes.Document;
|
||||||
|
import org.jsoup.nodes.Element;
|
||||||
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
|
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
|
||||||
|
import org.schabi.newpipe.extractor.stream.AbstractStreamInfo;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
@SuppressWarnings("WeakerAccess")
|
||||||
|
public class YoutubePlaylistExtractor extends PlaylistExtractor {
|
||||||
|
|
||||||
|
private Document doc = null;
|
||||||
|
/**
|
||||||
|
* It's lazily initialized (when getNextStreams is called)
|
||||||
|
*/
|
||||||
|
private Document nextStreamsAjax = null;
|
||||||
|
private String nextStreamsUrl = "";
|
||||||
|
|
||||||
|
/*//////////////////////////////////////////////////////////////////////////
|
||||||
|
// Variables for cache purposes (not "select" the current document all over again)
|
||||||
|
//////////////////////////////////////////////////////////////////////////*/
|
||||||
|
private String playlistId;
|
||||||
|
private String playlistName;
|
||||||
|
private String avatarUrl;
|
||||||
|
private String bannerUrl;
|
||||||
|
|
||||||
|
private long streamsCount;
|
||||||
|
|
||||||
|
private String uploaderUrl;
|
||||||
|
private String uploaderName;
|
||||||
|
private String uploaderAvatarUrl;
|
||||||
|
|
||||||
|
public YoutubePlaylistExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws IOException, ExtractionException {
|
||||||
|
super(urlIdHandler, urlIdHandler.cleanUrl(url), serviceId);
|
||||||
|
fetchDocument();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPlaylistId() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (playlistId == null) {
|
||||||
|
playlistId = getUrlIdHandler().getId(getUrl());
|
||||||
|
}
|
||||||
|
|
||||||
|
return playlistId;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist id");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPlaylistName() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (playlistName == null) {
|
||||||
|
playlistName = doc.select("div[id=pl-header] h1[class=pl-header-title]").first().text();
|
||||||
|
}
|
||||||
|
|
||||||
|
return playlistName;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getAvatarUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (avatarUrl == null) {
|
||||||
|
avatarUrl = doc.select("div[id=pl-header] div[class=pl-header-thumb] img").first().attr("abs:src");
|
||||||
|
}
|
||||||
|
|
||||||
|
return avatarUrl;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist avatar");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getBannerUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (bannerUrl == null) {
|
||||||
|
Element el = doc.select("div[id=\"gh-banner\"] style").first();
|
||||||
|
String cssContent = el.html();
|
||||||
|
String url = "https:" + Parser.matchGroup1("url\\((.*)\\)", cssContent);
|
||||||
|
if (url.contains("s.ytimg.com")) {
|
||||||
|
bannerUrl = null;
|
||||||
|
} else {
|
||||||
|
bannerUrl = url.substring(0, url.indexOf(");"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return bannerUrl;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist Banner");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUploaderUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (uploaderUrl == null) {
|
||||||
|
uploaderUrl = doc.select("ul[class=\"pl-header-details\"] li").first().select("a").first().attr("abs:href");
|
||||||
|
}
|
||||||
|
|
||||||
|
return uploaderUrl;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist uploader name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUploaderName() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (uploaderName == null) {
|
||||||
|
uploaderName = doc.select("span[class=\"qualified-channel-title-text\"]").first().select("a").first().text();
|
||||||
|
}
|
||||||
|
|
||||||
|
return uploaderName;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist uploader name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUploaderAvatarUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
if (uploaderAvatarUrl == null) {
|
||||||
|
uploaderAvatarUrl = doc.select("div[id=gh-banner] img[class=channel-header-profile-image]").first().attr("abs:src");
|
||||||
|
}
|
||||||
|
|
||||||
|
return uploaderAvatarUrl;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get playlist uploader avatar");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getStreamsCount() throws ParsingException {
|
||||||
|
if (streamsCount <= 0) {
|
||||||
|
String input;
|
||||||
|
|
||||||
|
try {
|
||||||
|
input = doc.select("ul[class=\"pl-header-details\"] li").get(1).text();
|
||||||
|
} catch (IndexOutOfBoundsException e) {
|
||||||
|
throw new ParsingException("Could not get video count from playlist", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
streamsCount = Long.parseLong(input.replaceAll("\\D+", ""));
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
// When there's no videos in a playlist, there's no number in the "innerHtml",
|
||||||
|
// all characters that is not a number is removed, so we try to parse a empty string
|
||||||
|
if (!input.isEmpty()) {
|
||||||
|
streamsCount = 0;
|
||||||
|
} else {
|
||||||
|
throw new ParsingException("Could not handle input: " + input, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return streamsCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StreamInfoItemCollector getStreams() throws ParsingException {
|
||||||
|
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
||||||
|
Element tbody = doc.select("tbody[id=\"pl-load-more-destination\"]").first();
|
||||||
|
collectStreamsFrom(collector, tbody);
|
||||||
|
return collector;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasMoreStreams() {
|
||||||
|
return nextStreamsUrl != null && !nextStreamsUrl.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException {
|
||||||
|
if (!hasMoreStreams()) throw new ExtractionException("Playlist doesn't have more streams");
|
||||||
|
|
||||||
|
StreamInfoItemCollector collector = new StreamInfoItemCollector(getUrlIdHandler(), getServiceId());
|
||||||
|
setupNextStreamsAjax(NewPipe.getDownloader());
|
||||||
|
collectStreamsFrom(collector, nextStreamsAjax.select("tbody[id=\"pl-load-more-destination\"]").first());
|
||||||
|
|
||||||
|
return collector;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setupNextStreamsAjax(Downloader downloader) throws IOException, ReCaptchaException, ParsingException {
|
||||||
|
String ajaxDataRaw = downloader.download(nextStreamsUrl);
|
||||||
|
try {
|
||||||
|
JSONObject ajaxData = new JSONObject(ajaxDataRaw);
|
||||||
|
|
||||||
|
String htmlDataRaw = "<table><tbody id=\"pl-load-more-destination\">" + ajaxData.getString("content_html") + "</tbody></table>";
|
||||||
|
nextStreamsAjax = Jsoup.parse(htmlDataRaw, nextStreamsUrl);
|
||||||
|
|
||||||
|
String nextStreamsHtmlDataRaw = ajaxData.getString("load_more_widget_html");
|
||||||
|
if (!nextStreamsHtmlDataRaw.isEmpty()) {
|
||||||
|
final Document nextStreamsData = Jsoup.parse(nextStreamsHtmlDataRaw, nextStreamsUrl);
|
||||||
|
nextStreamsUrl = getNextStreamsUrl(nextStreamsData);
|
||||||
|
} else {
|
||||||
|
nextStreamsUrl = "";
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
throw new ParsingException("Could not parse json data for next streams", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void fetchDocument() throws IOException, ReCaptchaException, ParsingException {
|
||||||
|
Downloader downloader = NewPipe.getDownloader();
|
||||||
|
|
||||||
|
String pageContent = downloader.download(getUrl());
|
||||||
|
doc = Jsoup.parse(pageContent, getUrl());
|
||||||
|
|
||||||
|
nextStreamsUrl = getNextStreamsUrl(doc);
|
||||||
|
nextStreamsAjax = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getNextStreamsUrl(Document d) throws ParsingException {
|
||||||
|
try {
|
||||||
|
Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
|
||||||
|
if (button != null) {
|
||||||
|
return button.attr("abs:data-uix-load-more-href");
|
||||||
|
} else {
|
||||||
|
// Sometimes playlists are simply so small, they don't have a more streams/videos
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("could not get next streams' url", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void collectStreamsFrom(StreamInfoItemCollector collector, Element element) throws ParsingException {
|
||||||
|
collector.getItemList().clear();
|
||||||
|
|
||||||
|
final YoutubeStreamUrlIdHandler youtubeStreamUrlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
|
||||||
|
for (final Element li : element.children()) {
|
||||||
|
collector.commit(new StreamInfoItemExtractor() {
|
||||||
|
@Override
|
||||||
|
public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
|
||||||
|
return AbstractStreamInfo.StreamType.VIDEO_STREAM;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getWebPageUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
return youtubeStreamUrlIdHandler.getUrl(li.attr("data-video-id"));
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get web page url for the video", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTitle() throws ParsingException {
|
||||||
|
try {
|
||||||
|
return li.attr("data-title");
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get title", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getDuration() throws ParsingException {
|
||||||
|
try {
|
||||||
|
return YoutubeParsingHelper.parseDurationString(
|
||||||
|
li.select("div[class=\"timestamp\"] span").first().text().trim());
|
||||||
|
} catch (Exception e) {
|
||||||
|
if (isLiveStream(li)) {
|
||||||
|
// -1 for no duration
|
||||||
|
return -1;
|
||||||
|
} else {
|
||||||
|
throw new ParsingException("Could not get Duration: " + getTitle(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUploader() throws ParsingException {
|
||||||
|
return li.select("div[class=pl-video-owner] a").text();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUploadDate() throws ParsingException {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getViewCount() throws ParsingException {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getThumbnailUrl() throws ParsingException {
|
||||||
|
try {
|
||||||
|
return "https://i.ytimg.com/vi/" + youtubeStreamUrlIdHandler.getId(getWebPageUrl()) + "/hqdefault.jpg";
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new ParsingException("Could not get thumbnail url", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAd() throws ParsingException {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isLiveStream(Element item) {
|
||||||
|
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
||||||
|
|
||||||
|
if (bla == null) {
|
||||||
|
// sometimes livestreams dont have badges but sill are live streams
|
||||||
|
// if video time is not available we most likly have an offline livestream
|
||||||
|
if (item.select("span[class*=\"video-time\"]").first() == null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bla != null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,11 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
public class YoutubePlayListUrlIdHandler implements UrlIdHandler {
|
public class YoutubePlaylistUrlIdHandler implements UrlIdHandler {
|
||||||
|
|
||||||
private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{34})";
|
private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{34})";
|
||||||
|
|
|
@ -10,12 +10,12 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.search.InfoItemSearchCollector;
|
import org.schabi.newpipe.extractor.search.InfoItemSearchCollector;
|
||||||
import org.schabi.newpipe.extractor.search.SearchEngine;
|
import org.schabi.newpipe.extractor.search.SearchEngine;
|
||||||
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.URLEncoder;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 09.08.15.
|
* Created by Christian Schabesberger on 09.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -58,20 +58,19 @@ public class YoutubeSearchEngine extends SearchEngine {
|
||||||
String url = "https://www.youtube.com/results"
|
String url = "https://www.youtube.com/results"
|
||||||
+ "?q=" + URLEncoder.encode(query, CHARSET_UTF_8)
|
+ "?q=" + URLEncoder.encode(query, CHARSET_UTF_8)
|
||||||
+ "&page=" + Integer.toString(page + 1);
|
+ "&page=" + Integer.toString(page + 1);
|
||||||
if(filter.contains(Filter.STREAM) && !filter.contains(Filter.CHANNEL)) {
|
if (filter.contains(Filter.STREAM) && !filter.contains(Filter.CHANNEL)) {
|
||||||
url += "&sp=EgIQAQ%253D%253D";
|
url += "&sp=EgIQAQ%253D%253D";
|
||||||
} else if(!filter.contains(Filter.STREAM) && filter.contains(Filter.CHANNEL)) {
|
} else if (!filter.contains(Filter.STREAM) && filter.contains(Filter.CHANNEL)) {
|
||||||
url += "&sp=EgIQAg%253D%253D";
|
url += "&sp=EgIQAg%253D%253D";
|
||||||
}
|
}
|
||||||
|
|
||||||
String site;
|
String site;
|
||||||
//String url = builder.build().toString();
|
//String url = builder.build().toString();
|
||||||
//if we've been passed a valid language code, append it to the URL
|
//if we've been passed a valid language code, append it to the URL
|
||||||
if(!languageCode.isEmpty()) {
|
if (!languageCode.isEmpty()) {
|
||||||
//assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
|
//assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
|
||||||
site = downloader.download(url, languageCode);
|
site = downloader.download(url, languageCode);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
site = downloader.download(url);
|
site = downloader.download(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,7 +94,7 @@ public class YoutubeSearchEngine extends SearchEngine {
|
||||||
// both types of spell correction item
|
// both types of spell correction item
|
||||||
if ((el = item.select("div[class*=\"spell-correction\"]").first()) != null) {
|
if ((el = item.select("div[class*=\"spell-correction\"]").first()) != null) {
|
||||||
collector.setSuggestion(el.select("a").first().text());
|
collector.setSuggestion(el.select("a").first().text());
|
||||||
if(list.children().size() == 1) {
|
if (list.children().size() == 1) {
|
||||||
throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
|
throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
|
||||||
}
|
}
|
||||||
// search message item
|
// search message item
|
||||||
|
@ -105,7 +104,7 @@ public class YoutubeSearchEngine extends SearchEngine {
|
||||||
// video item type
|
// video item type
|
||||||
} else if ((el = item.select("div[class*=\"yt-lockup-video\"]").first()) != null) {
|
} else if ((el = item.select("div[class*=\"yt-lockup-video\"]").first()) != null) {
|
||||||
collector.commit(new YoutubeStreamInfoItemExtractor(el));
|
collector.commit(new YoutubeStreamInfoItemExtractor(el));
|
||||||
} else if((el = item.select("div[class*=\"yt-lockup-channel\"]").first()) != null) {
|
} else if ((el = item.select("div[class*=\"yt-lockup-channel\"]").first()) != null) {
|
||||||
collector.commit(new YoutubeChannelInfoItemExtractor(el));
|
collector.commit(new YoutubeChannelInfoItemExtractor(el));
|
||||||
} else {
|
} else {
|
||||||
// noinspection ConstantConditions
|
// noinspection ConstantConditions
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.StreamingService;
|
import org.schabi.newpipe.extractor.StreamingService;
|
||||||
|
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.playlist.PlayListExtractor;
|
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
|
||||||
import org.schabi.newpipe.extractor.search.SearchEngine;
|
import org.schabi.newpipe.extractor.search.SearchEngine;
|
||||||
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
import org.schabi.newpipe.extractor.stream.StreamExtractor;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 23.08.15.
|
* Created by Christian Schabesberger on 23.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -44,17 +44,18 @@ public class YoutubeService extends StreamingService {
|
||||||
serviceInfo.name = "Youtube";
|
serviceInfo.name = "Youtube";
|
||||||
return serviceInfo;
|
return serviceInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StreamExtractor getExtractorInstance(String url)
|
public StreamExtractor getExtractorInstance(String url)
|
||||||
throws ExtractionException, IOException {
|
throws ExtractionException, IOException {
|
||||||
UrlIdHandler urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
|
UrlIdHandler urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
|
||||||
if(urlIdHandler.acceptUrl(url)) {
|
if (urlIdHandler.acceptUrl(url)) {
|
||||||
return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
|
return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
|
throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SearchEngine getSearchEngineInstance() {
|
public SearchEngine getSearchEngineInstance() {
|
||||||
return new YoutubeSearchEngine(getStreamUrlIdHandlerInstance(), getServiceId());
|
return new YoutubeSearchEngine(getStreamUrlIdHandlerInstance(), getServiceId());
|
||||||
|
@ -72,19 +73,18 @@ public class YoutubeService extends StreamingService {
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UrlIdHandler getPlayListUrlIdHandlerInstance() {
|
public UrlIdHandler getPlaylistUrlIdHandlerInstance() {
|
||||||
return new YoutubePlayListUrlIdHandler();
|
return new YoutubePlaylistUrlIdHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ChannelExtractor getChannelExtractorInstance(String url, int page)
|
public ChannelExtractor getChannelExtractorInstance(String url) throws ExtractionException, IOException {
|
||||||
throws ExtractionException, IOException {
|
return new YoutubeChannelExtractor(getChannelUrlIdHandlerInstance(), url, getServiceId());
|
||||||
return new YoutubeChannelExtractor(getChannelUrlIdHandlerInstance(), url, page, getServiceId());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayListExtractor getPlayListExtractorInstance(String url, int page)
|
@Override
|
||||||
throws ExtractionException, IOException {
|
public PlaylistExtractor getPlaylistExtractorInstance(String url) throws ExtractionException, IOException {
|
||||||
return new YoutubePlayListExtractor(getPlayListUrlIdHandlerInstance(), url, page, getServiceId());
|
return new YoutubePlaylistExtractor(getPlaylistUrlIdHandlerInstance(), url, getServiceId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -8,21 +8,21 @@ import org.jsoup.nodes.Element;
|
||||||
import org.mozilla.javascript.Context;
|
import org.mozilla.javascript.Context;
|
||||||
import org.mozilla.javascript.Function;
|
import org.mozilla.javascript.Function;
|
||||||
import org.mozilla.javascript.ScriptableObject;
|
import org.mozilla.javascript.ScriptableObject;
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.Downloader;
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
import org.schabi.newpipe.extractor.MediaFormat;
|
import org.schabi.newpipe.extractor.MediaFormat;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.AudioStream;
|
import org.schabi.newpipe.extractor.stream.AbstractStreamInfo;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
|
import org.schabi.newpipe.extractor.stream.AudioStream;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfo;
|
import org.schabi.newpipe.extractor.stream.StreamExtractor;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
|
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.stream_info.VideoStream;
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
|
||||||
|
import org.schabi.newpipe.extractor.stream.VideoStream;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -31,7 +31,7 @@ import java.util.Vector;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 06.08.15.
|
* Created by Christian Schabesberger on 06.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -129,6 +129,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
public int bandWidth = -1;
|
public int bandWidth = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List can be found here https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/youtube.py#L360
|
||||||
|
*/
|
||||||
private static final ItagItem[] itagList = {
|
private static final ItagItem[] itagList = {
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
// VIDEO ID ItagType Format Resolution FPS ///
|
// VIDEO ID ItagType Format Resolution FPS ///
|
||||||
|
@ -186,13 +189,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
new ItagItem(315, ItagType.VIDEO_ONLY, MediaFormat.WEBM, "2160p60" , 60)
|
new ItagItem(315, ItagType.VIDEO_ONLY, MediaFormat.WEBM, "2160p60" , 60)
|
||||||
};
|
};
|
||||||
|
|
||||||
/**These lists only contain itag formats that are supported by the common Android Video player.
|
|
||||||
However if you are looking for a list showing all itag formats, look at
|
|
||||||
https://github.com/rg3/youtube-dl/issues/1687 */
|
|
||||||
|
|
||||||
public static boolean itagIsSupported(int itag) {
|
public static boolean itagIsSupported(int itag) {
|
||||||
for(ItagItem item : itagList) {
|
for (ItagItem item : itagList) {
|
||||||
if(itag == item.id) {
|
if (itag == item.id) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -200,8 +199,8 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItagItem getItagItem(int itag) throws ParsingException {
|
public static ItagItem getItagItem(int itag) throws ParsingException {
|
||||||
for(ItagItem item : itagList) {
|
for (ItagItem item : itagList) {
|
||||||
if(itag == item.id) {
|
if (itag == item.id) {
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -215,7 +214,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
private Map<String, String> videoInfoPage;
|
private Map<String, String> videoInfoPage;
|
||||||
|
|
||||||
// static values
|
// static values
|
||||||
private static final String DECRYPTION_FUNC_NAME="decrypt";
|
private static final String DECRYPTION_FUNC_NAME = "decrypt";
|
||||||
|
|
||||||
// cached values
|
// cached values
|
||||||
private static volatile String decryptionCode = "";
|
private static volatile String decryptionCode = "";
|
||||||
|
@ -249,7 +248,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
isAgeRestricted = false;
|
isAgeRestricted = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(decryptionCode.isEmpty()) {
|
if (decryptionCode.isEmpty()) {
|
||||||
decryptionCode = loadDecryptionCode(playerUrl);
|
decryptionCode = loadDecryptionCode(playerUrl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -283,11 +282,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
playerArgs = playerConfig.getJSONObject("args");
|
playerArgs = playerConfig.getJSONObject("args");
|
||||||
|
|
||||||
// check if we have a live stream. We need to filter it, since its not yet supported.
|
// check if we have a live stream. We need to filter it, since its not yet supported.
|
||||||
if((playerArgs.has("ps") && playerArgs.get("ps").toString().equals("live"))
|
if ((playerArgs.has("ps") && playerArgs.get("ps").toString().equals("live"))
|
||||||
|| (playerArgs.get(URL_ENCODED_FMT_STREAM_MAP).toString().isEmpty())) {
|
|| (playerArgs.get(URL_ENCODED_FMT_STREAM_MAP).toString().isEmpty())) {
|
||||||
isLiveStream = true;
|
isLiveStream = true;
|
||||||
}
|
}
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
throw new ParsingException("Could not parse yt player config", e);
|
throw new ParsingException("Could not parse yt player config", e);
|
||||||
}
|
}
|
||||||
if (isLiveStream) {
|
if (isLiveStream) {
|
||||||
|
@ -352,7 +351,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
//json player args method
|
//json player args method
|
||||||
return playerArgs.getString("title");
|
return playerArgs.getString("title");
|
||||||
} catch(JSONException je) {//html <meta> method
|
} catch (JSONException je) {//html <meta> method
|
||||||
je.printStackTrace();
|
je.printStackTrace();
|
||||||
System.err.println("failed to load title from JSON args; trying to extract it from HTML");
|
System.err.println("failed to load title from JSON args; trying to extract it from HTML");
|
||||||
try { // fall through to fall-back
|
try { // fall through to fall-back
|
||||||
|
@ -380,11 +379,12 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
//json player args method
|
//json player args method
|
||||||
return playerArgs.getString("author");
|
return playerArgs.getString("author");
|
||||||
} catch(JSONException je) {
|
} catch (JSONException je) {
|
||||||
je.printStackTrace();
|
je.printStackTrace();
|
||||||
System.err.println(
|
System.err.println(
|
||||||
"failed to load uploader name from JSON args; trying to extract it from HTML");
|
"failed to load uploader name from JSON args; trying to extract it from HTML");
|
||||||
} try {//fall through to fallback HTML method
|
}
|
||||||
|
try {//fall through to fallback HTML method
|
||||||
return doc.select("div.yt-user-info").first().text();
|
return doc.select("div.yt-user-info").first().text();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("failed permanently to load uploader name.", e);
|
throw new ParsingException("failed permanently to load uploader name.", e);
|
||||||
|
@ -429,7 +429,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
// Try to get high resolution thumbnail if it fails use low res from the player instead
|
// Try to get high resolution thumbnail if it fails use low res from the player instead
|
||||||
try {
|
try {
|
||||||
return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
|
return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println("Could not find high res Thumbnail. Using low res instead");
|
System.err.println("Could not find high res Thumbnail. Using low res instead");
|
||||||
}
|
}
|
||||||
try { //fall through to fallback
|
try { //fall through to fallback
|
||||||
|
@ -458,14 +458,14 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
public String getDashMpdUrl() throws ParsingException {
|
public String getDashMpdUrl() throws ParsingException {
|
||||||
try {
|
try {
|
||||||
String dashManifestUrl = "";
|
String dashManifestUrl = "";
|
||||||
if(videoInfoPage != null && videoInfoPage.containsKey("dashmpd")) {
|
if (videoInfoPage != null && videoInfoPage.containsKey("dashmpd")) {
|
||||||
dashManifestUrl = videoInfoPage.get("dashmpd");
|
dashManifestUrl = videoInfoPage.get("dashmpd");
|
||||||
} else if (playerArgs.has("dashmpd")) {
|
} else if (playerArgs.has("dashmpd")) {
|
||||||
dashManifestUrl = playerArgs.getString("dashmpd");
|
dashManifestUrl = playerArgs.getString("dashmpd");
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
if(!dashManifestUrl.contains("/signature/")) {
|
if (!dashManifestUrl.contains("/signature/")) {
|
||||||
String encryptedSig = Parser.matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifestUrl);
|
String encryptedSig = Parser.matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifestUrl);
|
||||||
String decryptedSig;
|
String decryptedSig;
|
||||||
|
|
||||||
|
@ -483,23 +483,23 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
@Override
|
@Override
|
||||||
public List<AudioStream> getAudioStreams() throws ParsingException {
|
public List<AudioStream> getAudioStreams() throws ParsingException {
|
||||||
Vector<AudioStream> audioStreams = new Vector<>();
|
Vector<AudioStream> audioStreams = new Vector<>();
|
||||||
try{
|
try {
|
||||||
String encodedUrlMap;
|
String encodedUrlMap;
|
||||||
// playerArgs could be null if the video is age restricted
|
// playerArgs could be null if the video is age restricted
|
||||||
if (playerArgs == null) {
|
if (playerArgs == null) {
|
||||||
if(videoInfoPage.containsKey("adaptive_fmts")) {
|
if (videoInfoPage.containsKey("adaptive_fmts")) {
|
||||||
encodedUrlMap = videoInfoPage.get("adaptive_fmts");
|
encodedUrlMap = videoInfoPage.get("adaptive_fmts");
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if(playerArgs.has("adaptive_fmts")) {
|
if (playerArgs.has("adaptive_fmts")) {
|
||||||
encodedUrlMap = playerArgs.getString("adaptive_fmts");
|
encodedUrlMap = playerArgs.getString("adaptive_fmts");
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(String url_data_str : encodedUrlMap.split(",")) {
|
for (String url_data_str : encodedUrlMap.split(",")) {
|
||||||
// This loop iterates through multiple streams, therefor tags
|
// This loop iterates through multiple streams, therefor tags
|
||||||
// is related to one and the same stream at a time.
|
// is related to one and the same stream at a time.
|
||||||
Map<String, String> tags = Parser.compatParseMap(
|
Map<String, String> tags = Parser.compatParseMap(
|
||||||
|
@ -535,7 +535,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
public List<VideoStream> getVideoStreams() throws ParsingException {
|
public List<VideoStream> getVideoStreams() throws ParsingException {
|
||||||
Vector<VideoStream> videoStreams = new Vector<>();
|
Vector<VideoStream> videoStreams = new Vector<>();
|
||||||
|
|
||||||
try{
|
try {
|
||||||
String encodedUrlMap;
|
String encodedUrlMap;
|
||||||
// playerArgs could be null if the video is age restricted
|
// playerArgs could be null if the video is age restricted
|
||||||
if (playerArgs == null) {
|
if (playerArgs == null) {
|
||||||
|
@ -543,7 +543,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
} else {
|
} else {
|
||||||
encodedUrlMap = playerArgs.getString(URL_ENCODED_FMT_STREAM_MAP);
|
encodedUrlMap = playerArgs.getString(URL_ENCODED_FMT_STREAM_MAP);
|
||||||
}
|
}
|
||||||
for(String url_data_str : encodedUrlMap.split(",")) {
|
for (String url_data_str : encodedUrlMap.split(",")) {
|
||||||
try {
|
try {
|
||||||
// This loop iterates through multiple streams, therefor tags
|
// This loop iterates through multiple streams, therefor tags
|
||||||
// is related to one and the same stream at a time.
|
// is related to one and the same stream at a time.
|
||||||
|
@ -554,7 +554,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
|
|
||||||
if (itagIsSupported(itag)) {
|
if (itagIsSupported(itag)) {
|
||||||
ItagItem itagItem = getItagItem(itag);
|
ItagItem itagItem = getItagItem(itag);
|
||||||
if(itagItem.itagType == ItagType.VIDEO) {
|
if (itagItem.itagType == ItagType.VIDEO) {
|
||||||
String streamUrl = tags.get("url");
|
String streamUrl = tags.get("url");
|
||||||
// if video has a signature: decrypt it and add it to the url
|
// if video has a signature: decrypt it and add it to the url
|
||||||
if (tags.get("s") != null) {
|
if (tags.get("s") != null) {
|
||||||
|
@ -578,7 +578,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
throw new ParsingException("Failed to get video streams", e);
|
throw new ParsingException("Failed to get video streams", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(videoStreams.isEmpty()) {
|
if (videoStreams.isEmpty()) {
|
||||||
throw new ParsingException("Failed to get any video stream");
|
throw new ParsingException("Failed to get any video stream");
|
||||||
}
|
}
|
||||||
return videoStreams;
|
return videoStreams;
|
||||||
|
@ -640,8 +640,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
return videoOnlyStreams;
|
return videoOnlyStreams;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Attempts to parse (and return) the offset to start playing the video from.
|
/**
|
||||||
* @return the offset (in seconds), or 0 if no timestamp is found.*/
|
* Attempts to parse (and return) the offset to start playing the video from.
|
||||||
|
*
|
||||||
|
* @return the offset (in seconds), or 0 if no timestamp is found.
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int getTimeStamp() throws ParsingException {
|
public int getTimeStamp() throws ParsingException {
|
||||||
String timeStamp;
|
String timeStamp;
|
||||||
|
@ -655,7 +658,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!timeStamp.isEmpty()) {
|
if (!timeStamp.isEmpty()) {
|
||||||
try {
|
try {
|
||||||
String secondsString = "";
|
String secondsString = "";
|
||||||
String minutesString = "";
|
String minutesString = "";
|
||||||
|
@ -748,10 +751,10 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return Integer.parseInt(dislikesString.replaceAll(REGEX_INT, ""));
|
return Integer.parseInt(dislikesString.replaceAll(REGEX_INT, ""));
|
||||||
} catch(NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
throw new ParsingException(
|
throw new ParsingException(
|
||||||
"failed to parse dislikesString \"" + dislikesString + "\" as integers", nfe);
|
"failed to parse dislikesString \"" + dislikesString + "\" as integers", nfe);
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get dislike count", e);
|
throw new ParsingException("Could not get dislike count", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -761,7 +764,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
try {
|
try {
|
||||||
return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
|
return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
|
||||||
.select("li").first());
|
.select("li").first());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get next video", e);
|
throw new ParsingException("Could not get next video", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -771,7 +774,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
try {
|
try {
|
||||||
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
StreamInfoItemCollector collector = getStreamPreviewInfoCollector();
|
||||||
Element ul = doc.select("ul[id=\"watch-related\"]").first();
|
Element ul = doc.select("ul[id=\"watch-related\"]").first();
|
||||||
if(ul != null) {
|
if (ul != null) {
|
||||||
for (Element li : ul.children()) {
|
for (Element li : ul.children()) {
|
||||||
// first check if we have a playlist. If so leave them out
|
// first check if we have a playlist. If so leave them out
|
||||||
if (li.select("a[class*=\"content-link\"]").first() != null) {
|
if (li.select("a[class*=\"content-link\"]").first() != null) {
|
||||||
|
@ -780,7 +783,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return collector;
|
return collector;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get related videos", e);
|
throw new ParsingException("Could not get related videos", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -795,7 +798,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
try {
|
try {
|
||||||
return doc.select("div[class=\"yt-user-info\"]").first().children()
|
return doc.select("div[class=\"yt-user-info\"]").first().children()
|
||||||
.select("a").first().attr("abs:href");
|
.select("a").first().attr("abs:href");
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get channel link", e);
|
throw new ParsingException("Could not get channel link", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -806,9 +809,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
return StreamInfo.StreamType.VIDEO_STREAM;
|
return StreamInfo.StreamType.VIDEO_STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Provides information about links to other videos on the video page, such as related videos.
|
/**
|
||||||
|
* Provides information about links to other videos on the video page, such as related videos.
|
||||||
* This is encapsulated in a StreamInfoItem object,
|
* This is encapsulated in a StreamInfoItem object,
|
||||||
* which is a subset of the fields in a full StreamInfo.*/
|
* which is a subset of the fields in a full StreamInfo.
|
||||||
|
*/
|
||||||
private StreamInfoItemExtractor extractVideoPreviewInfo(final Element li) {
|
private StreamInfoItemExtractor extractVideoPreviewInfo(final Element li) {
|
||||||
return new StreamInfoItemExtractor() {
|
return new StreamInfoItemExtractor() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -896,7 +901,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Downloader downloader = NewPipe.getDownloader();
|
Downloader downloader = NewPipe.getDownloader();
|
||||||
if(!playerUrl.contains("https://youtube.com")) {
|
if (!playerUrl.contains("https://youtube.com")) {
|
||||||
//sometimes the https://youtube.com part does not get send with
|
//sometimes the https://youtube.com part does not get send with
|
||||||
//than we have to add it by hand
|
//than we have to add it by hand
|
||||||
playerUrl = "https://youtube.com" + playerUrl;
|
playerUrl = "https://youtube.com" + playerUrl;
|
||||||
|
@ -921,9 +926,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
|
|
||||||
callerFunc = callerFunc.replace("%%", decryptionFuncName);
|
callerFunc = callerFunc.replace("%%", decryptionFuncName);
|
||||||
decryptionCode = helperObject + decryptionFunc + callerFunc;
|
decryptionCode = helperObject + decryptionFunc + callerFunc;
|
||||||
} catch(IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
throw new DecryptException("Could not load decrypt function", ioe);
|
throw new DecryptException("Could not load decrypt function", ioe);
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new DecryptException("Could not parse decrypt function ", e);
|
throw new DecryptException("Could not parse decrypt function ", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -931,7 +936,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
|
|
||||||
private String decryptSignature(String encryptedSig, String decryptionCode)
|
private String decryptSignature(String encryptedSig, String decryptionCode)
|
||||||
throws DecryptException{
|
throws DecryptException {
|
||||||
Context context = Context.enter();
|
Context context = Context.enter();
|
||||||
context.setOptimizationLevel(-1);
|
context.setOptimizationLevel(-1);
|
||||||
Object result = null;
|
Object result = null;
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
package org.schabi.newpipe.extractor.services.youtube;
|
package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.jsoup.nodes.Element;
|
import org.jsoup.nodes.Element;
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
|
import org.schabi.newpipe.extractor.stream.AbstractStreamInfo;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
* YoutubeStreamInfoItemExtractor.java is part of NewPipe.
|
* YoutubeStreamInfoItemExtractor.java is part of NewPipe.
|
||||||
*
|
*
|
||||||
|
@ -60,8 +59,8 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
try {
|
try {
|
||||||
return YoutubeParsingHelper.parseDurationString(
|
return YoutubeParsingHelper.parseDurationString(
|
||||||
item.select("span[class=\"video-time\"]").first().text());
|
item.select("span[class=\"video-time\"]").first().text());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
if(isLiveStream(item)) {
|
if (isLiveStream(item)) {
|
||||||
// -1 for no duration
|
// -1 for no duration
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -85,12 +84,12 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
public String getUploadDate() throws ParsingException {
|
public String getUploadDate() throws ParsingException {
|
||||||
try {
|
try {
|
||||||
Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
|
Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
|
||||||
if(div == null) {
|
if (div == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return div.select("li").first().text();
|
return div.select("li").first().text();
|
||||||
}
|
}
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get upload date", e);
|
throw new ParsingException("Could not get upload date", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,14 +100,14 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
String input;
|
String input;
|
||||||
try {
|
try {
|
||||||
Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
|
Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
|
||||||
if(div == null) {
|
if (div == null) {
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
input = div.select("li").get(1)
|
input = div.select("li").get(1)
|
||||||
.text();
|
.text();
|
||||||
}
|
}
|
||||||
} catch (IndexOutOfBoundsException e) {
|
} catch (IndexOutOfBoundsException e) {
|
||||||
if(isLiveStream(item)) {
|
if (isLiveStream(item)) {
|
||||||
// -1 for no view count
|
// -1 for no view count
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -123,7 +122,7 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
return Long.parseLong(output);
|
return Long.parseLong(output);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
// if this happens the video probably has no views
|
// if this happens the video probably has no views
|
||||||
if(!input.isEmpty()) {
|
if (!input.isEmpty()) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
throw new ParsingException("Could not handle input: " + input, e);
|
throw new ParsingException("Could not handle input: " + input, e);
|
||||||
|
@ -152,7 +151,7 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AbstractStreamInfo.StreamType getStreamType() {
|
public AbstractStreamInfo.StreamType getStreamType() {
|
||||||
if(isLiveStream(item)) {
|
if (isLiveStream(item)) {
|
||||||
return AbstractStreamInfo.StreamType.LIVE_STREAM;
|
return AbstractStreamInfo.StreamType.LIVE_STREAM;
|
||||||
} else {
|
} else {
|
||||||
return AbstractStreamInfo.StreamType.VIDEO_STREAM;
|
return AbstractStreamInfo.StreamType.VIDEO_STREAM;
|
||||||
|
@ -167,10 +166,10 @@ public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
|
||||||
private boolean isLiveStream(Element item) {
|
private boolean isLiveStream(Element item) {
|
||||||
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
|
||||||
|
|
||||||
if(bla == null) {
|
if (bla == null) {
|
||||||
// sometimes livestreams dont have badges but sill are live streams
|
// sometimes livestreams dont have badges but sill are live streams
|
||||||
// if video time is not available we most likly have an offline livestream
|
// if video time is not available we most likly have an offline livestream
|
||||||
if(item.select("span[class*=\"video-time\"]").first() == null) {
|
if (item.select("span[class*=\"video-time\"]").first() == null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,11 +2,11 @@ package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.Downloader;
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.Parser;
|
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
|
import org.schabi.newpipe.extractor.utils.Parser;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
@ -14,7 +14,7 @@ import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 02.02.16.
|
* Created by Christian Schabesberger on 02.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -39,7 +39,8 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
private static final YoutubeStreamUrlIdHandler instance = new YoutubeStreamUrlIdHandler();
|
private static final YoutubeStreamUrlIdHandler instance = new YoutubeStreamUrlIdHandler();
|
||||||
private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{11})";
|
private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{11})";
|
||||||
|
|
||||||
private YoutubeStreamUrlIdHandler() {}
|
private YoutubeStreamUrlIdHandler() {
|
||||||
|
}
|
||||||
|
|
||||||
public static YoutubeStreamUrlIdHandler getInstance() {
|
public static YoutubeStreamUrlIdHandler getInstance() {
|
||||||
return instance;
|
return instance;
|
||||||
|
@ -52,13 +53,13 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId(String url) throws ParsingException, IllegalArgumentException {
|
public String getId(String url) throws ParsingException, IllegalArgumentException {
|
||||||
if(url.isEmpty()) {
|
if (url.isEmpty()) {
|
||||||
throw new IllegalArgumentException("The url parameter should not be empty");
|
throw new IllegalArgumentException("The url parameter should not be empty");
|
||||||
}
|
}
|
||||||
|
|
||||||
String id;
|
String id;
|
||||||
String lowercaseUrl = url.toLowerCase();
|
String lowercaseUrl = url.toLowerCase();
|
||||||
if(lowercaseUrl.contains("youtube")) {
|
if (lowercaseUrl.contains("youtube")) {
|
||||||
if (url.contains("attribution_link")) {
|
if (url.contains("attribution_link")) {
|
||||||
try {
|
try {
|
||||||
String escapedQuery = Parser.matchGroup1("u=(.[^&|$]*)", url);
|
String escapedQuery = Parser.matchGroup1("u=(.[^&|$]*)", url);
|
||||||
|
@ -67,31 +68,29 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
} catch (UnsupportedEncodingException uee) {
|
} catch (UnsupportedEncodingException uee) {
|
||||||
throw new ParsingException("Could not parse attribution_link", uee);
|
throw new ParsingException("Could not parse attribution_link", uee);
|
||||||
}
|
}
|
||||||
} else if(lowercaseUrl.contains("youtube.com/shared?ci=")) {
|
} else if (lowercaseUrl.contains("youtube.com/shared?ci=")) {
|
||||||
return getRealIdFromSharedLink(url);
|
return getRealIdFromSharedLink(url);
|
||||||
} else if (url.contains("vnd.youtube")) {
|
} else if (url.contains("vnd.youtube")) {
|
||||||
id = Parser.matchGroup1(ID_PATTERN, url);
|
id = Parser.matchGroup1(ID_PATTERN, url);
|
||||||
} else if (url.contains("embed")) {
|
} else if (url.contains("embed")) {
|
||||||
id = Parser.matchGroup1("embed/" + ID_PATTERN, url);
|
id = Parser.matchGroup1("embed/" + ID_PATTERN, url);
|
||||||
} else if(url.contains("googleads")) {
|
} else if (url.contains("googleads")) {
|
||||||
throw new FoundAdException("Error found add: " + url);
|
throw new FoundAdException("Error found add: " + url);
|
||||||
} else {
|
} else {
|
||||||
id = Parser.matchGroup1("[?&]v=" + ID_PATTERN, url);
|
id = Parser.matchGroup1("[?&]v=" + ID_PATTERN, url);
|
||||||
}
|
}
|
||||||
}
|
} else if (lowercaseUrl.contains("youtu.be")) {
|
||||||
else if(lowercaseUrl.contains("youtu.be")) {
|
if (url.contains("v=")) {
|
||||||
if(url.contains("v=")) {
|
|
||||||
id = Parser.matchGroup1("v=" + ID_PATTERN, url);
|
id = Parser.matchGroup1("v=" + ID_PATTERN, url);
|
||||||
} else {
|
} else {
|
||||||
id = Parser.matchGroup1("[Yy][Oo][Uu][Tt][Uu]\\.[Bb][Ee]/" + ID_PATTERN, url);
|
id = Parser.matchGroup1("[Yy][Oo][Uu][Tt][Uu]\\.[Bb][Ee]/" + ID_PATTERN, url);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
throw new ParsingException("Error no suitable url: " + url);
|
throw new ParsingException("Error no suitable url: " + url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!id.isEmpty()){
|
if (!id.isEmpty()) {
|
||||||
return id;
|
return id;
|
||||||
} else {
|
} else {
|
||||||
throw new ParsingException("Error could not parse url: " + url);
|
throw new ParsingException("Error could not parse url: " + url);
|
||||||
|
@ -100,12 +99,13 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the real url from a shared uri.
|
* Get the real url from a shared uri.
|
||||||
*
|
* <p>
|
||||||
* Shared URI's look like this:
|
* Shared URI's look like this:
|
||||||
* <pre>
|
* <pre>
|
||||||
* * https://www.youtube.com/shared?ci=PJICrTByb3E
|
* * https://www.youtube.com/shared?ci=PJICrTByb3E
|
||||||
* * vnd.youtube://www.youtube.com/shared?ci=PJICrTByb3E&feature=twitter-deep-link
|
* * vnd.youtube://www.youtube.com/shared?ci=PJICrTByb3E&feature=twitter-deep-link
|
||||||
* </pre>
|
* </pre>
|
||||||
|
*
|
||||||
* @param url The shared url
|
* @param url The shared url
|
||||||
* @return the id of the stream
|
* @return the id of the stream
|
||||||
* @throws ParsingException
|
* @throws ParsingException
|
||||||
|
@ -127,8 +127,8 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
}
|
}
|
||||||
// is this bad? is this fragile?:
|
// is this bad? is this fragile?:
|
||||||
String realId = Parser.matchGroup1("rel=\"shortlink\" href=\"https://youtu.be/" + ID_PATTERN, content);
|
String realId = Parser.matchGroup1("rel=\"shortlink\" href=\"https://youtu.be/" + ID_PATTERN, content);
|
||||||
if(sharedId.equals(realId)) {
|
if (sharedId.equals(realId)) {
|
||||||
throw new ParsingException("Got same id for as shared id: " + sharedId);
|
throw new ParsingException("Got same id for as shared info_id: " + sharedId);
|
||||||
}
|
}
|
||||||
return realId;
|
return realId;
|
||||||
}
|
}
|
||||||
|
@ -147,7 +147,7 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptUrl(String videoUrl) {
|
public boolean acceptUrl(String videoUrl) {
|
||||||
String lowercaseUrl = videoUrl.toLowerCase();
|
String lowercaseUrl = videoUrl.toLowerCase();
|
||||||
if(lowercaseUrl.contains("youtube") ||
|
if (lowercaseUrl.contains("youtube") ||
|
||||||
lowercaseUrl.contains("youtu.be")) {
|
lowercaseUrl.contains("youtu.be")) {
|
||||||
// bad programming I know
|
// bad programming I know
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -2,9 +2,9 @@ package org.schabi.newpipe.extractor.services.youtube;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.Downloader;
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
|
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.SuggestionExtractor;
|
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
import org.w3c.dom.NodeList;
|
import org.w3c.dom.NodeList;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
|
@ -20,7 +20,7 @@ import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
import javax.xml.parsers.ParserConfigurationException;
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 28.09.16.
|
* Created by Christian Schabesberger on 28.09.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -92,7 +92,7 @@ public class YoutubeSuggestionExtractor extends SuggestionExtractor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return suggestions;
|
return suggestions;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ParsingException("Could not get suggestions form document.", e);
|
throw new ParsingException("Could not get suggestions form document.", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
* AbstractStreamInfo.java is part of NewPipe.
|
* AbstractStreamInfo.java is part of NewPipe.
|
||||||
*
|
*
|
||||||
|
@ -18,10 +18,12 @@ package org.schabi.newpipe.extractor;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.io.Serializable;
|
import org.schabi.newpipe.extractor.Info;
|
||||||
|
|
||||||
/**Common properties between StreamInfo and StreamInfoItem.*/
|
/**
|
||||||
public abstract class AbstractStreamInfo implements Serializable{
|
* Common properties between StreamInfo and StreamInfoItem.
|
||||||
|
*/
|
||||||
|
public abstract class AbstractStreamInfo extends Info {
|
||||||
public enum StreamType {
|
public enum StreamType {
|
||||||
NONE, // placeholder to check if stream type was checked or not
|
NONE, // placeholder to check if stream type was checked or not
|
||||||
VIDEO_STREAM,
|
VIDEO_STREAM,
|
||||||
|
@ -32,12 +34,8 @@ public abstract class AbstractStreamInfo implements Serializable{
|
||||||
}
|
}
|
||||||
|
|
||||||
public StreamType stream_type;
|
public StreamType stream_type;
|
||||||
public int service_id = -1;
|
|
||||||
public String id = "";
|
|
||||||
public String title = "";
|
|
||||||
public String uploader = "";
|
public String uploader = "";
|
||||||
public String thumbnail_url = "";
|
public String thumbnail_url = "";
|
||||||
public String webpage_url = "";
|
|
||||||
public String upload_date = "";
|
public String upload_date = "";
|
||||||
public long view_count = -1;
|
public long view_count = -1;
|
||||||
}
|
}
|
|
@ -1,8 +1,8 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 04.03.16.
|
* Created by Christian Schabesberger on 04.03.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -22,7 +22,7 @@ import java.io.Serializable;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class AudioStream implements Serializable{
|
public class AudioStream implements Serializable {
|
||||||
public String url = "";
|
public String url = "";
|
||||||
public int format = -1;
|
public int format = -1;
|
||||||
public int bandwidth = -1;
|
public int bandwidth = -1;
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 10.08.15.
|
* Created by Christian Schabesberger on 10.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -20,60 +20,29 @@ package org.schabi.newpipe.extractor.stream_info;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Extractor;
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**Scrapes information from a video streaming service (eg, YouTube).*/
|
/**
|
||||||
|
* Scrapes information from a video streaming service (eg, YouTube).
|
||||||
|
*/
|
||||||
@SuppressWarnings("ALL")
|
public abstract class StreamExtractor extends Extractor {
|
||||||
public abstract class StreamExtractor {
|
|
||||||
|
|
||||||
private int serviceId;
|
|
||||||
private String url;
|
|
||||||
private UrlIdHandler urlIdHandler;
|
|
||||||
private StreamInfoItemCollector previewInfoCollector;
|
|
||||||
|
|
||||||
public class ExtractorInitException extends ExtractionException {
|
|
||||||
public ExtractorInitException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
public ExtractorInitException(Throwable cause) {
|
|
||||||
super(cause);
|
|
||||||
}
|
|
||||||
public ExtractorInitException(String message, Throwable cause) {
|
|
||||||
super(message, cause);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ContentNotAvailableException extends ParsingException {
|
public static class ContentNotAvailableException extends ParsingException {
|
||||||
public ContentNotAvailableException(String message) {
|
public ContentNotAvailableException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContentNotAvailableException(String message, Throwable cause) {
|
public ContentNotAvailableException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public StreamExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) {
|
public StreamExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) {
|
||||||
this.serviceId = serviceId;
|
super(urlIdHandler, serviceId, url);
|
||||||
this.urlIdHandler = urlIdHandler;
|
|
||||||
previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected StreamInfoItemCollector getStreamPreviewInfoCollector() {
|
|
||||||
return previewInfoCollector;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUrl() {
|
|
||||||
return url;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UrlIdHandler getUrlIdHandler() {
|
|
||||||
return urlIdHandler;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getTimeStamp() throws ParsingException;
|
public abstract int getTimeStamp() throws ParsingException;
|
||||||
|
@ -98,9 +67,6 @@ public abstract class StreamExtractor {
|
||||||
public abstract StreamInfoItemCollector getRelatedVideos() throws ParsingException;
|
public abstract StreamInfoItemCollector getRelatedVideos() throws ParsingException;
|
||||||
public abstract String getPageUrl();
|
public abstract String getPageUrl();
|
||||||
public abstract StreamInfo.StreamType getStreamType() throws ParsingException;
|
public abstract StreamInfo.StreamType getStreamType() throws ParsingException;
|
||||||
public int getServiceId() {
|
|
||||||
return serviceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Analyses the webpage's document and extracts any error message there might be.
|
* Analyses the webpage's document and extracts any error message there might be.
|
|
@ -1,16 +1,14 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.DashMpdParser;
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
import org.schabi.newpipe.extractor.UrlIdHandler;
|
import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
|
import org.schabi.newpipe.extractor.utils.DashMpdParser;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 26.08.15.
|
* Created by Christian Schabesberger on 26.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -30,7 +28,9 @@ import java.util.Vector;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**Info object for opened videos, ie the video ready to play.*/
|
/**
|
||||||
|
* Info object for opened videos, ie the video ready to play.
|
||||||
|
*/
|
||||||
@SuppressWarnings("ALL")
|
@SuppressWarnings("ALL")
|
||||||
public class StreamInfo extends AbstractStreamInfo {
|
public class StreamInfo extends AbstractStreamInfo {
|
||||||
|
|
||||||
|
@ -40,30 +40,33 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public StreamInfo() {}
|
public StreamInfo() {
|
||||||
|
}
|
||||||
|
|
||||||
/**Creates a new StreamInfo object from an existing AbstractVideoInfo.
|
/**
|
||||||
* All the shared properties are copied to the new StreamInfo.*/
|
* Creates a new StreamInfo object from an existing AbstractVideoInfo.
|
||||||
|
* All the shared properties are copied to the new StreamInfo.
|
||||||
|
*/
|
||||||
@SuppressWarnings("WeakerAccess")
|
@SuppressWarnings("WeakerAccess")
|
||||||
public StreamInfo(AbstractStreamInfo avi) {
|
public StreamInfo(AbstractStreamInfo avi) {
|
||||||
this.id = avi.id;
|
this.id = avi.id;
|
||||||
this.title = avi.title;
|
this.url = avi.url;
|
||||||
|
this.name = avi.name;
|
||||||
this.uploader = avi.uploader;
|
this.uploader = avi.uploader;
|
||||||
this.thumbnail_url = avi.thumbnail_url;
|
this.thumbnail_url = avi.thumbnail_url;
|
||||||
this.webpage_url = avi.webpage_url;
|
|
||||||
this.upload_date = avi.upload_date;
|
this.upload_date = avi.upload_date;
|
||||||
this.upload_date = avi.upload_date;
|
this.upload_date = avi.upload_date;
|
||||||
this.view_count = avi.view_count;
|
this.view_count = avi.view_count;
|
||||||
|
|
||||||
//todo: better than this
|
//todo: better than this
|
||||||
if(avi instanceof StreamInfoItem) {
|
if (avi instanceof StreamInfoItem) {
|
||||||
//shitty String to convert code
|
//shitty String to convert code
|
||||||
/*
|
/*
|
||||||
String dur = ((StreamInfoItem)avi).duration;
|
String dur = ((StreamInfoItem)avi).duration;
|
||||||
int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
|
int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
|
||||||
int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
|
int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
|
||||||
*/
|
*/
|
||||||
this.duration = ((StreamInfoItem)avi).duration;
|
this.duration = ((StreamInfoItem) avi).duration;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,8 +74,10 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
errors.add(e);
|
errors.add(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Fills out the video info fields which are common to all services.
|
/**
|
||||||
* Probably needs to be overridden by subclasses*/
|
* Fills out the video info fields which are common to all services.
|
||||||
|
* Probably needs to be overridden by subclasses
|
||||||
|
*/
|
||||||
public static StreamInfo getVideoInfo(StreamExtractor extractor)
|
public static StreamInfo getVideoInfo(StreamExtractor extractor)
|
||||||
throws ExtractionException, StreamExtractor.ContentNotAvailableException {
|
throws ExtractionException, StreamExtractor.ContentNotAvailableException {
|
||||||
StreamInfo streamInfo = new StreamInfo();
|
StreamInfo streamInfo = new StreamInfo();
|
||||||
|
@ -108,16 +113,16 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
UrlIdHandler uiconv = extractor.getUrlIdHandler();
|
UrlIdHandler uiconv = extractor.getUrlIdHandler();
|
||||||
|
|
||||||
streamInfo.service_id = extractor.getServiceId();
|
streamInfo.service_id = extractor.getServiceId();
|
||||||
streamInfo.webpage_url = extractor.getPageUrl();
|
streamInfo.url = extractor.getPageUrl();
|
||||||
streamInfo.stream_type = extractor.getStreamType();
|
streamInfo.stream_type = extractor.getStreamType();
|
||||||
streamInfo.id = uiconv.getId(extractor.getPageUrl());
|
streamInfo.id = uiconv.getId(extractor.getPageUrl());
|
||||||
streamInfo.title = extractor.getTitle();
|
streamInfo.name = extractor.getTitle();
|
||||||
streamInfo.age_limit = extractor.getAgeLimit();
|
streamInfo.age_limit = extractor.getAgeLimit();
|
||||||
|
|
||||||
if((streamInfo.stream_type == StreamType.NONE)
|
if ((streamInfo.stream_type == StreamType.NONE)
|
||||||
|| (streamInfo.webpage_url == null || streamInfo.webpage_url.isEmpty())
|
|| (streamInfo.url == null || streamInfo.url.isEmpty())
|
||||||
|| (streamInfo.id == null || streamInfo.id.isEmpty())
|
|| (streamInfo.id == null || streamInfo.id.isEmpty())
|
||||||
|| (streamInfo.title == null /* streamInfo.title can be empty of course */)
|
|| (streamInfo.name == null /* streamInfo.title can be empty of course */)
|
||||||
|| (streamInfo.age_limit == -1)) {
|
|| (streamInfo.age_limit == -1)) {
|
||||||
throw new ExtractionException("Some important stream information was not given.");
|
throw new ExtractionException("Some important stream information was not given.");
|
||||||
}
|
}
|
||||||
|
@ -134,19 +139,19 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
streamInfo.dashMpdUrl = extractor.getDashMpdUrl();
|
streamInfo.dashMpdUrl = extractor.getDashMpdUrl();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
|
streamInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Load and extract audio */
|
/* Load and extract audio */
|
||||||
try {
|
try {
|
||||||
streamInfo.audio_streams = extractor.getAudioStreams();
|
streamInfo.audio_streams = extractor.getAudioStreams();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(new ExtractionException("Couldn't get audio streams", e));
|
streamInfo.addException(new ExtractionException("Couldn't get audio streams", e));
|
||||||
}
|
}
|
||||||
// also try to get streams from the dashMpd
|
// also try to get streams from the dashMpd
|
||||||
if(streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
|
if (streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
|
||||||
if(streamInfo.audio_streams == null) {
|
if (streamInfo.audio_streams == null) {
|
||||||
streamInfo.audio_streams = new Vector<>();
|
streamInfo.audio_streams = new Vector<>();
|
||||||
}
|
}
|
||||||
//todo: make this quick and dirty solution a real fallback
|
//todo: make this quick and dirty solution a real fallback
|
||||||
|
@ -154,7 +159,7 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
try {
|
try {
|
||||||
streamInfo.audio_streams.addAll(
|
streamInfo.audio_streams.addAll(
|
||||||
DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl));
|
DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl));
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(
|
streamInfo.addException(
|
||||||
new ExtractionException("Couldn't get audio streams from dash mpd", e));
|
new ExtractionException("Couldn't get audio streams from dash mpd", e));
|
||||||
}
|
}
|
||||||
|
@ -169,14 +174,14 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
/* Extract video only stream url*/
|
/* Extract video only stream url*/
|
||||||
try {
|
try {
|
||||||
streamInfo.video_only_streams = extractor.getVideoOnlyStreams();
|
streamInfo.video_only_streams = extractor.getVideoOnlyStreams();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(
|
streamInfo.addException(
|
||||||
new ExtractionException("Couldn't get video only streams", e));
|
new ExtractionException("Couldn't get video only streams", e));
|
||||||
}
|
}
|
||||||
|
|
||||||
// either dash_mpd audio_only or video has to be available, otherwise we didn't get a stream,
|
// either dash_mpd audio_only or video has to be available, otherwise we didn't get a stream,
|
||||||
// and therefore failed. (Since video_only_streams are just optional they don't caunt).
|
// and therefore failed. (Since video_only_streams are just optional they don't caunt).
|
||||||
if((streamInfo.video_streams == null || streamInfo.video_streams.isEmpty())
|
if ((streamInfo.video_streams == null || streamInfo.video_streams.isEmpty())
|
||||||
&& (streamInfo.audio_streams == null || streamInfo.audio_streams.isEmpty())
|
&& (streamInfo.audio_streams == null || streamInfo.audio_streams.isEmpty())
|
||||||
&& (streamInfo.dashMpdUrl == null || streamInfo.dashMpdUrl.isEmpty())) {
|
&& (streamInfo.dashMpdUrl == null || streamInfo.dashMpdUrl.isEmpty())) {
|
||||||
throw new StreamExctractException(
|
throw new StreamExctractException(
|
||||||
|
@ -195,62 +200,62 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
streamInfo.thumbnail_url = extractor.getThumbnailUrl();
|
streamInfo.thumbnail_url = extractor.getThumbnailUrl();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.duration = extractor.getLength();
|
streamInfo.duration = extractor.getLength();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.uploader = extractor.getUploader();
|
streamInfo.uploader = extractor.getUploader();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.channel_url = extractor.getChannelUrl();
|
streamInfo.channel_url = extractor.getChannelUrl();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.description = extractor.getDescription();
|
streamInfo.description = extractor.getDescription();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.view_count = extractor.getViewCount();
|
streamInfo.view_count = extractor.getViewCount();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.upload_date = extractor.getUploadDate();
|
streamInfo.upload_date = extractor.getUploadDate();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
|
streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.start_position = extractor.getTimeStamp();
|
streamInfo.start_position = extractor.getTimeStamp();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.average_rating = extractor.getAverageRating();
|
streamInfo.average_rating = extractor.getAverageRating();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.like_count = extractor.getLikeCount();
|
streamInfo.like_count = extractor.getLikeCount();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
streamInfo.dislike_count = extractor.getDislikeCount();
|
streamInfo.dislike_count = extractor.getDislikeCount();
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
@ -258,12 +263,11 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
extractor.getUrlIdHandler(), extractor.getServiceId());
|
extractor.getUrlIdHandler(), extractor.getServiceId());
|
||||||
StreamInfoItemExtractor nextVideo = extractor.getNextVideo();
|
StreamInfoItemExtractor nextVideo = extractor.getNextVideo();
|
||||||
c.commit(nextVideo);
|
c.commit(nextVideo);
|
||||||
if(c.getItemList().size() != 0) {
|
if (c.getItemList().size() != 0) {
|
||||||
streamInfo.next_video = (StreamInfoItem) c.getItemList().get(0);
|
streamInfo.next_video = (StreamInfoItem) c.getItemList().get(0);
|
||||||
}
|
}
|
||||||
streamInfo.errors.addAll(c.getErrors());
|
streamInfo.errors.addAll(c.getErrors());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch(Exception e) {
|
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
@ -271,7 +275,7 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
StreamInfoItemCollector c = extractor.getRelatedVideos();
|
StreamInfoItemCollector c = extractor.getRelatedVideos();
|
||||||
streamInfo.related_streams = c.getItemList();
|
streamInfo.related_streams = c.getItemList();
|
||||||
streamInfo.errors.addAll(c.getErrors());
|
streamInfo.errors.addAll(c.getErrors());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addException(e);
|
streamInfo.addException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -300,6 +304,4 @@ public class StreamInfo extends AbstractStreamInfo {
|
||||||
public List<InfoItem> related_streams = null;
|
public List<InfoItem> related_streams = null;
|
||||||
//in seconds. some metadata is not passed using a StreamInfo object!
|
//in seconds. some metadata is not passed using a StreamInfo object!
|
||||||
public int start_position = 0;
|
public int start_position = 0;
|
||||||
|
|
||||||
public List<Throwable> errors = new Vector<>();
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 26.08.15.
|
* Created by Christian Schabesberger on 26.08.15.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -20,10 +20,11 @@ package org.schabi.newpipe.extractor.stream_info;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.InfoItem;
|
import org.schabi.newpipe.extractor.InfoItem;
|
||||||
|
|
||||||
/**Info object for previews of unopened videos, eg search results, related videos*/
|
/**
|
||||||
|
* Info object for previews of unopened videos, eg search results, related videos
|
||||||
|
*/
|
||||||
public class StreamInfoItem extends AbstractStreamInfo implements InfoItem {
|
public class StreamInfoItem extends AbstractStreamInfo implements InfoItem {
|
||||||
public int duration;
|
public int duration;
|
||||||
|
|
||||||
|
@ -32,10 +33,10 @@ public class StreamInfoItem extends AbstractStreamInfo implements InfoItem {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
return title;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLink() {
|
public String getLink() {
|
||||||
return webpage_url;
|
return url;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.InfoItemCollector;
|
import org.schabi.newpipe.extractor.InfoItemCollector;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
|
@ -6,10 +6,7 @@ import org.schabi.newpipe.extractor.UrlIdHandler;
|
||||||
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
import org.schabi.newpipe.extractor.exceptions.FoundAdException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
import java.util.List;
|
/*
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Christian Schabesberger on 28.02.16.
|
* Created by Christian Schabesberger on 28.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -43,22 +40,22 @@ public class StreamInfoItemCollector extends InfoItemCollector {
|
||||||
}
|
}
|
||||||
|
|
||||||
public StreamInfoItem extract(StreamInfoItemExtractor extractor) throws Exception {
|
public StreamInfoItem extract(StreamInfoItemExtractor extractor) throws Exception {
|
||||||
if(extractor.isAd()) {
|
if (extractor.isAd()) {
|
||||||
throw new FoundAdException("Found ad");
|
throw new FoundAdException("Found ad");
|
||||||
}
|
}
|
||||||
|
|
||||||
StreamInfoItem resultItem = new StreamInfoItem();
|
StreamInfoItem resultItem = new StreamInfoItem();
|
||||||
// important information
|
// important information
|
||||||
resultItem.service_id = getServiceId();
|
resultItem.service_id = getServiceId();
|
||||||
resultItem.webpage_url = extractor.getWebPageUrl();
|
resultItem.url = extractor.getWebPageUrl();
|
||||||
if (getUrlIdHandler() == null) {
|
if (getUrlIdHandler() == null) {
|
||||||
throw new ParsingException("Error: UrlIdHandler not set");
|
throw new ParsingException("Error: UrlIdHandler not set");
|
||||||
} else if (!resultItem.webpage_url.isEmpty()) {
|
} else if (!resultItem.url.isEmpty()) {
|
||||||
resultItem.id = NewPipe.getService(getServiceId())
|
resultItem.id = NewPipe.getService(getServiceId())
|
||||||
.getStreamUrlIdHandlerInstance()
|
.getStreamUrlIdHandlerInstance()
|
||||||
.getId(resultItem.webpage_url);
|
.getId(resultItem.url);
|
||||||
}
|
}
|
||||||
resultItem.title = extractor.getTitle();
|
resultItem.name = extractor.getTitle();
|
||||||
resultItem.stream_type = extractor.getStreamType();
|
resultItem.stream_type = extractor.getStreamType();
|
||||||
|
|
||||||
// optional information
|
// optional information
|
||||||
|
@ -93,7 +90,7 @@ public class StreamInfoItemCollector extends InfoItemCollector {
|
||||||
public void commit(StreamInfoItemExtractor extractor) throws ParsingException {
|
public void commit(StreamInfoItemExtractor extractor) throws ParsingException {
|
||||||
try {
|
try {
|
||||||
addItem(extract(extractor));
|
addItem(extract(extractor));
|
||||||
} catch(FoundAdException ae) {
|
} catch (FoundAdException ae) {
|
||||||
//System.out.println("AD_WARNING: " + ae.getMessage());
|
//System.out.println("AD_WARNING: " + ae.getMessage());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
addError(e);
|
addError(e);
|
|
@ -1,9 +1,8 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.AbstractStreamInfo;
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 28.02.16.
|
* Created by Christian Schabesberger on 28.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -30,7 +29,7 @@ public interface StreamInfoItemExtractor {
|
||||||
int getDuration() throws ParsingException;
|
int getDuration() throws ParsingException;
|
||||||
String getUploader() throws ParsingException;
|
String getUploader() throws ParsingException;
|
||||||
String getUploadDate() throws ParsingException;
|
String getUploadDate() throws ParsingException;
|
||||||
long getViewCount() throws ParsingException;
|
long getViewCount() throws ParsingException;
|
||||||
String getThumbnailUrl() throws ParsingException;
|
String getThumbnailUrl() throws ParsingException;
|
||||||
boolean isAd() throws ParsingException;
|
boolean isAd() throws ParsingException;
|
||||||
}
|
}
|
|
@ -1,23 +1,23 @@
|
||||||
package org.schabi.newpipe.extractor.stream_info;
|
package org.schabi.newpipe.extractor.stream;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 04.03.16.
|
* Created by Christian Schabesberger on 04.03.16.
|
||||||
* <p>
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
* VideoStream.java is part of NewPipe.
|
* VideoStream.java is part of NewPipe.
|
||||||
* <p>
|
*
|
||||||
* NewPipe is free software: you can redistribute it and/or modify
|
* NewPipe is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
* <p>
|
*
|
||||||
* NewPipe is distributed in the hope that it will be useful,
|
* NewPipe is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
* <p>
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
|
@ -1,8 +1,11 @@
|
||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor.utils;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.extractor.Downloader;
|
||||||
|
import org.schabi.newpipe.extractor.MediaFormat;
|
||||||
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
|
||||||
import org.schabi.newpipe.extractor.stream_info.AudioStream;
|
import org.schabi.newpipe.extractor.stream.AudioStream;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
import org.w3c.dom.NodeList;
|
import org.w3c.dom.NodeList;
|
||||||
|
@ -16,7 +19,7 @@ import java.util.Vector;
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 02.02.16.
|
* Created by Christian Schabesberger on 02.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -53,7 +56,7 @@ public class DashMpdParser {
|
||||||
Downloader downloader = NewPipe.getDownloader();
|
Downloader downloader = NewPipe.getDownloader();
|
||||||
try {
|
try {
|
||||||
dashDoc = downloader.download(dashManifestUrl);
|
dashDoc = downloader.download(dashManifestUrl);
|
||||||
} catch(IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
|
throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
|
||||||
} catch (ReCaptchaException e) {
|
} catch (ReCaptchaException e) {
|
||||||
throw new ReCaptchaException("reCaptcha Challenge needed");
|
throw new ReCaptchaException("reCaptcha Challenge needed");
|
||||||
|
@ -67,25 +70,24 @@ public class DashMpdParser {
|
||||||
|
|
||||||
Document doc = builder.parse(stream);
|
Document doc = builder.parse(stream);
|
||||||
NodeList adaptationSetList = doc.getElementsByTagName("AdaptationSet");
|
NodeList adaptationSetList = doc.getElementsByTagName("AdaptationSet");
|
||||||
for(int i = 0; i < adaptationSetList.getLength(); i++) {
|
for (int i = 0; i < adaptationSetList.getLength(); i++) {
|
||||||
Element adaptationSet = (Element) adaptationSetList.item(i);
|
Element adaptationSet = (Element) adaptationSetList.item(i);
|
||||||
String memeType = adaptationSet.getAttribute("mimeType");
|
String memeType = adaptationSet.getAttribute("mimeType");
|
||||||
if(memeType.contains("audio")) {
|
if (memeType.contains("audio")) {
|
||||||
Element representation = (Element) adaptationSet.getElementsByTagName("Representation").item(0);
|
Element representation = (Element) adaptationSet.getElementsByTagName("Representation").item(0);
|
||||||
String url = representation.getElementsByTagName("BaseURL").item(0).getTextContent();
|
String url = representation.getElementsByTagName("BaseURL").item(0).getTextContent();
|
||||||
int bandwidth = Integer.parseInt(representation.getAttribute("bandwidth"));
|
int bandwidth = Integer.parseInt(representation.getAttribute("bandwidth"));
|
||||||
int samplingRate = Integer.parseInt(representation.getAttribute("audioSamplingRate"));
|
int samplingRate = Integer.parseInt(representation.getAttribute("audioSamplingRate"));
|
||||||
int format = -1;
|
int format = -1;
|
||||||
if(memeType.equals(MediaFormat.WEBMA.mimeType)) {
|
if (memeType.equals(MediaFormat.WEBMA.mimeType)) {
|
||||||
format = MediaFormat.WEBMA.id;
|
format = MediaFormat.WEBMA.id;
|
||||||
} else if(memeType.equals(MediaFormat.M4A.mimeType)) {
|
} else if (memeType.equals(MediaFormat.M4A.mimeType)) {
|
||||||
format = MediaFormat.M4A.id;
|
format = MediaFormat.M4A.id;
|
||||||
}
|
}
|
||||||
audioStreams.add(new AudioStream(url, format, 0, bandwidth, samplingRate));
|
audioStreams.add(new AudioStream(url, format, 0, bandwidth, samplingRate));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch(Exception e) {
|
|
||||||
throw new DashMpdParsingException("Could not parse Dash mpd", e);
|
throw new DashMpdParsingException("Could not parse Dash mpd", e);
|
||||||
}
|
}
|
||||||
return audioStreams;
|
return audioStreams;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor.utils;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Created by Christian Schabesberger on 02.02.16.
|
* Created by Christian Schabesberger on 02.02.16.
|
||||||
*
|
*
|
||||||
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -29,7 +29,9 @@ import java.util.regex.Pattern;
|
||||||
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** avoid using regex !!! */
|
/**
|
||||||
|
* avoid using regex !!!
|
||||||
|
*/
|
||||||
public class Parser {
|
public class Parser {
|
||||||
|
|
||||||
private Parser() {
|
private Parser() {
|
||||||
|
@ -51,11 +53,10 @@ public class Parser {
|
||||||
boolean foundMatch = mat.find();
|
boolean foundMatch = mat.find();
|
||||||
if (foundMatch) {
|
if (foundMatch) {
|
||||||
return mat.group(group);
|
return mat.group(group);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
//Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
|
//Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
|
||||||
if(input.length() > 1024) {
|
if (input.length() > 1024) {
|
||||||
throw new RegexException("failed to find pattern \""+pattern);
|
throw new RegexException("failed to find pattern \"" + pattern);
|
||||||
} else {
|
} else {
|
||||||
throw new RegexException("failed to find pattern \"" + pattern + " inside of " + input + "\"");
|
throw new RegexException("failed to find pattern \"" + pattern + " inside of " + input + "\"");
|
||||||
}
|
}
|
||||||
|
@ -64,9 +65,9 @@ public class Parser {
|
||||||
|
|
||||||
public static Map<String, String> compatParseMap(final String input) throws UnsupportedEncodingException {
|
public static Map<String, String> compatParseMap(final String input) throws UnsupportedEncodingException {
|
||||||
Map<String, String> map = new HashMap<>();
|
Map<String, String> map = new HashMap<>();
|
||||||
for(String arg : input.split("&")) {
|
for (String arg : input.split("&")) {
|
||||||
String[] splitArg = arg.split("=");
|
String[] splitArg = arg.split("=");
|
||||||
if(splitArg.length > 1) {
|
if (splitArg.length > 1) {
|
||||||
map.put(splitArg[0], URLDecoder.decode(splitArg[1], "UTF-8"));
|
map.put(splitArg[0], URLDecoder.decode(splitArg[1], "UTF-8"));
|
||||||
} else {
|
} else {
|
||||||
map.put(splitArg[0], "");
|
map.put(splitArg[0], "");
|
Loading…
Reference in a new issue