Skip to content

refactor: simplify Bilibili URL construction #55

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: simplify Bilibili URL construction #55

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
2 changes: 1 addition & 1 deletion ...ipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public String getName() throws ParsingException {

@Override
public String getUrl() throws ParsingException {
return "https://www.bilibili.com/video/" + item.getString("bvid") + "?p=1";
return "https://www.bilibili.com/video/" + item.getString("bvid");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ewpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public String getName() throws ParsingException {

@Override
public String getUrl() throws ParsingException {
return "https://www.bilibili.com/video/" + item.getString("bvid") + "?p=1";
return "https://www.bilibili.com/video/" + item.getString("bvid");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...pe/extractor/services/bilibili/extractors/BilibiliRecommendedVideosInfoItemExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public String getName() throws ParsingException {

@Override
public String getUrl() throws ParsingException {
return item.getString("uri") + "?p=1";
return item.getString("uri");
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...habi/newpipe/extractor/services/bilibili/extractors/BilibiliRelatedInfoItemExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import java.util.Date;
import java.util.Objects;

import static org.schabi.newpipe.extractor.services.bilibili.utils.createUrlWithPage;

public class BilibiliRelatedInfoItemExtractor implements StreamInfoItemExtractor {

protected final JsonObject item;
Expand Down Expand Up @@ -51,7 +53,7 @@ public String getName() throws ParsingException {

@Override
public String getUrl() throws ParsingException {
return "https://www.bilibili.com/video/" + id + "?p=" + p;
return createUrlWithPage("https://www.bilibili.com/video/" + id, p);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...abi/newpipe/extractor/services/bilibili/extractors/BilibiliTrendingInfoItemExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public String getName() throws ParsingException {

@Override
public String getUrl() throws ParsingException {
return "https://www.bilibili.com/video/" + item.getString("bvid") + "?p=1";
return "https://www.bilibili.com/video/" + item.getString("bvid");
}

@Override
Expand Down
9 changes: 5 additions & 4 deletions ...abi/newpipe/extractor/services/bilibili/linkHandler/BilibiliStreamLinkHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.schabi.newpipe.extractor.services.bilibili.utils;

import static org.schabi.newpipe.extractor.services.bilibili.BilibiliService.LIVE_BASE_URL;
import static org.schabi.newpipe.extractor.services.bilibili.utils.createUrlWithPage;

/*
General form of stream link url: https://m.bilibili.com/video/<ID> (mobile) and https://www.bilibili.com/video/<ID> (PC)
Expand Down Expand Up @@ -48,16 +49,16 @@ public String getId(String url) throws ParsingException {

if (url.split("/")[url.split("/").length - 1].startsWith("BV")) {
String parseResult = url.split(Pattern.quote("/BV"))[1].split("\\?")[0].split("/")[0];
url = "BV" + parseResult + "?p=" + p;
url = createUrlWithPage("BV" + parseResult, p);
} else if (url.contains("bvid=")) {
String parseResult = url.split(Pattern.quote("bvid="))[1].split("&")[0];
url = parseResult + "?p=" + p;
url = createUrlWithPage(parseResult, p);
} else if (url.split("/")[url.split("/").length - 1].startsWith("av")) {
String parseResult = url.split(Pattern.quote("av"))[1].split("\\?")[0];
url = utils.av2bv(Long.parseLong(parseResult)) + "?p=" + p;
url = createUrlWithPage(utils.av2bv(Long.parseLong(parseResult)), p);
} else if (url.contains("aid=")) {
String parseResult = url.split(Pattern.quote("aid="))[1].split("&")[0];
url = utils.av2bv(Long.parseLong(parseResult)) + "?p=" + p;
url = createUrlWithPage(utils.av2bv(Long.parseLong(parseResult)), p);
} else if (url.contains(LIVE_BASE_URL) || url.contains("bangumi/play/")) {
url = url.split("/")[url.split("/").length - 1].split("\\?")[0];
} else {
Expand Down
4 changes: 4 additions & 0 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ private static String getMixinKey(String ae) {
return le.substring(0, 32);
}

public static String createUrlWithPage(String url, String p) {
return p.equals("1") ? url : (url + "?p=" + p);
}

public static String formatParamWithPercentSpace(String value) {
try {
return URLEncoder.encode(value, StandardCharsets.UTF_8.name()).replace("+", "%20");
Expand Down