From c51ee2e1efdaa2b954ccdef8cea2e67544dd0d60 Mon Sep 17 00:00:00 2001 From: yangqiang3504 <412594121@qq.com> Date: Thu, 1 Sep 2022 17:29:27 +0800 Subject: [PATCH] add - bili9990 --- .../com/github/catvod/spider/PushAgent.java | 89 +++++++++++++++++-- .../catvod/utils/okhttp/OkHttpUtil.java | 34 +++---- 2 files changed, 92 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/github/catvod/spider/PushAgent.java b/app/src/main/java/com/github/catvod/spider/PushAgent.java index b27c0b2..334a2fd 100644 --- a/app/src/main/java/com/github/catvod/spider/PushAgent.java +++ b/app/src/main/java/com/github/catvod/spider/PushAgent.java @@ -46,7 +46,7 @@ public class PushAgent extends Spider { @Override public void init(Context context, String extend) { super.init(context, extend); - if(extend!=null&&!extend.equals("")) getToken(Token); + fetchRule(false,0); } public void getToken(String token){ @@ -201,7 +201,6 @@ public class PushAgent extends Spider { } - private static HashMap Headers() { HashMap headers = new HashMap<>(); headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.54 Safari/537.36"); @@ -217,7 +216,7 @@ public class PushAgent extends Spider { } - private static void refreshTk() { + private void refreshTk() { long b = Time(); String str = j; if (str.isEmpty() || StopRefresh - b <= 600) { @@ -237,12 +236,12 @@ public class PushAgent extends Spider { long j2 = jSONObject3.getLong("expires_in"); StopRefresh = b + j2; } catch (Exception e) { + fetchRule(false,0); SpiderDebug.log(e); } } } - private static String VideoDetail(String shareid, String token, String fileid) { int i; try { @@ -357,8 +356,9 @@ public class PushAgent extends Spider { if (replace.length() > 20) { replace = replace.substring(0, 10) + "..." + replace.substring(replace.length() - 10); } + String category = jSONObject3.getString("category"); String fileIds = jSONObject3.getString("file_id"); - map.put(replace, str + "+" + str2 + "+" + fileIds); + map.put(replace, str + "+" + str2 + "+" + fileIds+ "+" + category); } } i2++; @@ -379,7 +379,7 @@ public class PushAgent extends Spider { } } - public String getAliContent(List list,String pic,JSONObject jSONObject6) { + public String getAliContent(List list,JSONObject jSONObject6) { String str; try { String url = list.get(0).trim(); @@ -432,7 +432,7 @@ public class PushAgent extends Spider { jSONObject6.put("vod_id", url); String string3 = jSONObject3.getString("share_name"); jSONObject6.put("vod_name", string3); - jSONObject6.put("vod_play_from", "AliYun"); + jSONObject6.put("vod_play_from", "AliYun$$$原画"); ArrayList arrayList = new ArrayList(); String string4 = jSONObject4.getString("type"); if (!string4.equals("folder")) { @@ -463,7 +463,9 @@ public class PushAgent extends Spider { ArrayList arrayList3 = new ArrayList(); for (int i2 = 0; i2 < 4; i2++) { String join = TextUtils.join("#", arrayList); + String join4 = TextUtils.join("#", arrayList); arrayList3.add(join); + arrayList3.add(join4); } String join2 = TextUtils.join("$$$", arrayList3); jSONObject6.put("vod_play_url", join2); @@ -628,7 +630,7 @@ public class PushAgent extends Spider { result.put("list", lists); return result.toString(); } else if (url.startsWith("http") && (matcher2.find())) { - return getAliContent(list,pic,vodAtom); + return getAliContent(list,vodAtom); } else if (url.startsWith("http") && (!matcher.find()) && (!matcher2.find())) { Document doc = null; String baseUrl = url.replaceAll("(^https?://.*?)(:\\d+)?/.*$", "$1");//https://www.dyk9.com @@ -833,6 +835,23 @@ public class PushAgent extends Spider { result.put("url", url); result.put("header", ""); return result.toString(); + case "原画": { + refreshTk(); + split = id.split("\\+"); + String DownLoadUrl = downLoadUrl(split[0], split[1], split[2], split[3]); + HashMap hashMap = new HashMap(); + OkHttpUtil.stringNoRedirect(DownLoadUrl,Headers(),hashMap); + url= OkHttpUtil.getRedirectLocation(hashMap); + JSONObject jSONObject4 = new JSONObject(); + jSONObject4.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.54 Safari/537.36"); + jSONObject4.put("Referer", "https://www.aliyundrive.com/"); + JSONObject jSONObject = new JSONObject(); + jSONObject.put("parse", "0"); + jSONObject.put("playUrl", ""); + jSONObject.put("url", url); + jSONObject.put("header",jSONObject4.toString()); + return jSONObject.toString(); + } } if(flag.startsWith("嗅探")){ result.put("parse", 1); @@ -848,4 +867,58 @@ public class PushAgent extends Spider { return ""; } + private static String downLoadUrl(String shareid, String token, String fileid, String type) { + try { + HashMap z = Headers(); + z.put("x-share-token", token); + z.put("authorization", j); + if (type.equals("video")) { + JSONObject jSONObject = new JSONObject(); + jSONObject.put("share_id", shareid); + jSONObject.put("category", "live_transcoding"); + jSONObject.put("file_id", fileid); + jSONObject.put("template_id", ""); + JSONObject jSONObject2 = new JSONObject(Post("https://api.aliyundrive.com/v2/file/get_share_link_video_preview_play_info", jSONObject.toString(), z)); + shareid = jSONObject2.getString("share_id"); + fileid = jSONObject2.getString("file_id"); + } + JSONObject jSONObject3 = new JSONObject(); + if (type.equals("video")) { + jSONObject3.put("expire_sec", 600); + jSONObject3.put("file_id", fileid); + jSONObject3.put("share_id", shareid); + } + if (type.equals("audio")) { + jSONObject3.put("share_id", shareid); + jSONObject3.put("get_audio_play_info", true); + jSONObject3.put("file_id", fileid); + } + return new JSONObject(Post("https://api.aliyundrive.com/v2/file/get_share_link_download_url", jSONObject3.toString(), z)).getString("download_url"); + } catch (Exception e) { + SpiderDebug.log(e); + return ""; + } + } + + //修复软件不支持的格式无法嗅探的问题 + @Override + public boolean manualVideoCheck() { + return true; + } + + private String[] videoFormatList = new String[]{".m3u8", ".mp4", ".mpeg", ".flv", ".m4a",".mp3",".wma",".wmv"}; + + @Override + public boolean isVideoFormat(String url) { + url = url.toLowerCase(); + if (url.contains("=http") || url.contains("=https%3a%2f") || url.contains("=http%3a%2f")) { + return false; + } + for (String format : videoFormatList) { + if (url.contains(format)) { + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/utils/okhttp/OkHttpUtil.java b/app/src/main/java/com/github/catvod/utils/okhttp/OkHttpUtil.java index 346cff5..29cde95 100644 --- a/app/src/main/java/com/github/catvod/utils/okhttp/OkHttpUtil.java +++ b/app/src/main/java/com/github/catvod/utils/okhttp/OkHttpUtil.java @@ -1,18 +1,12 @@ package com.github.catvod.utils.okhttp; import com.github.catvod.crawler.SpiderDebug; - import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import okhttp3.Call; -import okhttp3.Cookie; -import okhttp3.CookieJar; -import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Response; @@ -21,7 +15,7 @@ public class OkHttpUtil { public static final String METHOD_GET = "GET"; public static final String METHOD_POST = "POST"; - private static final int DEFAULT_TIMEOUT = 15; + private static final int DEFAULT_TIMEOUT = 25; private static final Object lockO = new Object(); @@ -32,24 +26,10 @@ public class OkHttpUtil { */ private static OkHttpClient noRedirectClient = null; - public static HashMap> cookieStore = new HashMap<>(); - public static OkHttpClient defaultClient() { synchronized (lockO) { if (defaultClient == null) { OkHttpClient.Builder builder = new OkHttpClient.Builder() - .cookieJar(new CookieJar() { - @Override - public void saveFromResponse(HttpUrl httpUrl, List list) { - cookieStore.put(httpUrl.host(), list); - } - - @Override - public List loadForRequest(HttpUrl httpUrl) { - List cookies = cookieStore.get(httpUrl.host()); - return cookies != null ? cookies : new ArrayList<>(); - } - }) .readTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .writeTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) @@ -79,6 +59,14 @@ public class OkHttpUtil { } public static String string(OkHttpClient client, String url, String tag, Map paramsMap, Map headerMap, Map> respHeaderMap) { + return req(METHOD_GET, client, url, tag, paramsMap, headerMap, respHeaderMap); + } + + public static String stringPost(OkHttpClient client, String url, String tag, Map paramsMap, Map headerMap, Map> respHeaderMap) { + return req(METHOD_POST, client, url, tag, paramsMap, headerMap, respHeaderMap); + } + + public static String req(String reqType,OkHttpClient client, String url, String tag, Map paramsMap, Map headerMap, Map> respHeaderMap) { OKCallBack stringCallback = new OKCallBack() { @Override public String onParseResponse(Call call, Response response) { @@ -103,7 +91,7 @@ public class OkHttpUtil { public void onResponse(String response) { } }; - OKRequest req = new OKRequest(METHOD_GET, url, paramsMap, headerMap, stringCallback); + OKRequest req = new OKRequest(reqType, url, paramsMap, headerMap, stringCallback); req.setTag(tag); req.execute(client); return stringCallback.getResult(); @@ -216,4 +204,4 @@ public class OkHttpUtil { return headers.get("Location").get(0); return null; } -} \ No newline at end of file +}