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-14 12:28:56 +00:00
parent 87de8ad14e d874b760fd
commit f1317607b1
6 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/catvod/ali/API.java
View File

@ -20,7 +20,6 @@ import com.github.catvod.bean.ali.Code;
import com.github.catvod.bean.ali.Data;
import com.github.catvod.bean.ali.Item;
import com.github.catvod.bean.ali.OAuth;
import com.github.catvod.bean.ali.Sorter;
import com.github.catvod.bean.ali.User;
import com.github.catvod.crawler.SpiderDebug;
import com.github.catvod.net.OkHttp;
@ -120,6 +119,7 @@ public class API {
HashMap<String, String> headers = getHeader();
headers.put("authorization", user.getAuthorization());
headers.put("x-share-token", shareToken);
headers.put("X-Canary", "client=Android,app=adrive,version=v4.3.1");
return headers;
}
@ -267,7 +267,6 @@ public class API {
List<String> playFrom = Arrays.asList("原畫", "超清", "高清");
List<String> episode = new ArrayList<>();
List<String> playUrl = new ArrayList<>();
Sorter.sort(files);
for (Item file : files) episode.add(file.getDisplayName() + "$" + file.getFileId() + findSubs(file.getName(), subMap));
for (int i = 0; i < playFrom.size(); i++) playUrl.add(TextUtils.join("#", episode));
Vod vod = new Vod();

27
app/src/main/java/com/github/catvod/bean/ali/Sorter.java
View File

@ -1,27 +0,0 @@
package com.github.catvod.bean.ali;
import com.github.catvod.utils.Utils;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class Sorter implements Comparator<Item> {
public static void sort(List<Item> items) {
Collections.sort(items, new Sorter());
}
@Override
public int compare(Item o1, Item o2) {
try {
return Integer.compare(getDigit(o1.getDisplayName()), getDigit(o2.getDisplayName()));
} catch (NumberFormatException e) {
return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
}
}
private int getDigit(String text) throws NumberFormatException {
return Integer.parseInt(Utils.removeExt(text).replace("1080P", "").replace("4K", "").replaceAll("\\D+", ""));
}
}

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
836941085af643869ef5e0d9dce6d301
ecddb20dad437ff099b1e777bc5545ab

2
json/adult.json
View File

@ -1,5 +1,5 @@
{
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;836941085af643869ef5e0d9dce6d301",
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ecddb20dad437ff099b1e777bc5545ab",
"wallpaper": "https://gao.chuqiuyu.tk",
"sites": [
{

2
json/config.json
View File

@ -1,5 +1,5 @@
{
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;836941085af643869ef5e0d9dce6d301",
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ecddb20dad437ff099b1e777bc5545ab",
"wallpaper": "http://饭太硬.ga/深色壁纸/api.php",
"sites": [
{