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

Fix ali

This commit is contained in:
FongMi 2023-02-18 00:28:19 +08:00
parent 2998a23b3f
commit 9cb8495e3e
13 changed files with 49 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -35,6 +35,7 @@ android {
dependencies { dependencies {
//Debug For HTTP/3 //Debug For HTTP/3
debugImplementation 'org.chromium.net:cronet-embedded:101.4951.41' debugImplementation 'org.chromium.net:cronet-embedded:101.4951.41'
implementation 'com.starkbank.ellipticcurve:starkbank-ecdsa:1.0.2'
implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
implementation 'androidx.annotation:annotation:1.5.0' implementation 'androidx.annotation:annotation:1.5.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.13' implementation 'com.squareup.okhttp3:okhttp:3.12.13'

2
app/src/main/java/com/github/catvod/bean/ali/Auth.java
View File

@ -37,7 +37,7 @@ public class Auth {
} }
public String getSignature() { public String getSignature() {
return signature; return TextUtils.isEmpty(signature) ? "" : signature;
} }
public void setSignature(String signature) { public void setSignature(String signature) {

8
app/src/main/java/com/github/catvod/net/OkHttp.java
View File

@ -2,13 +2,17 @@ package com.github.catvod.net;
import com.github.catvod.crawler.Spider; import com.github.catvod.crawler.Spider;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Dns; import okhttp3.Dns;
import okhttp3.Headers;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public class OkHttp { public class OkHttp {
@ -51,6 +55,10 @@ public class OkHttp {
} }
} }
public static Response newCall(String url, Map<String, String> header) throws IOException {
return client().newCall(new Request.Builder().url(url).headers(Headers.of(header)).build()).execute();
}
public static void stringNoRedirect(String url, Map<String, String> header, Map<String, List<String>> respHeader) { public static void stringNoRedirect(String url, Map<String, String> header, Map<String, List<String>> respHeader) {
string(noRedirect(), GET, url, null, null, header, respHeader); string(noRedirect(), GET, url, null, null, header, respHeader);
} }

354
app/src/main/java/com/github/catvod/spider/Ali.java
View File

@ -1,363 +1,55 @@
package com.github.catvod.spider; package com.github.catvod.spider;
import android.app.AlertDialog; import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.ImageView;
import com.github.catvod.ali.API;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Sub; import com.github.catvod.crawler.Spider;
import com.github.catvod.bean.Vod;
import com.github.catvod.bean.ali.Auth;
import com.github.catvod.bean.ali.Data;
import com.github.catvod.bean.ali.Item;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Prefers;
import com.github.catvod.utils.QRCode;
import com.github.catvod.utils.Trans;
import com.github.catvod.utils.Utils;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* @author ColaMint & Adam & FongMi * @author ColaMint & Adam & FongMi
*/ */
public class Ali { public class Ali extends Spider {
public static final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?"); public static final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?");
private ScheduledExecutorService service;
private final Auth auth;
private AlertDialog dialog;
private static class Loader { @Override
static volatile Ali INSTANCE = new Ali(); public void init(Context context, String extend) {
} API.get().setRefreshToken(extend);
public static Ali get() {
return Loader.INSTANCE;
}
public Ali() {
this.auth = new Auth();
}
public Ali init(String token) {
auth.setRefreshToken(Prefers.getString("token", token));
return this;
}
private HashMap<String, String> getHeaders() {
HashMap<String, String> headers = new HashMap<>();
headers.put("User-Agent", Utils.CHROME);
headers.put("Referer", "https://www.aliyundrive.com/");
return headers;
}
private HashMap<String, String> getAuthHeader() {
HashMap<String, String> headers = getHeaders();
headers.put("content-type", "application/json");
headers.put("Authorization", auth.getAccessToken());
headers.put("x-share-token", auth.getShareToken());
return headers;
}
private String post(String url, JSONObject body) {
url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
return OkHttp.postJson(url, body.toString(), getHeaders());
}
private String postAuth(String url, JSONObject body) {
url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
String result = OkHttp.postJson(url, body.toString(), getAuthHeader());
if (check401(result)) return postAuth(url, body);
return result;
}
private boolean check401(String result) {
if (result.contains("AccessTokenInvalid")) return refreshAccessToken();
if (result.contains("ShareLinkTokenInvalid")) return refreshShareToken();
if (result.contains("InvalidParameterNotMatch")) return refreshShareToken();
return false;
} }
@Override
public String detailContent(List<String> ids) throws Exception { public String detailContent(List<String> ids) throws Exception {
String url = ids.get(0).trim(); String url = ids.get(0).trim();
Matcher matcher = pattern.matcher(url); Matcher matcher = pattern.matcher(url);
if (!matcher.find()) return ""; if (!matcher.find()) return "";
String shareId = matcher.group(1); String shareId = matcher.group(1);
String fileId = matcher.groupCount() == 3 ? matcher.group(3) : ""; String fileId = matcher.groupCount() == 3 ? matcher.group(3) : "";
auth.setShareId(shareId); API.get().setShareId(shareId);
refreshShareToken(); return Result.string(API.get().getVod(url, fileId));
return Result.string(getVod(url, fileId));
} }
public String playerContent(String flag, String id) { @Override
public String playerContent(String flag, String id, List<String> vipFlags) {
API.get().checkAccessToken();
String[] ids = id.split("\\+"); String[] ids = id.split("\\+");
if (auth.isEmpty()) refreshAccessToken(); if (flag.equals("原畫")) {
return Result.get().url(getDownloadUrl(ids[0])).subs(getSub(ids)).header(getHeaders()).string(); return Result.get().url(API.get().getDownloadUrl(ids[0])).subs(API.get().getSub(ids)).header(API.get().getHeader()).parse(0).string();
} } else {
return Result.get().url(API.get().getPreviewUrl(ids[0])).subs(API.get().getSub(ids)).header(API.get().getHeader()).parse(0).string();
private Vod getVod(String url, String fileId) throws Exception {
JSONObject body = new JSONObject();
body.put("share_id", auth.getShareId());
String json = post("adrive/v3/share_link/get_share_by_anonymous", body);
JSONObject object = new JSONObject(json);
List<Item> files = new ArrayList<>();
LinkedHashMap<String, List<String>> subMap = new LinkedHashMap<>();
listFiles(new Item(getParentFileId(fileId, object)), files, subMap);
List<String> playUrls = new ArrayList<>();
for (Item file : files) playUrls.add(Trans.get(file.getDisplayName()) + "$" + file.getFileId() + findSubs(file.getName(), subMap));
List<String> sourceUrls = new ArrayList<>();
sourceUrls.add(TextUtils.join("#", playUrls));
sourceUrls.add(TextUtils.join("#", playUrls));
Vod vod = new Vod();
vod.setVodId(url);
vod.setVodContent(url);
vod.setVodPic(object.getString("avatar"));
vod.setVodName(object.getString("share_name"));
vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls));
vod.setVodPlayFrom("原畫");
vod.setTypeName("阿里雲盤");
return vod;
}
private void listFiles(Item folder, List<Item> files, LinkedHashMap<String, List<String>> subMap) throws Exception {
listFiles(folder, files, subMap, "");
}
private void listFiles(Item parent, List<Item> files, LinkedHashMap<String, List<String>> subMap, String marker) throws Exception {
JSONObject body = new JSONObject();
List<Item> folders = new ArrayList<>();
body.put("limit", 200);
body.put("share_id", auth.getShareId());
body.put("parent_file_id", parent.getFileId());
body.put("order_by", "name");
body.put("order_direction", "ASC");
if (marker.length() > 0) body.put("marker", marker);
Item item = Item.objectFrom(postAuth("adrive/v3/file/list", body));
for (Item file : item.getItems()) {
if (file.getType().equals("folder")) {
folders.add(file);
} else if (file.getCategory().equals("video") || file.getCategory().equals("audio")) {
files.add(file.parent(parent.getName()));
} else if (Utils.isSub(file.getExt())) {
String key = file.removeExt();
if (!subMap.containsKey(key)) subMap.put(key, new ArrayList<>());
subMap.get(key).add(key + "@@@" + file.getExt() + "@@@" + file.getFileId());
}
}
if (item.getNextMarker().length() > 0) {
listFiles(parent, files, subMap, item.getNextMarker());
}
for (Item folder : folders) {
listFiles(folder, files, subMap);
} }
} }
private String getParentFileId(String fileId, JSONObject shareInfo) throws Exception { public static Object[] vod(Map<String, String> params) {
JSONArray array = shareInfo.getJSONArray("file_infos"); String type = params.get("type");
if (!TextUtils.isEmpty(fileId)) return fileId; if (type.equals("sub")) return API.get().proxySub(params);
if (array.length() == 0) return ""; if (type.equals("m3u8")) return API.get().proxyM3U8(params);
JSONObject fileInfo = array.getJSONObject(0); if (type.equals("media")) return API.get().proxyMedia(params);
if (fileInfo.getString("type").equals("folder")) return fileInfo.getString("file_id"); return null;
if (fileInfo.getString("type").equals("file") && fileInfo.getString("category").equals("video")) return "root";
return "";
}
private boolean refreshAccessToken() {
try {
JSONObject body = new JSONObject();
String token = auth.getRefreshToken();
if (token.startsWith("http")) token = OkHttp.string(token).replaceAll("[^A-Za-z0-9]", "");
body.put("refresh_token", token);
body.put("grant_type", "refresh_token");
JSONObject object = new JSONObject(post("https://auth.aliyundrive.com/v2/account/token", body));
auth.setUserId(object.getString("user_id"));
auth.setDeviceId(object.getString("device_id"));
auth.setAccessToken(object.getString("token_type") + " " + object.getString("access_token"));
auth.setRefreshToken(object.getString("refresh_token"));
return true;
} catch (Exception e) {
stopService();
auth.clean();
getQRCode();
return true;
} finally {
while (auth.isEmpty()) SystemClock.sleep(250);
}
}
private boolean refreshShareToken() {
try {
JSONObject body = new JSONObject();
body.put("share_id", auth.getShareId());
body.put("share_pwd", "");
JSONObject object = new JSONObject(post("v2/share_link/get_share_token", body));
auth.setShareToken(object.getString("share_token"));
return true;
} catch (Exception e) {
Init.show("來晚啦，該分享已失效。");
e.printStackTrace();
return false;
}
}
private String findSubs(String name, Map<String, List<String>> subMap) {
name = name.substring(0, name.lastIndexOf("."));
List<String> subs = subMap.get(name);
if (subs != null && subs.size() > 0) return combineSubs(subs);
StringBuilder sb = new StringBuilder();
for (Map.Entry<String, List<String>> entry : subMap.entrySet()) sb.append(combineSubs(entry.getValue()));
return sb.toString();
}
private String combineSubs(List<String> subs) {
StringBuilder sb = new StringBuilder();
for (String sub : subs) sb.append("+").append(sub);
return sb.toString();
}
private List<Sub> getSub(String[] ids) {
List<Sub> sub = new ArrayList<>();
for (String text : ids) {
if (!text.contains("@@@")) continue;
String[] split = text.split("@@@");
String name = split[0];
String ext = split[1];
String url = Proxy.getUrl() + "?do=ali&type=sub" + "&file_id=" + split[2];
sub.add(Sub.create().name(name).ext(ext).url(url));
}
return sub;
}
private String getPreviewQuality(JSONArray taskList) throws Exception {
for (String templateId : Arrays.asList("FHD", "HD", "SD", "LD")) {
for (int i = 0; i < taskList.length(); ++i) {
JSONObject task = taskList.getJSONObject(i);
if (task.getString("template_id").equals(templateId)) {
return task.getString("url");
}
}
}
return taskList.getJSONObject(0).getString("url");
}
private String getPreviewUrl(String fileId) {
try {
JSONObject body = new JSONObject();
body.put("file_id", fileId);
body.put("share_id", auth.getShareId());
body.put("template_id", "");
body.put("category", "live_transcoding");
String json = postAuth("v2/file/get_share_link_video_preview_play_info", body);
JSONArray taskList = new JSONObject(json).getJSONObject("video_preview_play_info").getJSONArray("live_transcoding_task_list");
Map<String, List<String>> respHeaders = new HashMap<>();
OkHttp.stringNoRedirect(getPreviewQuality(taskList), getHeaders(), respHeaders);
return OkHttp.getRedirectLocation(respHeaders);
} catch (Exception e) {
e.printStackTrace();
return "";
}
}
private String getDownloadUrl(String fileId) {
try {
JSONObject body = new JSONObject();
body.put("file_id", fileId);
body.put("share_id", auth.getShareId());
body.put("expire_sec", 600);
String json = postAuth("v2/file/get_share_link_download_url", body);
Log.e("DDD", json);
String url = new JSONObject(json).optString("download_url");
Map<String, List<String>> respHeaders = new HashMap<>();
OkHttp.stringNoRedirect(url, getHeaders(), respHeaders);
return OkHttp.getRedirectLocation(respHeaders);
} catch (Exception e) {
e.printStackTrace();
return "";
}
}
public Object[] vod(Map<String, String> params) {
String fileId = params.get("file_id");
String text = OkHttp.string(getDownloadUrl(fileId), getAuthHeader());
Object[] result = new Object[3];
result[0] = 200;
result[1] = "application/octet-stream";
result[2] = new ByteArrayInputStream(text.getBytes());
return result;
}
private void getQRCode() {
Data data = Data.objectFrom(OkHttp.string("https://passport.aliyundrive.com/newlogin/qrcode/generate.do?appName=aliyun_drive&fromSite=52&appName=aliyun_drive&appEntrance=web&isMobile=false&lang=zh_CN&returnUrl=&bizParams=&_bx-v=2.2.3")).getContent().getData();
Init.run(() -> showQRCode(data));
}
private void showQRCode(Data data) {
try {
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Utils.dp2px(240), Utils.dp2px(240));
ImageView image = new ImageView(Init.context());
image.setScaleType(ImageView.ScaleType.CENTER_CROP);
image.setImageBitmap(QRCode.getBitmap(data.getCodeContent(), 240, 2));
FrameLayout frame = new FrameLayout(Init.context());
params.gravity = Gravity.CENTER;
frame.addView(image, params);
dialog = new AlertDialog.Builder(Init.getActivity()).setView(frame).setOnDismissListener(this::dismiss).show();
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
Init.execute(() -> startService(data.getParams()));
Init.show("請使用阿里雲盤 App 掃描二維碼");
} catch (Exception ignored) {
}
}
private void startService(Map<String, String> params) {
service = Executors.newScheduledThreadPool(1);
service.scheduleAtFixedRate(() -> {
Data result = Data.objectFrom(OkHttp.post("https://passport.aliyundrive.com/newlogin/qrcode/query.do?appName=aliyun_drive&fromSite=52&_bx-v=2.2.3", params)).getContent().getData();
if (result.hasToken()) setToken(result.getToken());
}, 1, 1, TimeUnit.SECONDS);
}
private void setToken(String value) {
Prefers.put("token", value);
Init.show("請重新進入播放頁");
auth.setRefreshToken(value);
stopService();
}
private void stopService() {
if (service != null) service.shutdownNow();
Init.run(this::dismiss);
}
private void dismiss(DialogInterface dialog) {
stopService();
}
private void dismiss() {
try {
if (dialog != null) dialog.dismiss();
} catch (Exception ignored) {
}
} }
} }

