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 266a46ac..824c8086 100644 --- a/app/src/main/java/com/github/catvod/spider/Miss.java +++ b/app/src/main/java/com/github/catvod/spider/Miss.java @@ -35,7 +35,7 @@ public class Miss extends Spider { String typeId = a.attr("href").replace(url, ""); if (!typeIds.contains(typeId)) continue; classes.add(new Class(typeId, typeName)); - filters.put(typeId, List.of(new Filter("filters", "過濾", Arrays.asList(new Filter.Value("全部", ""), new Filter.Value("單人作品", "individual"), new Filter.Value("中文字幕", "chinese-subtitle"))))); + filters.put(typeId, Arrays.asList(new Filter("filters", "過濾", Arrays.asList(new Filter.Value("全部", ""), new Filter.Value("單人作品", "individual"), new Filter.Value("中文字幕", "chinese-subtitle"))))); } for (Element div : doc.select("div.thumbnail")) { String id = div.select("a.text-secondary").attr("href").replace(url, ""); @@ -61,6 +61,7 @@ public class Miss extends Spider { String name = div.select("a.text-secondary").text(); String pic = div.select("img").attr("data-src"); if (pic.isEmpty()) pic = div.select("img").attr("src"); + if (TextUtils.isEmpty(name)) continue; String remark = div.select("span").text(); list.add(new Vod(id, name, pic, remark)); } diff --git a/app/src/main/java/com/github/catvod/spider/TuGou.java b/app/src/main/java/com/github/catvod/spider/TuGou.java new file mode 100644 index 00000000..2bb1fcfb --- /dev/null +++ b/app/src/main/java/com/github/catvod/spider/TuGou.java @@ -0,0 +1,59 @@ +package com.github.catvod.spider; + +import android.content.Context; + +import com.github.catvod.bean.Result; +import com.github.catvod.bean.Vod; +import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Utils; + +import org.jsoup.Jsoup; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import java.util.List; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +/** + * @author zhixc + */ +public class TuGou extends Ali { + + private final String URL = "https://tugousou.com"; + + private Map getHeader() { + Map header = new HashMap<>(); + header.put("User-Agent", Utils.CHROME); + header.put("Host", "tugousou.com"); + header.put("Origin", URL); + header.put("Referer", URL + "/"); + return header; + } + + @Override + public void init(Context context, String extend) { + super.init(context, extend); + } + + @Override + public String searchContent(String key, boolean quick) { + Map params = new HashMap<>(); + params.put("keyword", key); + String html = OkHttp.post(URL + "/search", params, getHeader()); + Element container = Jsoup.parse(html).select(".layui-container").get(1); + Elements aElements = container.select("p[class=layui-font-16] > a"); + Elements pElements = container.select("p[class=layui-font-14 layui-font-gray text-align-right]"); + List list = new ArrayList<>(); + for (int i = 0; i < aElements.size(); i++) { + Element item = aElements.get(i); + String vodId = item.attr("href"); + String name = item.text(); + String pic = "https://inews.gtimg.com/newsapp_bt/0/13263837859/1000"; + String remark = pElements.get(i).text(); + list.add(new Vod(vodId, name, pic, remark)); + } + return Result.string(list); + } +} \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index a1457120..7277070f 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 22cd4acd..947887b3 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5c42e2f85ec3f05bfd281e4fcf40468a +630997f2d36dde4644f99300f559ff68 diff --git a/json/adult.json b/json/adult.json index 446c75ba..4f903519 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5c42e2f85ec3f05bfd281e4fcf40468a", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;630997f2d36dde4644f99300f559ff68", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { @@ -8,7 +8,6 @@ "type": 3, "api": "csp_AList", "searchable": 1, - "filterable": 1, "changeable": 0, "ext": { "drives": [ @@ -25,7 +24,6 @@ "type": 3, "api": "csp_NiNi", "searchable": 1, - "filterable": 1, "ext": "1" }, { @@ -33,536 +31,469 @@ "name": "玩偶", "type": 3, "api": "csp_Doll", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "18AV", "name": "18AV", "type": 3, "api": "csp_Eighteen", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "Jable", "name": "Jable", "type": 3, "api": "csp_Jable", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "MissAV", "name": "MissAV", "type": 3, "api": "csp_Miss", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "Supjav", "name": "Supjav", "type": 3, "api": "csp_Supjav", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "Hanime", "name": "Hanime", "type": 3, "api": "csp_Hanime", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "51smt4.xyz", "name": "成人01", "type": 1, "api": "http://51smt4.xyz/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "cjmygzy.com", "name": "成人02", "type": 0, "api": "http://cjmygzy.com/inc/sapi.php?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "secj8.com", "name": "成人03", "type": 0, "api": "http://secj8.com/inc/sapi.php?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "jcspcj8.com", "name": "成人04", "type": 0, "api": "http://jcspcj8.com/api?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "bttcj.com", "name": "成人05", "type": 0, "api": "http://bttcj.com/inc/sapi.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "apilj.com", "name": "成人06", "type": 1, "api": "http://apilj.com/api.php/provide/vod/at/json/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "wmcj8.com", "name": "成人07", "type": 0, "api": "http://wmcj8.com/inc/sapi.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "99zywcj.com", "name": "成人08", "type": 0, "api": "http://99zywcj.com/inc/sapi.php?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "91md.me", "name": "成人09", "type": 1, "api": "http://91md.me/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "api.putaozy.net", "name": "成人10", "type": 1, "api": "http://api.putaozy.net/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "mygzycj.com", "name": "成人11", "type": 0, "api": "http://mygzycj.com/api.php?ac=list", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "llzxcj.com", "name": "成人12", "type": 0, "api": "http://llzxcj.com/inc/sck.php?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "feifei67.com", "name": "成人13", "type": 1, "api": "http://www.feifei67.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "dadiapi.com", "name": "成人14", "type": 0, "api": "http://dadiapi.com/api.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "sdszyapi.com", "name": "成人15", "type": 0, "api": "http://sdszyapi.com/home/cjapi/asbb/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "f2dcj6.com", "name": "成人16", "type": 0, "api": "http://f2dcj6.com/sapi?ac=videolist", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "fhapi9.com", "name": "成人17", "type": 1, "api": "http://fhapi9.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "ggmmzy.com", "name": "成人18", "type": 0, "api": "http://www.ggmmzy.com:9999/inc/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "99zy.pw", "name": "成人19", "type": 1, "api": "http://99zy.pw/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "xjjzyapi.com", "name": "成人20", "type": 0, "api": "http://xjjzyapi.com/home/cjapi/askl/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "madouse.la", "name": "成人21", "type": 1, "api": "http://madouse.la/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "shabizy.com", "name": "成人22", "type": 0, "api": "http://www.shabizy.com:777/inc/sea", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji21.com", "name": "成人23", "type": 0, "api": "http://www.caiji21.com/home/cjapi/klkl/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji26.com", "name": "成人24", "type": 0, "api": "http://caiji26.com/home/cjapi/p0g8/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji25.com", "name": "成人25", "type": 0, "api": "http://www.caiji25.com/home/cjapi/p0as/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji24.com", "name": "成人26", "type": 0, "api": "http://www.caiji24.com/home/cjapi/p0d2/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "api.maozyapi.com", "name": "成人27", "type": 1, "api": "https://api.maozyapi.com/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "888dav.com", "name": "成人28", "type": 1, "api": "https://www.888dav.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "mgzyz1.com", "name": "成人29", "type": 1, "api": "https://mgzyz1.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "xrbsp.com", "name": "成人30", "type": 0, "api": "https://www.xrbsp.com/api/xml.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "msnii.com", "name": "成人31", "type": 0, "api": "https://www.msnii.com/api/xml.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "mgav1.cc", "name": "成人32", "type": 0, "api": "https://www.mgav1.cc/api.php/provide/vod/at/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "afasu.com", "name": "成人33", "type": 0, "api": "https://www.afasu.com/api/xml.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji.huakuiapi.com", "name": "成人34", "type": 1, "api": "https://caiji.huakuiapi.com/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "gdlsp.com", "name": "成人35", "type": 0, "api": "https://www.gdlsp.com/api/xml.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "kkzy.me", "name": "成人36", "type": 1, "api": "https://kkzy.me/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "52zyapi.com", "name": "成人37", "type": 0, "api": "https://52zyapi.com/home/cjapi/asda/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "dmmapi.com", "name": "成人38", "type": 0, "api": "https://www.dmmapi.com/home/cjapi/asd2c7/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "apittzy.com", "name": "成人39", "type": 1, "api": "https://apittzy.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "kxgav.com", "name": "成人40", "type": 0, "api": "https://www.kxgav.com/api/xml.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "lbapi9.com", "name": "成人41", "type": 1, "api": "https://lbapi9.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "siwazyw.cc", "name": "成人42", "type": 1, "api": "https://siwazyw.cc/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji07.com", "name": "成人43", "type": 0, "api": "https://www.caiji07.com/home/cjapi/cfcf/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "xx55zyapi.com", "name": "成人44", "type": 0, "api": "https://xx55zyapi.com/home/cjapi/ascf/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji23.com", "name": "成人45", "type": 0, "api": "https://www.caiji23.com/home/cjapi/kls6/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji22.com", "name": "成人46", "type": 0, "api": "https://www.caiji22.com/home/cjapi/klp0/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "sewozyapi.com", "name": "成人47", "type": 1, "api": "https://sewozyapi.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "api.xiuseapi.com", "name": "成人48", "type": 1, "api": "https://api.xiuseapi.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji03.com", "name": "成人49", "type": 0, "api": "https://www.caiji03.com/home/cjapi/cfg8/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "jgczyapi.com", "name": "成人50", "type": 0, "api": "https://jgczyapi.com/home/cjapi/kld2/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji08.com", "name": "成人51", "type": 0, "api": "https://www.caiji08.com/home/cjapi/cfkl/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji.caomeiapi.com", "name": "成人52", "type": 1, "api": "https://caiji.caomeiapi.com/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji.523zyw.com", "name": "成人53", "type": 1, "api": "https://caiji.523zyw.com/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji.naichaapi.com", "name": "成人54", "type": 1, "api": "https://caiji.naichaapi.com/inc/apijson_vod.php", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji09.com", "name": "成人55", "type": 0, "api": "https://www.caiji09.com/home/cjapi/cfp0/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji01.com", "name": "成人56", "type": 0, "api": "https://www.caiji01.com/home/cjapi/cfd2/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji02.com", "name": "成人57", "type": 0, "api": "https://www.caiji02.com/home/cjapi/cfas/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji05.com", "name": "成人58", "type": 0, "api": "https://www.caiji05.com/home/cjapi/cfda/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji10.com", "name": "成人59", "type": 0, "api": "https://www.caiji10.com/home/cjapi/cfs6/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "caiji04.com", "name": "成人60", "type": 0, "api": "https://www.caiji04.com/home/cjapi/cfc7/mc10/vod/xml", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "api.apilyzy.com", "name": "成人61", "type": 1, "api": "https://api.apilyzy.com/api.php/provide/vod/", - "searchable": 1, - "filterable": 1 + "searchable": 1 }, { "key": "push_agent", @@ -570,7 +501,6 @@ "type": 3, "api": "csp_Push", "searchable": 1, - "filterable": 1, "changeable": 0 } ] diff --git a/json/config.json b/json/config.json index 1f242e93..c66c8b1e 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5c42e2f85ec3f05bfd281e4fcf40468a", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;630997f2d36dde4644f99300f559ff68", "wallpaper": "http://饭太硬.ga/深色壁纸/api.php", "sites": [ { @@ -8,7 +8,6 @@ "type": 3, "api": "csp_Local", "searchable": 0, - "filterable": 0, "changeable": 0 }, { @@ -17,7 +16,6 @@ "type": 3, "api": "csp_AList", "searchable": 1, - "filterable": 1, "changeable": 0, "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json" }, @@ -27,7 +25,6 @@ "type": 3, "api": "csp_WebDAV", "searchable": 1, - "filterable": 1, "changeable": 0, "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/webdav.json" }, @@ -37,7 +34,6 @@ "type": 3, "api": "csp_Bili", "searchable": 1, - "filterable": 1, "changeable": 0, "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/bili.json" }, @@ -47,7 +43,6 @@ "type": 3, "api": "csp_NiNi", "searchable": 1, - "filterable": 1, "changeable": 1 }, { @@ -56,7 +51,6 @@ "type": 3, "api": "csp_XPathMacFilter", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/duboku.json" }, @@ -66,7 +60,6 @@ "type": 3, "api": "csp_Ying", "searchable": 1, - "filterable": 1, "changeable": 1 }, { @@ -75,7 +68,6 @@ "type": 3, "api": "csp_Dm84", "searchable": 1, - "filterable": 1, "changeable": 1 }, { @@ -84,16 +76,22 @@ "type": 3, "api": "csp_Ysj", "searchable": 1, - "filterable": 1, "changeable": 1 }, + { + "key": "土狗", + "name": "土狗", + "type": 3, + "api": "csp_TuGou", + "searchable": 1, + "changeable": 0 + }, { "key": "七夜", "name": "七夜", "type": 3, "api": "csp_Dovx", "searchable": 1, - "filterable": 0, "changeable": 0 }, { @@ -102,7 +100,6 @@ "type": 3, "api": "csp_UpYun", "searchable": 1, - "filterable": 0, "changeable": 0 }, { @@ -111,7 +108,6 @@ "type": 3, "api": "csp_PanSou", "searchable": 1, - "filterable": 0, "changeable": 0 }, { @@ -120,7 +116,6 @@ "type": 3, "api": "csp_PanSearch", "searchable": 1, - "filterable": 0, "changeable": 0 }, { @@ -129,7 +124,6 @@ "type": 3, "api": "csp_Zhaozy", "searchable": 1, - "filterable": 0, "changeable": 0, "ext": "影視天下第一$$$test2$$$test2" }, @@ -139,7 +133,6 @@ "type": 3, "api": "csp_Push", "searchable": 1, - "filterable": 0, "changeable": 0 } ]