Skip to content

[PeerTube] playlist support #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TobiGr merged 4 commits into from
May 11, 2020
Merged

[PeerTube] playlist support #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bab9d9
[PeerTube] playlist support & refactoring
B0pol Apr 9, 2020
cf99107
address yausername change
B0pol Apr 11, 2020
1a6e92e
add getSubChannel Name, Url and AvatarUrl for playlists
B0pol May 9, 2020
7cae95b
add tests for subchannel stuff in playlists
B0pol May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;

import javax.annotation.Nonnull;

public abstract class PlaylistExtractor extends ListExtractor<StreamInfoItem> {

public PlaylistExtractor(StreamingService service, ListLinkHandler linkHandler) {
Expand All @@ -20,4 +22,9 @@ public PlaylistExtractor(StreamingService service, ListLinkHandler linkHandler)
public abstract String getUploaderAvatarUrl() throws ParsingException;

public abstract long getStreamCount() throws ParsingException;

@Nonnull public abstract String getSubChannelName() throws ParsingException;
@Nonnull public abstract String getSubChannelUrl() throws ParsingException;
@Nonnull public abstract String getSubChannelAvatarUrl() throws ParsingException;

}
28 changes: 28 additions & 0 deletions ...r/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeParsingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.jsoup.helper.StringUtil;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.utils.Parser;

import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand All @@ -13,6 +14,11 @@

public class PeertubeParsingHelper {

public static final String START_KEY = "start";
public static final String COUNT_KEY = "count";
public static final int ITEMS_PER_PAGE = 12;
public static final String START_PATTERN = "start=(\\d*)";

private PeertubeParsingHelper() {
}

Expand All @@ -38,4 +44,26 @@ public static Calendar parseDateFrom(String textualUploadDate) throws ParsingExc
return uploadDate;
}

public static String getNextPageUrl(String prevPageUrl, long total) {
String prevStart;
try {
prevStart = Parser.matchGroup1(START_PATTERN, prevPageUrl);
} catch (Parser.RegexException e) {
return "";
}
if (StringUtil.isBlank(prevStart)) return "";
long nextStart = 0;
try {
nextStart = Long.parseLong(prevStart) + ITEMS_PER_PAGE;
} catch (NumberFormatException e) {
return "";
}

if (nextStart >= total) {
return "";
} else {
return prevPageUrl.replace(START_KEY + "=" + prevStart, START_KEY + "=" + nextStart);
}
}

}
7 changes: 2 additions & 5 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public ListLinkHandlerFactory getChannelLHFactory() {

@Override
public ListLinkHandlerFactory getPlaylistLHFactory() {
// TODO Auto-generated method stub
return null;
return PeertubePlaylistLinkHandlerFactory.getInstance();
}

@Override
Expand All @@ -70,7 +69,6 @@ public SuggestionExtractor getSuggestionExtractor() {

@Override
public SubscriptionExtractor getSubscriptionExtractor() {
// TODO Auto-generated method stub
return null;
}

Expand All @@ -88,8 +86,7 @@ public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler)
@Override
public PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler)
throws ExtractionException {
// TODO Auto-generated method stub
return null;
return new PeertubePlaylistExtractor(this, linkHandler);
}

@Override
Expand Down
37 changes: 4 additions & 33 deletions ...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,12 @@
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
import org.schabi.newpipe.extractor.utils.JsonUtils;
import org.schabi.newpipe.extractor.utils.Parser;
import org.schabi.newpipe.extractor.utils.Parser.RegexException;

import java.io.IOException;