19
app/src/main/java/com/github/catvod/spider/PanSou.java
View File

@ -1,10 +1,7 @@
package com.github.catvod.spider; package com.github.catvod.spider;
import android.content.Context;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.crawler.Spider;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Utils; import com.github.catvod.utils.Utils;
@ -22,7 +19,7 @@ import java.util.Map;
/** /**
* @author ColaMint & FongMi * @author ColaMint & FongMi
*/ */
public class PanSou extends Spider { public class PanSou extends Ali {
private final String siteUrl = "https://www.alipansou.com"; private final String siteUrl = "https://www.alipansou.com";
@ -34,19 +31,14 @@ public class PanSou extends Spider {
return headers; return headers;
} }
@Override
public void init(Context context, String extend) {
Ali.get().init(extend);
}
@Override @Override
public String detailContent(List<String> ids) throws Exception { public String detailContent(List<String> ids) throws Exception {
if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids); if (pattern.matcher(ids.get(0)).find()) return super.detailContent(ids);
String url = siteUrl + ids.get(0).replace("/s/", "/cv/"); String url = siteUrl + ids.get(0).replace("/s/", "/cv/");
Map<String, List<String>> respHeaders = new HashMap<>(); Map<String, List<String>> respHeaders = new HashMap<>();
OkHttp.stringNoRedirect(url, getHeaders(ids.get(0)), respHeaders); OkHttp.stringNoRedirect(url, getHeaders(ids.get(0)), respHeaders);
url = OkHttp.getRedirectLocation(respHeaders); url = OkHttp.getRedirectLocation(respHeaders);
return Ali.get().detailContent(Arrays.asList(url)); return super.detailContent(Arrays.asList(url));
} }
@Override @Override
@ -72,9 +64,4 @@ public class PanSou extends Spider {
} }
return Result.string(list); return Result.string(list);
} }
@Override
public String playerContent(String flag, String id, List<String> vipFlags) {
return Ali.get().playerContent(flag, id);
}
} }

