Add ali sort
This commit is contained in:
parent
0bede9d7ee
commit
5bbdb7b036
|
|
@ -17,6 +17,7 @@ import com.github.catvod.bean.ali.Code;
|
||||||
import com.github.catvod.bean.ali.Data;
|
import com.github.catvod.bean.ali.Data;
|
||||||
import com.github.catvod.bean.ali.Item;
|
import com.github.catvod.bean.ali.Item;
|
||||||
import com.github.catvod.bean.ali.OAuth;
|
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.bean.ali.User;
|
||||||
import com.github.catvod.crawler.SpiderDebug;
|
import com.github.catvod.crawler.SpiderDebug;
|
||||||
import com.github.catvod.net.OkHttp;
|
import com.github.catvod.net.OkHttp;
|
||||||
|
|
@ -253,16 +254,8 @@ public class API {
|
||||||
List<String> playFrom = Arrays.asList("原畫", "超清", "高清");
|
List<String> playFrom = Arrays.asList("原畫", "超清", "高清");
|
||||||
List<String> episode = new ArrayList<>();
|
List<String> episode = new ArrayList<>();
|
||||||
List<String> playUrl = 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 (Item file : files) episode.add(file.getDisplayName() + "$" + file.getFileId() + findSubs(file.getName(), subMap));
|
||||||
Collections.sort(episode, (o1, o2) -> {
|
|
||||||
try {
|
|
||||||
Integer a = Integer.valueOf(o1.split("\\.")[0]);
|
|
||||||
Integer b = Integer.valueOf(o2.split("\\.")[0]);
|
|
||||||
return a.compareTo(b);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
for (int i = 0; i < playFrom.size(); i++) playUrl.add(TextUtils.join("#", episode));
|
for (int i = 0; i < playFrom.size(); i++) playUrl.add(TextUtils.join("#", episode));
|
||||||
Vod vod = new Vod();
|
Vod vod = new Vod();
|
||||||
vod.setVodId(url);
|
vod.setVodId(url);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
package com.github.catvod.bean.ali;
|
||||||
|
|
||||||
|
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.valueOf(o1.getDisplayName()).compareTo(Integer.valueOf(o2.getDisplayName()));
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
c08916c262b65e7a7caff865d900f3b7
|
dc64f1fe003adcd9916ee38638684376
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue