diff --git a/app/src/main/java/com/github/catvod/bean/yiso/Item.java b/app/src/main/java/com/github/catvod/bean/yiso/Item.java index b3a123bc..a31f2ec0 100644 --- a/app/src/main/java/com/github/catvod/bean/yiso/Item.java +++ b/app/src/main/java/com/github/catvod/bean/yiso/Item.java @@ -31,10 +31,10 @@ public class Item { @SerializedName("list") private List list; - public List getList() { + public List getList(String key) { List items = new ArrayList<>(); list = list == null ? Collections.emptyList() : list; - for (ListDTO item : list) items.add(item.getVod()); + for (ListDTO item : list) if (item.getName().contains(key)) items.add(item.getVod()); return items; } @@ -59,9 +59,13 @@ public class Item { return fileInfos; } + public String getName() { + return getFileInfos().get(0).getFileName(); + } + public Vod getVod() { String id = getUrl(); - String name = getFileInfos().get(0).getFileName(); + String name = getName(); String remark = getGmtCreate(); String pic = "https://inews.gtimg.com/newsapp_bt/0/13263837859/1000"; return new Vod(id, name, pic, remark); diff --git a/app/src/main/java/com/github/catvod/spider/UpYun.java b/app/src/main/java/com/github/catvod/spider/UpYun.java index d604dde8..57377abe 100644 --- a/app/src/main/java/com/github/catvod/spider/UpYun.java +++ b/app/src/main/java/com/github/catvod/spider/UpYun.java @@ -46,7 +46,7 @@ public class UpYun extends Spider { String url = apiUrl + "search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2"; String res = new String(Base64.decode(OkHttp.string(url, getHeaders()), Base64.DEFAULT)); List list = new ArrayList<>(); - for (Item item : Data.objectFrom(res).getResult().getItems()) if (item.isAli()) 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); } diff --git a/app/src/main/java/com/github/catvod/spider/YiSo.java b/app/src/main/java/com/github/catvod/spider/YiSo.java index ea6ca286..1dcf9e2f 100644 --- a/app/src/main/java/com/github/catvod/spider/YiSo.java +++ b/app/src/main/java/com/github/catvod/spider/YiSo.java @@ -45,7 +45,7 @@ public class YiSo extends Spider { Misc.loadWebView(url, getWebViewClient(result)); while (!result.containsKey("json")) SystemClock.sleep(50); String json = JsonParser.parseString(Objects.requireNonNull(result.get("json"))).getAsJsonPrimitive().getAsString(); - return Result.string(Item.objectFrom(json).getData().getList()); + return Result.string(Item.objectFrom(json).getData().getList(key)); } private WebViewClient getWebViewClient(Map result) { diff --git a/app/src/main/java/com/github/catvod/spider/Zhaozy.java b/app/src/main/java/com/github/catvod/spider/Zhaozy.java index 09e5ab5a..3e29d330 100644 --- a/app/src/main/java/com/github/catvod/spider/Zhaozy.java +++ b/app/src/main/java/com/github/catvod/spider/Zhaozy.java @@ -78,6 +78,7 @@ public class Zhaozy extends Spider { Matcher matcher = regexVid.matcher(href); if (!matcher.find()) continue; String name = element.select("div.news_text a h3").text(); + if (!name.contains(key)) continue; String remark = element.select("div.news_text a p").text().split("\\|")[1].split(":")[1]; Vod vod = new Vod(); vod.setVodPic("https://inews.gtimg.com/newsapp_bt/0/13263837859/1000"); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index cd29538e..014dd4e8 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 58458d80..38ca12e7 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -945b391d7430796229f6d5309037abeb +0c652bdac4683c84e151f867dd3abe54