Skip to content

fix(bilibili): correctly extract video owner names #54

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

Open
skbeh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(bilibili): correctly extract video owner names #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...a/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void collectVideos(
JsonArray results
) throws ParsingException {
for (int i = 0; i < results.size(); i++) {
collector.commit(new BilibiliChannelInfoItemClientAPIExtractor(results.getObject(i), extractor.getName(), extractor.getAvatarUrl()));
collector.commit(new BilibiliChannelInfoItemClientAPIExtractor(results.getObject(i), extractor.getAvatarUrl()));
}
}

Expand Down Expand Up @@ -312,7 +312,7 @@ public void collectVideos(
JsonArray results
) throws ParsingException {
for (int i = 0; i < results.size(); i++) {
collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), extractor.getName(), extractor.getAvatarUrl()));
collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), null, null));
}
}

Expand Down
8 changes: 3 additions & 5 deletions ...ipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@
public class BilibiliChannelInfoItemClientAPIExtractor implements StreamInfoItemExtractor {

protected final JsonObject item;
public String name;
public String face;
private final String face;

public BilibiliChannelInfoItemClientAPIExtractor(final JsonObject json, String name, String face) {
public BilibiliChannelInfoItemClientAPIExtractor(final JsonObject json, String face) {
item = json;
this.name = name;
this.face = face;
}

Expand Down Expand Up @@ -64,7 +62,7 @@ public long getViewCount() throws ParsingException {

@Override
public String getUploaderName() throws ParsingException {
return name;
return item.getString("author");
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ewpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
public class BilibiliChannelInfoItemWebAPIExtractor implements StreamInfoItemExtractor {

protected final JsonObject item;
public String name;
public String face;
private final String name;
private final String face;

public BilibiliChannelInfoItemWebAPIExtractor(final JsonObject json, String name, String face) {
item = json;
Expand Down Expand Up @@ -63,7 +63,7 @@ public long getViewCount() throws ParsingException {

@Override
public String getUploaderName() throws ParsingException {
return name;
return Optional.of(item.getString("author")).orElse(name);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion .../org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliPlaylistExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public InfoItemsPage<StreamInfoItem> getPage(Page page) throws IOException, Extr
}
final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
for (int i = 0; i < results.size(); i++) {
collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), page.getUrl().split("username=")[1], null));
collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), getUploaderName(), getUploaderAvatarUrl()));
}
return new InfoItemsPage<>(collector, new Page(utils.getNextPageFromCurrentUrl(page.getUrl(), type.equals("seasons_archives") ? "page_num" : "pn", 1), getDefaultCookies()));
}
Expand Down