diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java index 7257747d..c1379978 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -181,6 +181,11 @@ public class Bili extends Spider { return categoryContent(key, "1", true, new HashMap<>()); } + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return categoryContent(key, pg, true, new HashMap<>()); + } + @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { String[] ids = id.split("\\+"); diff --git a/app/src/main/java/com/github/catvod/spider/Eighteen.java b/app/src/main/java/com/github/catvod/spider/Eighteen.java index 829b1e61..a7b416f2 100644 --- a/app/src/main/java/com/github/catvod/spider/Eighteen.java +++ b/app/src/main/java/com/github/catvod/spider/Eighteen.java @@ -78,11 +78,28 @@ public class Eighteen extends Spider { @Override public String searchContent(String key, boolean quick) throws Exception { + return searchContent(key, "1"); + } + + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return searchContent(key, pg); + } + + @Override + public String playerContent(String flag, String id, List vipFlags) throws Exception { + HashMap result = new HashMap<>(); + Utils.loadWebView(url + id, getClient(result)); + while (result.isEmpty()) SystemClock.sleep(10); + return Result.get().url(result.get("url")).string(); + } + + private String searchContent(String key, String pg) { HashMap params = new HashMap<>(); params.put("search_keyword", key); params.put("search_type", "fc"); params.put("op", "search"); - String res = OkHttp.post(url + "searchform_search/all/index.html", params); + String res = OkHttp.post(url + "searchform_search/all/" + pg + ".html", params); List list = new ArrayList<>(); for (Element div : Jsoup.parse(res).select("div.post")) { String id = div.select("a").attr("href").replace(url, ""); @@ -94,14 +111,6 @@ public class Eighteen extends Spider { return Result.string(list); } - @Override - public String playerContent(String flag, String id, List vipFlags) throws Exception { - HashMap result = new HashMap<>(); - Utils.loadWebView(url + id, getClient(result)); - while (result.isEmpty()) SystemClock.sleep(10); - return Result.get().url(result.get("url")).string(); - } - private WebViewClient getClient(HashMap result) { return new WebViewClient() { @Override diff --git a/app/src/main/java/com/github/catvod/spider/Miss.java b/app/src/main/java/com/github/catvod/spider/Miss.java index 4373ee84..6a139066 100644 --- a/app/src/main/java/com/github/catvod/spider/Miss.java +++ b/app/src/main/java/com/github/catvod/spider/Miss.java @@ -85,8 +85,22 @@ public class Miss extends Spider { @Override public String searchContent(String key, boolean quick) throws Exception { + return searchContent(key, "1"); + } + + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return searchContent(key, pg); + } + + @Override + public String playerContent(String flag, String id, List vipFlags) throws Exception { + return Result.get().parse().url(url + id).string(); + } + + private String searchContent(String key, String pg) { List list = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(url + "search/" + key)); + Document doc = Jsoup.parse(OkHttp.string(url + "search/" + key + "?page=" + pg)); for (Element div : doc.select("div.thumbnail")) { String id = div.select("a.text-secondary").attr("href").replace(url, ""); String name = div.select("a.text-secondary").text(); @@ -98,9 +112,4 @@ public class Miss extends Spider { } return Result.string(list); } - - @Override - public String playerContent(String flag, String id, List vipFlags) throws Exception { - return Result.get().parse().url(url + id).string(); - } } diff --git a/app/src/main/java/com/github/catvod/spider/PanSou.java b/app/src/main/java/com/github/catvod/spider/PanSou.java index 587931c3..ef5e7df6 100644 --- a/app/src/main/java/com/github/catvod/spider/PanSou.java +++ b/app/src/main/java/com/github/catvod/spider/PanSou.java @@ -49,25 +49,27 @@ public class PanSou extends Ali { } @Override - public String searchContent(String key, boolean quick) { - Map types = new HashMap<>(); - types.put("7", "資料夾"); - types.put("1", "影片"); + public String searchContent(String key, boolean quick) throws Exception { + return searchContent(key, "1"); + } + + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return searchContent(key, pg); + } + + private String searchContent(String key, String pg) { + String url = siteUrl + "/search?k=" + URLEncoder.encode(key) + "&page=" + pg + "&s=0&t=-1"; + Elements items = Jsoup.parse(OkHttp.string(url)).select("van-row > a"); List list = new ArrayList<>(); - for (Map.Entry entry : types.entrySet()) { - String typeId = entry.getKey(); - String typeName = entry.getValue(); - String url = siteUrl + "/search?k=" + URLEncoder.encode(key) + "&t=" + typeId; - Elements items = Jsoup.parse(OkHttp.string(url)).select("van-row > a"); - for (Element item : items) { - String title = item.selectFirst("template").text().trim(); - if (!title.contains(key)) continue; - Vod vod = new Vod(); - vod.setVodId(item.attr("href")); - vod.setVodName("[" + typeName + "] " + title); - vod.setVodPic("https://inews.gtimg.com/newsapp_bt/0/13263837859/1000"); - list.add(vod); - } + for (Element item : items) { + String title = item.selectFirst("template").text().trim(); + if (!title.contains(key)) continue; + Vod vod = new Vod(); + vod.setVodId(item.attr("href")); + vod.setVodPic("https://inews.gtimg.com/newsapp_bt/0/13263837859/1000"); + vod.setVodName(title); + list.add(vod); } return Result.string(list); } 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 5c9a806f..9581b565 100644 --- a/app/src/main/java/com/github/catvod/spider/UpYun.java +++ b/app/src/main/java/com/github/catvod/spider/UpYun.java @@ -26,7 +26,16 @@ public class UpYun extends Ali { @Override public String searchContent(String key, boolean quick) throws Exception { - String res = decode(OkHttp.string("https://zyb.upyunso.com/v15/search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2")); + return searchContent(key, "1"); + } + + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return searchContent(key, pg); + } + + private String searchContent(String key, String pg) throws Exception { + String res = decode(OkHttp.string("https://zyb.upyunso.com/v15/search?keyword=" + URLEncoder.encode(key) + "&page=" + pg + "&s_type=2")); List list = new ArrayList<>(); for (Item item : Data.objectFrom(res).getResult().getItems()) { String url = decode(item.getPageUrl()); diff --git a/app/src/main/java/com/github/catvod/spider/Wogg.java b/app/src/main/java/com/github/catvod/spider/Wogg.java index 8d6013dd..f0d7460f 100644 --- a/app/src/main/java/com/github/catvod/spider/Wogg.java +++ b/app/src/main/java/com/github/catvod/spider/Wogg.java @@ -12,10 +12,10 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import java.net.URLEncoder; -import java.util.Arrays; import java.util.ArrayList; -import java.util.List; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -25,7 +25,7 @@ import java.util.regex.Pattern; */ public class Wogg extends Ali { - private final String siteURL = "https://tvfan.xxooo.cf"; + private final String siteURL = "http://tvfan.xxooo.cf"; private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)"); @@ -49,7 +49,16 @@ public class Wogg extends Ali { @Override public String searchContent(String key, boolean quick) throws Exception { - String searchURL = siteURL + "/index.php/vodsearch/-------------.html?wd=" + URLEncoder.encode(key); + return searchContent(key, "1"); + } + + @Override + public String searchContent(String key, boolean quick, String pg) throws Exception { + return searchContent(key, pg); + } + + private String searchContent(String key, String pg) { + String searchURL = siteURL + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index f86d1346..f2382d95 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 8d572192..71056010 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -c180867252ce20f2d59e5a7e6d4fd92a +7d80ae170a1871de54c78b17f825f913 diff --git a/json/adult.json b/json/adult.json index 56e6ad42..83998ae1 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c180867252ce20f2d59e5a7e6d4fd92a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7d80ae170a1871de54c78b17f825f913", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 04d8361a..f8274447 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c180867252ce20f2d59e5a7e6d4fd92a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7d80ae170a1871de54c78b17f825f913", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {