Add support for extracting channel subscriber count in StreamInfo.
This commit is contained in:
parent
69e18c80cb
commit
6f3f608ab6
|
@ -45,6 +45,7 @@ import java.time.OffsetDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
import static org.schabi.newpipe.extractor.ListExtractor.ITEM_COUNT_UNKNOWN;
|
||||||
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.*;
|
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.*;
|
||||||
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
|
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
|
||||||
import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
|
import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
|
||||||
|
@ -437,6 +438,20 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
return fixThumbnailUrl(url);
|
return fixThumbnailUrl(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getUploaderSubscriberCount() throws ParsingException {
|
||||||
|
final JsonObject videoOwnerRenderer = JsonUtils.getObject(videoSecondaryInfoRenderer, "owner.videoOwnerRenderer");
|
||||||
|
if (videoOwnerRenderer.has("subscriberCountText")) {
|
||||||
|
try {
|
||||||
|
return Utils.mixedNumberWordToLong(getTextFromObject(videoOwnerRenderer.getObject("subscriberCountText")));
|
||||||
|
} catch (final NumberFormatException e) {
|
||||||
|
throw new ParsingException("Could not get subscriber count", e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return ITEM_COUNT_UNKNOWN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public String getDashMpdUrl() throws ParsingException {
|
public String getDashMpdUrl() throws ParsingException {
|
||||||
|
|
|
@ -202,6 +202,17 @@ public abstract class StreamExtractor extends Extractor {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The subscriber count of the uploader.
|
||||||
|
* If the subscriber count is not implemented, or is unavailable, return <code>-1</code>.
|
||||||
|
*
|
||||||
|
* @return the subscriber count of the uploader or -1 if not available
|
||||||
|
* @throws ParsingException
|
||||||
|
*/
|
||||||
|
public long getUploaderSubscriberCount() throws ParsingException {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The url to the image file/profile picture/avatar of the creator/uploader of the stream.
|
* The url to the image file/profile picture/avatar of the creator/uploader of the stream.
|
||||||
* If the url is not available you can return an empty String.
|
* If the url is not available you can return an empty String.
|
||||||
|
|
|
@ -235,6 +235,11 @@ public class StreamInfo extends Info {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
streamInfo.addError(e);
|
streamInfo.addError(e);
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
streamInfo.setUploaderSubscriberCount(extractor.getUploaderSubscriberCount());
|
||||||
|
} catch (Exception e) {
|
||||||
|
streamInfo.addError(e);
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
streamInfo.setSubChannelName(extractor.getSubChannelName());
|
streamInfo.setSubChannelName(extractor.getSubChannelName());
|
||||||
|
@ -367,6 +372,7 @@ public class StreamInfo extends Info {
|
||||||
private String uploaderUrl = "";
|
private String uploaderUrl = "";
|
||||||
private String uploaderAvatarUrl = "";
|
private String uploaderAvatarUrl = "";
|
||||||
private boolean uploaderVerified = false;
|
private boolean uploaderVerified = false;
|
||||||
|
private long uploaderSubscriberCount = -1;
|
||||||
|
|
||||||
private String subChannelName = "";
|
private String subChannelName = "";
|
||||||
private String subChannelUrl = "";
|
private String subChannelUrl = "";
|
||||||
|
@ -540,6 +546,14 @@ public class StreamInfo extends Info {
|
||||||
this.uploaderVerified = uploaderVerified;
|
this.uploaderVerified = uploaderVerified;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getUploaderSubscriberCount() {
|
||||||
|
return uploaderSubscriberCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUploaderSubscriberCount(long uploaderSubscriberCount) {
|
||||||
|
this.uploaderSubscriberCount = uploaderSubscriberCount;
|
||||||
|
}
|
||||||
|
|
||||||
public String getSubChannelName() {
|
public String getSubChannelName() {
|
||||||
return subChannelName;
|
return subChannelName;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@ public interface BaseStreamExtractorTest extends BaseExtractorTest {
|
||||||
void testUploaderName() throws Exception;
|
void testUploaderName() throws Exception;
|
||||||
void testUploaderUrl() throws Exception;
|
void testUploaderUrl() throws Exception;
|
||||||
void testUploaderAvatarUrl() throws Exception;
|
void testUploaderAvatarUrl() throws Exception;
|
||||||
|
void testSubscriberCount() throws Exception;
|
||||||
void testSubChannelName() throws Exception;
|
void testSubChannelName() throws Exception;
|
||||||
void testSubChannelUrl() throws Exception;
|
void testSubChannelUrl() throws Exception;
|
||||||
void testSubChannelAvatarUrl() throws Exception;
|
void testSubChannelAvatarUrl() throws Exception;
|
||||||
|
|
|
@ -45,6 +45,7 @@ public abstract class DefaultStreamExtractorTest extends DefaultExtractorTest<St
|
||||||
public abstract String expectedUploaderName();
|
public abstract String expectedUploaderName();
|
||||||
public abstract String expectedUploaderUrl();
|
public abstract String expectedUploaderUrl();
|
||||||
public boolean expectedUploaderVerified() { return false; }
|
public boolean expectedUploaderVerified() { return false; }
|
||||||
|
public long expectedUploaderSubscriberCountAtLeast() { return -1; }
|
||||||
public String expectedSubChannelName() { return ""; } // default: there is no subchannel
|
public String expectedSubChannelName() { return ""; } // default: there is no subchannel
|
||||||
public String expectedSubChannelUrl() { return ""; } // default: there is no subchannel
|
public String expectedSubChannelUrl() { return ""; } // default: there is no subchannel
|
||||||
public boolean expectedDescriptionIsEmpty() { return false; } // default: description is not empty
|
public boolean expectedDescriptionIsEmpty() { return false; } // default: description is not empty
|
||||||
|
@ -105,6 +106,12 @@ public abstract class DefaultStreamExtractorTest extends DefaultExtractorTest<St
|
||||||
assertEquals(expectedUploaderVerified(), extractor().isUploaderVerified());
|
assertEquals(expectedUploaderVerified(), extractor().isUploaderVerified());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Override
|
||||||
|
public void testSubscriberCount() throws Exception {
|
||||||
|
assertGreaterOrEqual(expectedUploaderSubscriberCountAtLeast(), extractor().getUploaderSubscriberCount());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Override
|
@Override
|
||||||
public void testSubChannelName() throws Exception {
|
public void testSubChannelName() throws Exception {
|
||||||
|
|
|
@ -138,6 +138,7 @@ public class YoutubeStreamExtractorDefaultTest {
|
||||||
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
||||||
@Override public String expectedUploaderName() { return "PewDiePie"; }
|
@Override public String expectedUploaderName() { return "PewDiePie"; }
|
||||||
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw"; }
|
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw"; }
|
||||||
|
@Override public long expectedUploaderSubscriberCountAtLeast() { return 110_000_000; }
|
||||||
@Override public List<String> expectedDescriptionContains() {
|
@Override public List<String> expectedDescriptionContains() {
|
||||||
return Arrays.asList("https://www.youtube.com/channel/UC7l23W7gFi4Uho6WSzckZRA",
|
return Arrays.asList("https://www.youtube.com/channel/UC7l23W7gFi4Uho6WSzckZRA",
|
||||||
"https://www.handcraftpictures.com/");
|
"https://www.handcraftpictures.com/");
|
||||||
|
@ -182,6 +183,7 @@ public class YoutubeStreamExtractorDefaultTest {
|
||||||
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
||||||
@Override public String expectedUploaderName() { return "Unbox Therapy"; }
|
@Override public String expectedUploaderName() { return "Unbox Therapy"; }
|
||||||
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCsTcErHg8oDvUnTzoqsYeNw"; }
|
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCsTcErHg8oDvUnTzoqsYeNw"; }
|
||||||
|
@Override public long expectedUploaderSubscriberCountAtLeast() { return 18_000_000; }
|
||||||
@Override public List<String> expectedDescriptionContains() {
|
@Override public List<String> expectedDescriptionContains() {
|
||||||
return Arrays.asList("https://www.youtube.com/watch?v=X7FLCHVXpsA&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
|
return Arrays.asList("https://www.youtube.com/watch?v=X7FLCHVXpsA&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
|
||||||
"https://www.youtube.com/watch?v=Lqv6G0pDNnw&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
|
"https://www.youtube.com/watch?v=Lqv6G0pDNnw&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
|
||||||
|
@ -274,6 +276,7 @@ public class YoutubeStreamExtractorDefaultTest {
|
||||||
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
||||||
@Override public String expectedUploaderName() { return "tagesschau"; }
|
@Override public String expectedUploaderName() { return "tagesschau"; }
|
||||||
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UC5NOEUbkLheQcaaRldYW5GA"; }
|
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UC5NOEUbkLheQcaaRldYW5GA"; }
|
||||||
|
@Override public long expectedUploaderSubscriberCountAtLeast() { return 1_000_000; }
|
||||||
@Override public boolean expectedUploaderVerified() { return true; }
|
@Override public boolean expectedUploaderVerified() { return true; }
|
||||||
@Override public List<String> expectedDescriptionContains() {
|
@Override public List<String> expectedDescriptionContains() {
|
||||||
return Arrays.asList("Themen der Sendung", "07:15", "Wetter", "Sendung nachträglich bearbeitet");
|
return Arrays.asList("Themen der Sendung", "07:15", "Wetter", "Sendung nachträglich bearbeitet");
|
||||||
|
@ -336,6 +339,7 @@ public class YoutubeStreamExtractorDefaultTest {
|
||||||
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
||||||
@Override public String expectedUploaderName() { return "maiLab"; }
|
@Override public String expectedUploaderName() { return "maiLab"; }
|
||||||
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCyHDQ5C6z1NDmJ4g6SerW8g"; }
|
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCyHDQ5C6z1NDmJ4g6SerW8g"; }
|
||||||
|
@Override public long expectedUploaderSubscriberCountAtLeast() { return 1_400_000; }
|
||||||
@Override public List<String> expectedDescriptionContains() {return Arrays.asList("Vitamin", "2:44", "Was ist Vitamin D?");}
|
@Override public List<String> expectedDescriptionContains() {return Arrays.asList("Vitamin", "2:44", "Was ist Vitamin D?");}
|
||||||
@Override public boolean expectedUploaderVerified() { return true; }
|
@Override public boolean expectedUploaderVerified() { return true; }
|
||||||
@Override public long expectedLength() { return 1010; }
|
@Override public long expectedLength() { return 1010; }
|
||||||
|
@ -405,6 +409,7 @@ public class YoutubeStreamExtractorDefaultTest {
|
||||||
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
|
||||||
@Override public String expectedUploaderName() { return "Dinge Erklärt – Kurzgesagt"; }
|
@Override public String expectedUploaderName() { return "Dinge Erklärt – Kurzgesagt"; }
|
||||||
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCwRH985XgMYXQ6NxXDo8npw"; }
|
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCwRH985XgMYXQ6NxXDo8npw"; }
|
||||||
|
@Override public long expectedUploaderSubscriberCountAtLeast() { return 1_500_000; }
|
||||||
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("Lasst uns abtauchen!", "Angebot von funk", "Dinge"); }
|
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("Lasst uns abtauchen!", "Angebot von funk", "Dinge"); }
|
||||||
@Override public long expectedLength() { return 631; }
|
@Override public long expectedLength() { return 631; }
|
||||||
@Override public long expectedTimestamp() { return TIMESTAMP; }
|
@Override public long expectedTimestamp() { return TIMESTAMP; }
|
||||||
|
|
Loading…
Reference in New Issue