public class PeertubeAccountExtractor extends ChannelExtractor {
import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.*;

private static final String START_KEY = "start";
private static final String COUNT_KEY = "count";
private static final int ITEMS_PER_PAGE = 12;
private static final String START_PATTERN = "start=(\\d*)";
public class PeertubeAccountExtractor extends ChannelExtractor {

private InfoItemsPage<StreamInfoItem> initPage;
private long total;
Expand Down Expand Up @@ -135,36 +130,12 @@ public InfoItemsPage<StreamInfoItem> getPage(String pageUrl) throws IOException,
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
if (json != null) {
PeertubeParsingHelper.validate(json);
Number number = JsonUtils.getNumber(json, "total");
if (number != null) this.total = number.longValue();
total = JsonUtils.getNumber(json, "total").longValue();
collectStreamsFrom(collector, json, pageUrl);
} else {
throw new ExtractionException("Unable to get PeerTube kiosk info");
}
return new InfoItemsPage<>(collector, getNextPageUrl(pageUrl));
}


private String getNextPageUrl(String prevPageUrl) {
String prevStart;
try {
prevStart = Parser.matchGroup1(START_PATTERN, prevPageUrl);
} catch (RegexException e) {
return "";
}
if (StringUtil.isBlank(prevStart)) return "";
long nextStart = 0;
try {
nextStart = Long.valueOf(prevStart) + ITEMS_PER_PAGE;
} catch (NumberFormatException e) {
return "";
}

if (nextStart >= total) {
return "";
} else {
return prevPageUrl.replace(START_KEY + "=" + prevStart, START_KEY + "=" + String.valueOf(nextStart));
}
return new InfoItemsPage<>(collector, PeertubeParsingHelper.getNextPageUrl(pageUrl, total));
}

@Override
Expand Down
38 changes: 5 additions & 33 deletions ...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@

import java.io.IOException;

public class PeertubeChannelExtractor extends ChannelExtractor {
import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.*;

private static final String START_KEY = "start";
private static final String COUNT_KEY = "count";
private static final int ITEMS_PER_PAGE = 12;
private static final String START_PATTERN = "start=(\\d*)";
public class PeertubeChannelExtractor extends ChannelExtractor {

private InfoItemsPage<StreamInfoItem> initPage;
private long total;
Expand Down Expand Up @@ -141,36 +138,12 @@ public InfoItemsPage<StreamInfoItem> getPage(String pageUrl) throws IOException,
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
if (json != null) {
PeertubeParsingHelper.validate(json);
Number number = JsonUtils.getNumber(json, "total");
if (number != null) this.total = number.longValue();
this.total = JsonUtils.getNumber(json, "total").longValue();
collectStreamsFrom(collector, json, pageUrl);
} else {
throw new ExtractionException("Unable to get PeerTube kiosk info");
}
return new InfoItemsPage<>(collector, getNextPageUrl(pageUrl));
}


private String getNextPageUrl(String prevPageUrl) {
String prevStart;
try {
prevStart = Parser.matchGroup1(START_PATTERN, prevPageUrl);
} catch (RegexException e) {
return "";
}
if (StringUtil.isBlank(prevStart)) return "";
long nextStart = 0;
try {
nextStart = Long.valueOf(prevStart) + ITEMS_PER_PAGE;
} catch (NumberFormatException e) {
return "";
}

if (nextStart >= total) {
return "";
} else {
return prevPageUrl.replace(START_KEY + "=" + prevStart, START_KEY + "=" + String.valueOf(nextStart));
}
return new InfoItemsPage<>(collector, PeertubeParsingHelper.getNextPageUrl(pageUrl, total));
}

@Override
Expand All @@ -182,8 +155,7 @@ public void onFetchPage(Downloader downloader) throws IOException, ExtractionExc
throw new ExtractionException("Unable to extract PeerTube channel data");
}

String pageUrl = getUrl() + "/videos?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE;
this.initPage = getPage(pageUrl);
this.initPage = getPage(getUrl() + "/videos?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE);
}

private void setInitialData(String responseBody) throws ExtractionException {
Expand Down
35 changes: 5 additions & 30 deletions .../org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
import org.schabi.newpipe.extractor.utils.JsonUtils;
import org.schabi.newpipe.extractor.utils.Parser;
import org.schabi.newpipe.extractor.utils.Parser.RegexException;

import java.io.IOException;

public class PeertubeCommentsExtractor extends CommentsExtractor {
import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.*;

private static final String START_KEY = "start";
private static final String COUNT_KEY = "count";
private static final int ITEMS_PER_PAGE = 12;
private static final String START_PATTERN = "start=(\\d*)";
public class PeertubeCommentsExtractor extends CommentsExtractor {

private InfoItemsPage<CommentsInfoItem> initPage;
private long total;
Expand Down Expand Up @@ -83,35 +81,12 @@ public InfoItemsPage<CommentsInfoItem> getPage(String pageUrl) throws IOExceptio
} else {
throw new ExtractionException("Unable to get peertube comments info");
}
return new InfoItemsPage<>(collector, getNextPageUrl(pageUrl));
return new InfoItemsPage<>(collector, PeertubeParsingHelper.getNextPageUrl(pageUrl, total));
}

@Override
public void onFetchPage(Downloader downloader) throws IOException, ExtractionException {
String pageUrl = getUrl() + "?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE;
this.initPage = getPage(pageUrl);
}

private String getNextPageUrl(String prevPageUrl) {
String prevStart;
try {
prevStart = Parser.matchGroup1(START_PATTERN, prevPageUrl);
} catch (RegexException e) {
return "";
}
if (StringUtil.isBlank(prevStart)) return "";
long nextStart = 0;
try {
nextStart = Long.valueOf(prevStart) + ITEMS_PER_PAGE;
} catch (NumberFormatException e) {
return "";
}

if (nextStart >= total) {
return "";
} else {
return prevPageUrl.replace(START_KEY + "=" + prevStart, START_KEY + "=" + String.valueOf(nextStart));
}
this.initPage = getPage(getUrl() + "?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE);
}

}
Loading