15
app/src/main/java/com/github/catvod/spider/Paper.java
View File

@ -7,7 +7,6 @@ import com.github.catvod.bean.Filter;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.bean.paper.Data; import com.github.catvod.bean.paper.Data;
import com.github.catvod.crawler.Spider;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Utils; import com.github.catvod.utils.Utils;
@ -27,7 +26,7 @@ import java.util.Map;
/** /**
* @author ColaMint & FongMi * @author ColaMint & FongMi
*/ */
public class Paper extends Spider { public class Paper extends Ali {
private final String url = "https://gitcafe.net/alipaper/"; private final String url = "https://gitcafe.net/alipaper/";
private final String api = "https://gitcafe.net/tool/alipaper/"; private final String api = "https://gitcafe.net/tool/alipaper/";
@ -41,8 +40,8 @@ public class Paper extends Spider {
@Override @Override
public void init(Context context, String extend) { public void init(Context context, String extend) {
super.init(context, extend);
types = Arrays.asList("hyds", "rhds", "omds", "qtds", "hydy", "rhdy", "omdy", "qtdy", "hydm", "rhdm", "omdm", "jlp", "zyp", "jypx", "qtsp"); types = Arrays.asList("hyds", "rhds", "omds", "qtds", "hydy", "rhdy", "omdy", "qtdy", "hydm", "rhdm", "omdm", "jlp", "zyp", "jypx", "qtsp");
Ali.get().init(extend);
} }
@Override @Override
@ -90,11 +89,6 @@ public class Paper extends Spider {
return Result.string(list); return Result.string(list);
} }
@Override
public String detailContent(List<String> ids) throws Exception {
return Ali.get().detailContent(ids);
}
@Override @Override
public String searchContent(String key, boolean quick) { public String searchContent(String key, boolean quick) {
List<Vod> list = new ArrayList<>(); List<Vod> list = new ArrayList<>();
@ -105,9 +99,4 @@ public class Paper extends Spider {
for (Data item : Data.arrayFrom(result)) if (types.contains(item.getCat()) && item.getTitle().contains(key)) list.add(item.getVod()); for (Data item : Data.arrayFrom(result)) if (types.contains(item.getCat()) && item.getTitle().contains(key)) list.add(item.getVod());
return Result.string(list); return Result.string(list);
} }
@Override
public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
return Ali.get().playerContent(flag, id);
}
} }

