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

Update sort

This commit is contained in:
FongMi 2023-04-25 15:55:52 +08:00
parent 2bd878bf0c
commit b86e21d976
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,13 @@ public class Sorter implements Comparator<Item> {
@Override
public int compare(Item o1, Item o2) {
try {
return Integer.valueOf(Utils.removeExt(o1.getDisplayName())).compareTo(Integer.valueOf(Utils.removeExt(o2.getDisplayName())));
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).replaceAll("\\D+", ""));
}
}

12
app/src/main/java/com/github/catvod/utils/Utils.java
View File

@ -10,7 +10,6 @@ import android.webkit.ValueCallback;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.github.catvod.crawler.SpiderDebug;
import com.github.catvod.spider.Init;
import java.math.BigInteger;
@ -56,19 +55,16 @@ public class Utils {
}
public static String fixUrl(String base, String src) {
try {
if (src.startsWith("//")) {
Uri parse = Uri.parse(base);
src = parse.getScheme() + ":" + src;
return parse.getScheme() + ":" + src;
} else if (!src.contains("://")) {
Uri parse = Uri.parse(base);
src = parse.getScheme() + "://" + parse.getHost() + src;
}
} catch (Exception e) {
SpiderDebug.log(e);
}
return parse.getScheme() + "://" + parse.getHost() + src;
} else {
return src;
}
}
public static String removeExt(String text) {
return text.contains(".") ? text.substring(0, text.lastIndexOf(".")) : text;

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
31931cd4ecb016c3263b041528b132ad
1da9b9d6b4241ada175c741d4b4b9cf9

2
json/adult.json
View File

@ -1,5 +1,5 @@
{
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;31931cd4ecb016c3263b041528b132ad",
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1da9b9d6b4241ada175c741d4b4b9cf9",
"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;31931cd4ecb016c3263b041528b132ad",
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1da9b9d6b4241ada175c741d4b4b9cf9",
"wallpaper": "http://饭太硬.ga/深色壁纸/api.php",
"sites": [
{