kavin/NewPipeExtractor
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor.git synced 2025-01-09 19:10:33 +05:30
Code Issues Projects Releases Wiki Activity

Only display direct replies as replies

Browse Source
This commit is contained in:
TobiGr 2022-12-03 16:29:52 +01:00
parent e33fa926dd
commit d41a4a1350
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsExtractor.java
View File

@ -64,13 +64,15 @@ public class SoundcloudCommentsExtractor extends CommentsExtractor {
final CommentsInfoItemsCollector collector = new CommentsInfoItemsCollector( final CommentsInfoItemsCollector collector = new CommentsInfoItemsCollector(
getServiceId()); getServiceId());
// Replies typically do not have a next page, but that's not always the case.
final boolean hasNextPage;
if (page.hasContent()) { if (page.hasContent()) {
// This page contains the whole previously fetched comments. // This page contains the whole previously fetched comments.
// We need to get the comments which are replies to the comment with the page's id. // We need to get the comments which are replies to the comment with the page's id.
json = (JsonObject) page.getContent(); json = (JsonObject) page.getContent();
try { try {
final int commentId = Integer.parseInt(page.getId()); final int commentId = Integer.parseInt(page.getId());
collectRepliesFrom(collector, json, commentId, page.getUrl()); hasNextPage = collectRepliesFrom(collector, json, commentId, page.getUrl());
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
throw new ParsingException("Got invalid comment id", e); throw new ParsingException("Got invalid comment id", e);
} }
@ -81,13 +83,18 @@ public class SoundcloudCommentsExtractor extends CommentsExtractor {
try { try {
json = JsonParser.object().from(response.responseBody()); json = JsonParser.object().from(response.responseBody());
hasNextPage = json.has("next_href");
} catch (final JsonParserException e) { } catch (final JsonParserException e) {
throw new ParsingException("Could not parse json", e); throw new ParsingException("Could not parse json", e);
} }
collectStreamsFrom(collector, json); collectStreamsFrom(collector, json);
} }
if (hasNextPage) {
return new InfoItemsPage<>(collector, new Page(json.getString("next_href"))); return new InfoItemsPage<>(collector, new Page(json.getString("next_href")));
} else {
return new InfoItemsPage<>(collector, null);
}
} }
@Override @Override
@ -108,12 +115,13 @@ public class SoundcloudCommentsExtractor extends CommentsExtractor {
} }
} }
private void collectRepliesFrom(final CommentsInfoItemsCollector collector, private boolean collectRepliesFrom(final CommentsInfoItemsCollector collector,
final JsonObject json, final JsonObject json,
final int id, final int id,
final String url) throws ParsingException { final String url) throws ParsingException {
JsonObject originalComment = null; JsonObject originalComment = null;
final JsonArray entries = json.getArray(COLLECTION); final JsonArray entries = json.getArray(COLLECTION);
boolean moreReplies = false;
for (int i = 0; i < entries.size(); i++) { for (int i = 0; i < entries.size(); i++) {
final JsonObject comment = entries.getObject(i); final JsonObject comment = entries.getObject(i);
if (comment.getInt("id") == id) { if (comment.getInt("id") == id) {
@ -123,10 +131,15 @@ public class SoundcloudCommentsExtractor extends CommentsExtractor {
if (originalComment != null if (originalComment != null
&& SoundcloudParsingHelper.isReplyTo(originalComment, comment)) { && SoundcloudParsingHelper.isReplyTo(originalComment, comment)) {
collector.commit(new SoundcloudCommentsInfoItemExtractor( collector.commit(new SoundcloudCommentsInfoItemExtractor(
json, i, entries.getObject(i), url)); json, i, entries.getObject(i), url, originalComment));
// There might be more replies to the originalComment,
// especially if the original comment is at the end of the list.
if (i == entries.size() - 1 && json.has("next_href")) {
moreReplies = true;
} }
} }
} }
return moreReplies;
}
} }

3
extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/linkHandler/SoundcloudCommentsLinkHandlerFactory.java
View File

@ -15,7 +15,8 @@ public final class SoundcloudCommentsLinkHandlerFactory extends ListLinkHandlerF
private static final SoundcloudCommentsLinkHandlerFactory INSTANCE = private static final SoundcloudCommentsLinkHandlerFactory INSTANCE =
new SoundcloudCommentsLinkHandlerFactory(); new SoundcloudCommentsLinkHandlerFactory();
private static final String OFFSET_PATTERN = "https://api-v2.soundcloud.com/tracks/([0-9a-z]+)/comments?([0-9a-z/&])?offset=([0-9])+" private static final String OFFSET_PATTERN = "https://api-v2.soundcloud.com/tracks/"
+ "([0-9a-z]+)/comments?([0-9a-z/&])?offset=([0-9])+";
private SoundcloudCommentsLinkHandlerFactory() { private SoundcloudCommentsLinkHandlerFactory() {
} }