2
app/src/main/java/com/github/catvod/spider/Proxy.java
View File

@ -18,7 +18,7 @@ public class Proxy extends Spider {
case "ck": case "ck":
return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes("UTF-8"))}; return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes("UTF-8"))};
case "ali": case "ali":
return Ali.get().vod(params); return Ali.vod(params);
default: default:
return null; return null;
} }

13
app/src/main/java/com/github/catvod/spider/Push.java
View File

@ -1,26 +1,19 @@
package com.github.catvod.spider; package com.github.catvod.spider;
import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.crawler.Spider;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class Push extends Spider { public class Push extends Ali {
@Override
public void init(Context context, String extend) {
Ali.get().init(extend);
}
@Override @Override
public String detailContent(List<String> ids) throws Exception { public String detailContent(List<String> ids) throws Exception {
String url = ids.get(0).trim(); String url = ids.get(0).trim();
if (url.contains("aliyundrive")) return Ali.get().detailContent(ids); if (url.contains("aliyundrive")) return super.detailContent(ids);
List<String> playFrom = Arrays.asList("直連", "嗅探", "解析"); List<String> playFrom = Arrays.asList("直連", "嗅探", "解析");
List<String> playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url); List<String> playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url);
Vod vod = create(url); Vod vod = create(url);
@ -31,7 +24,7 @@ public class Push extends Spider {
@Override @Override
public String playerContent(String flag, String id, List<String> vipFlags) { public String playerContent(String flag, String id, List<String> vipFlags) {
if (flag.contains("畫")) return Ali.get().playerContent(flag, id); if (flag.contains("畫")) return super.playerContent(flag, id, vipFlags);
if (flag.equals("嗅探")) return Result.get().parse().url(id).string(); if (flag.equals("嗅探")) return Result.get().parse().url(id).string();
if (flag.equals("解析")) return Result.get().parse().jx().url(id).string(); if (flag.equals("解析")) return Result.get().parse().jx().url(id).string();
return Result.get().url(id).string(); return Result.get().url(id).string();

20
app/src/main/java/com/github/catvod/spider/UpYun.java
View File

@ -1,24 +1,21 @@
package com.github.catvod.spider; package com.github.catvod.spider;
import android.content.Context;
import android.util.Base64; import android.util.Base64;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.bean.upyun.Data; import com.github.catvod.bean.upyun.Data;
import com.github.catvod.bean.upyun.Item; import com.github.catvod.bean.upyun.Item;
import com.github.catvod.crawler.Spider;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Utils; import com.github.catvod.utils.Utils;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class UpYun extends Spider { public class UpYun extends Ali {
private final String siteUrl = "https://www.upyunso.com/"; private final String siteUrl = "https://www.upyunso.com/";
private final String apiUrl = "https://api.upyunso2.com/"; private final String apiUrl = "https://api.upyunso2.com/";
@ -30,16 +27,6 @@ public class UpYun extends Spider {
return headers; return headers;
} }
@Override
public void init(Context context, String extend) {
Ali.get().init(extend);
}
@Override
public String detailContent(List<String> ids) throws Exception {
return Ali.get().detailContent(Arrays.asList(ids.get(0)));
}
@Override @Override
public String searchContent(String key, boolean quick) { public String searchContent(String key, boolean quick) {
String url = apiUrl + "search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2"; String url = apiUrl + "search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2";
@ -48,9 +35,4 @@ public class UpYun extends Spider {
for (Item item : Data.objectFrom(res).getResult().getItems()) if (item.isAli() && item.getTitle().contains(key)) list.add(item.getVod()); for (Item item : Data.objectFrom(res).getResult().getItems()) if (item.isAli() && item.getTitle().contains(key)) list.add(item.getVod());
return Result.string(list); return Result.string(list);
} }
@Override
public String playerContent(String flag, String id, List<String> vipFlags) {
return Ali.get().playerContent(flag, id);
}
} }

20
app/src/main/java/com/github/catvod/spider/YiSo.java
View File

@ -1,6 +1,5 @@
package com.github.catvod.spider; package com.github.catvod.spider;
import android.content.Context;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import android.webkit.WebView; import android.webkit.WebView;
@ -8,32 +7,15 @@ import android.webkit.WebViewClient;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.yiso.Item; import com.github.catvod.bean.yiso.Item;
import com.github.catvod.crawler.Spider;
import com.github.catvod.utils.Utils; import com.github.catvod.utils.Utils;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
public class YiSo extends Spider { public class YiSo extends Ali {
@Override
public void init(Context context, String extend) {
Ali.get().init(extend);
}
@Override
public String detailContent(List<String> ids) throws Exception {
return Ali.get().detailContent(ids);
}
@Override
public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
return Ali.get().playerContent(flag, id);
}
@Override @Override
public String searchContent(String key, boolean quick) { public String searchContent(String key, boolean quick) {

14
app/src/main/java/com/github/catvod/spider/Zhaozy.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.crawler.Spider;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Utils; import com.github.catvod.utils.Utils;
@ -21,7 +20,7 @@ import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class Zhaozy extends Spider { public class Zhaozy extends Ali {
private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)"); private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)");
private final Pattern regexVid = Pattern.compile("(\\S+)"); private final Pattern regexVid = Pattern.compile("(\\S+)");
@ -55,24 +54,19 @@ public class Zhaozy extends Spider {
@Override @Override
public void init(Context context, String extend) { public void init(Context context, String extend) {
String[] split = extend.split("\\$\\$\\$"); String[] split = extend.split("\\$\\$\\$");
Ali.get().init(split[0]); super.init(context, split[0]);
username = split[1]; username = split[1];
password = split[2]; password = split[2];
} }
@Override @Override
public String detailContent(List<String> ids) throws Exception { public String detailContent(List<String> ids) throws Exception {
if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids); if (pattern.matcher(ids.get(0)).find()) return super.detailContent(ids);
Matcher matcher = regexAli.matcher(OkHttp.string(siteUrl + ids.get(0), getHeader())); Matcher matcher = regexAli.matcher(OkHttp.string(siteUrl + ids.get(0), getHeader()));
if (matcher.find()) return Ali.get().detailContent(Arrays.asList(matcher.group(1))); if (matcher.find()) return super.detailContent(Arrays.asList(matcher.group(1)));
return ""; return "";
} }
@Override
public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
return Ali.get().playerContent(flag, id);
}
@Override @Override
public String searchContent(String key, boolean quick) throws Exception { public String searchContent(String key, boolean quick) throws Exception {
String url = siteUrl + "so?filename=" + URLEncoder.encode(key); String url = siteUrl + "so?filename=" + URLEncoder.encode(key);

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
029605ba89c58f14982a8aa1665cbeef a6131c24d26ebf307dd82c75ef91591f