lasers
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PeerTube]

This commit is contained in:
Stypox 2023-12-29 19:03:28 +01:00
parent 9e75344611
commit c7ef8a9e68
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java
View File

@ -115,9 +115,9 @@ public class PeertubeAccountExtractor extends ChannelExtractor {
public List<ListLinkHandler> getTabs() throws ParsingException {
return List.of(
PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
List.of(ChannelTabs.VIDEOS), "", getBaseUrl()),
List.of(ChannelTabs.VIDEOS), List.of(), getBaseUrl()),
PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
List.of(ChannelTabs.CHANNELS), "", getBaseUrl()));
List.of(ChannelTabs.CHANNELS), List.of(), getBaseUrl()));
}
@Override

4
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java
View File

@ -89,9 +89,9 @@ public class PeertubeChannelExtractor extends ChannelExtractor {
public List<ListLinkHandler> getTabs() throws ParsingException {
return List.of(
PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
List.of(ChannelTabs.VIDEOS), "", getBaseUrl()),
List.of(ChannelTabs.VIDEOS), List.of(), getBaseUrl()),
PeertubeChannelTabLinkHandlerFactory.getInstance().fromQuery(getId(),
List.of(ChannelTabs.PLAYLISTS), "", getBaseUrl()));
List.of(ChannelTabs.PLAYLISTS), List.of(), getBaseUrl()));
}
@Override

4
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelTabExtractor.java
View File

@ -44,8 +44,8 @@ public class PeertubeChannelTabExtractor extends ChannelTabExtractor {
@Override
public InfoItemsPage<InfoItem> getInitialPage() throws IOException, ExtractionException {
return getPage(new Page(baseUrl + PeertubeChannelLinkHandlerFactory.API_ENDPOINT
+ getId() + getUrlSuffix(getName()) + "?" + START_KEY + "=0&" + COUNT_KEY + "="
+ ITEMS_PER_PAGE));
+ getId() + getUrlSuffix(getChannelTabType()) + "?" + START_KEY + "=0&"
+ COUNT_KEY + "=" + ITEMS_PER_PAGE));
}
@Override

38
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelTabLinkHandlerFactory.java
View File

@ -4,8 +4,11 @@ import org.schabi.newpipe.extractor.channel.tabs.ChannelTabs;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.exceptions.UnsupportedTabException;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
import org.schabi.newpipe.extractor.search.filter.FilterItem;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerFactory {
@ -20,15 +23,14 @@ public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerF
}
@Nonnull
public static String getUrlSuffix(@Nonnull final String tab)
public static String getUrlSuffix(@Nonnull final FilterItem tab)
throws UnsupportedTabException {
switch (tab) {
case ChannelTabs.VIDEOS:
return "/videos";
case ChannelTabs.CHANNELS: // only available on accounts
return "/video-channels";
case ChannelTabs.PLAYLISTS: // only available on channels
return "/video-playlists";
if (tab.equals(ChannelTabs.VIDEOS)) {
return "/videos";
} else if (tab.equals(ChannelTabs.CHANNELS)) { // only available on accounts
return "/video-channels";
} else if (tab.equals(ChannelTabs.PLAYLISTS)) { // only available on channels
return "/video-playlists";
}
throw new UnsupportedTabException(tab);
}
@ -39,7 +41,9 @@ public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerF
}
@Override
public String getUrl(final String id, final List<String> contentFilter, final String sortFilter)
public String getUrl(final String id,
@Nonnull final List<FilterItem> contentFilter,
@Nullable final List<FilterItem> sortFilter)
throws ParsingException, UnsupportedOperationException {
return PeertubeChannelLinkHandlerFactory.getInstance().getUrl(id)
+ getUrlSuffix(contentFilter.get(0));
@ -47,11 +51,12 @@ public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerF
@Override
public String getUrl(final String id,
final List<String> contentFilter,
final String sortFilter,
final List<FilterItem> contentFilter,
final List<FilterItem> sortFilter,
final String baseUrl)
throws ParsingException, UnsupportedOperationException {
return PeertubeChannelLinkHandlerFactory.getInstance().getUrl(id, null, null, baseUrl)
return PeertubeChannelLinkHandlerFactory.getInstance()
.getUrl(id, null, null, baseUrl)
+ getUrlSuffix(contentFilter.get(0));
}
@ -59,13 +64,4 @@ public final class PeertubeChannelTabLinkHandlerFactory extends ListLinkHandlerF
public boolean onAcceptUrl(final String url) throws ParsingException {
return PeertubeChannelLinkHandlerFactory.getInstance().onAcceptUrl(url);
}
@Override
public String[] getAvailableContentFilter() {
return new String[] {
ChannelTabs.VIDEOS,
ChannelTabs.CHANNELS,
ChannelTabs.PLAYLISTS,
};
}
}