Update sort

This commit is contained in:
FongMi 2023-04-25 15:55:52 +08:00
parent 2c43747f29
commit 4dc079b93c
4 changed files with 14 additions and 14 deletions

View File

@ -15,9 +15,13 @@ public class Sorter implements Comparator<Item> {
@Override @Override
public int compare(Item o1, Item o2) { public int compare(Item o1, Item o2) {
try { 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) { } catch (NumberFormatException e) {
return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName()); return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
} }
} }
private int getDigit(String text) throws NumberFormatException {
return Integer.parseInt(Utils.removeExt(text).replaceAll("\\D+", ""));
}
} }

View File

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

Binary file not shown.

View File

@ -1 +1 @@
31931cd4ecb016c3263b041528b132ad 1da9b9d6b4241ada175c741d4b4b9cf9