dongge
/
CatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/FongMi/CatVodSpider

This commit is contained in:
GH Action - Upstream Sync 2023-05-25 12:33:03 +00:00
parent efe2edacf9 cb32ca593a
commit 13b175b30a
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/github/catvod/spider/Bili.java
View File

@ -44,23 +44,43 @@ public class Bili extends Spider {
private String extend; private String extend;
private boolean login; private boolean login;
private String getCookie(String cookie) { private String getCookie() {
String cache = Prefers.getString("BiliCookie"); String cache = Prefers.getString("BiliCookie");
if (!TextUtils.isEmpty(cache)) return cache; if (!TextUtils.isEmpty(cache)) return cache;
if (cookie.startsWith("http")) return OkHttp.string(cookie).replace("\n", "").trim(); if (!ext.optString("cookie").isEmpty()) {
return cookie.isEmpty() ? "buvid3=84B0395D-C9F2-C490-E92E-A09AB48FE26E71636infoc" : cookie; if (ext.optString("cookie").startsWith("http")) return OkHttp.string(ext.optString("cookie")).replace("\n", "").trim();
return ext.optString("cookie");
}
return "buvid3=84B0395D-C9F2-C490-E92E-A09AB48FE26E71636infoc";
} }
private void setHeader() { private void setHeader() {
header.put("cookie", getCookie(ext.optString("cookie"))); header.put("cookie", getCookie());
header.put("Referer", "https://www.bilibili.com"); header.put("Referer", "https://www.bilibili.com");
header.put("User-Agent", Utils.CHROME); header.put("User-Agent", Utils.CHROME);
} }
private void fetchRule() throws Exception { private void fetchRule() throws Exception {
if (header.containsKey("cookie") && header.get("cookie").length() > 0) return; if (header.containsKey("cookie") && header.get("cookie").length() > 0) return;
if (extend.startsWith("http")) extend = OkHttp.string(extend); if (extend.startsWith("http")) {
extend = OkHttp.string(extend);
ext = new JSONObject(extend); ext = new JSONObject(extend);
} else {
JSONArray newFilter = new JSONArray("[{\"key\":\"order\",\"name\":\"排序\",\"value\":[{\"n\":\"综合排序\",\"v\":\"0\"},{\"n\":\"最多点击\",\"v\":\"click\"},{\"n\":\"最新发布\",\"v\":\"pubdate\"},{\"n\":\"最多弹幕\",\"v\":\"dm\"},{\"n\":\"最多收藏\",\"v\":\"stow\"}]},{\"key\":\"duration\",\"name\":\"时长\",\"value\":[{\"n\":\"全部时长\",\"v\":\"0\"},{\"n\":\"60分钟以上\",\"v\":\"4\"},{\"n\":\"30~60分钟\",\"v\":\"3\"},{\"n\":\"10~30分钟\",\"v\":\"2\"},{\"n\":\"10分钟以下\",\"v\":\"1\"}]}]");
String[] typeC = extend.split("#");
JSONArray classes = new JSONArray();
JSONObject filters = new JSONObject();
for (String kk : typeC) {
JSONObject c = new JSONObject();
c.put("type_name", kk);
c.put("type_id", kk);
classes.put(c);
filters.put(kk, newFilter);
}
ext = new JSONObject();
ext.put("classes", classes);
ext.put("filter", filters);
}
setHeader(); setHeader();
} }
@ -84,12 +104,12 @@ public class Bili extends Spider {
@Override @Override
public String homeVideoContent() throws Exception { public String homeVideoContent() throws Exception {
fetchRule(); fetchRule();
return categoryContent("窗 白噪音", "1", true, new HashMap<>()); return categoryContent(ext.optJSONArray("classes").optJSONObject(0).optString("type_id"), "1", true, new HashMap<>());
} }
@Override @Override
public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception { public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
String duration = extend.containsKey("duration") ? extend.get("duration") : "0"; String duration = extend.containsKey("duration") ? extend.get("duration") : "4";
if (extend.containsKey("tid")) tid = tid + " " + extend.get("tid"); if (extend.containsKey("tid")) tid = tid + " " + extend.get("tid");
String url = "https://api.bilibili.com/x/web-interface/search/type?search_type=video&keyword=" + URLEncoder.encode(tid) + "&duration=" + duration + "&page=" + pg; String url = "https://api.bilibili.com/x/web-interface/search/type?search_type=video&keyword=" + URLEncoder.encode(tid) + "&duration=" + duration + "&page=" + pg;
JSONObject resp = new JSONObject(OkHttp.string(url, header)); JSONObject resp = new JSONObject(OkHttp.string(url, header));

3
json/adult.json
View File

@ -547,7 +547,8 @@
{ {
"name": "非凡廣告", "name": "非凡廣告",
"hosts": [ "hosts": [
"vip.ffzy" "vip.ffzy",
"hd.ffzy"
], ],
"regex": [ "regex": [
"#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:6.666667,[\\s\\S]*?#EXT-X-DISCONTINUITY" "#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:6.666667,[\\s\\S]*?#EXT-X-DISCONTINUITY"