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 d62605c5..45645770 100644 --- a/app/src/main/java/com/github/catvod/spider/Eighteen.java +++ b/app/src/main/java/com/github/catvod/spider/Eighteen.java @@ -27,7 +27,7 @@ public class Eighteen extends Spider { public String homeContent(boolean filter) throws Exception { List classes = new ArrayList<>(); List list = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), url)); + Document doc = Jsoup.parse(OkHttp.string(url)); for (Element a : doc.select("ul.animenu__nav > li > a")) { String typeName = a.text(); String typeId = a.attr("href").replace(url, ""); @@ -50,7 +50,7 @@ public class Eighteen extends Spider { List list = new ArrayList<>(); tid = tid.replace("random", "list"); tid = tid.replace("index", pg); - Document doc = Jsoup.parse(OkHttp.string(proxy(), url + tid)); + Document doc = Jsoup.parse(OkHttp.string(url + tid)); for (Element div : doc.select("div.post")) { String id = div.select("a").attr("href").replace(url, ""); String name = div.select("h3").text(); @@ -63,7 +63,7 @@ public class Eighteen extends Spider { @Override public String detailContent(List ids) throws Exception { - Document doc = Jsoup.parse(OkHttp.string(proxy(), url + ids.get(0))); + Document doc = Jsoup.parse(OkHttp.string(url + ids.get(0))); Element wrap = doc.select("div.video-wrap").get(0); String name = wrap.select("div.archive-title > h1").text(); String pic = wrap.select("div.player-wrap > img").attr("src"); @@ -99,7 +99,7 @@ public class Eighteen extends Spider { params.put("search_keyword", key); params.put("search_type", "fc"); params.put("op", "search"); - String res = OkHttp.post(proxy(), url + "searchform_search/all/" + pg + ".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, ""); diff --git a/app/src/main/java/com/github/catvod/spider/Hanime.java b/app/src/main/java/com/github/catvod/spider/Hanime.java index d1a740a4..13665868 100644 --- a/app/src/main/java/com/github/catvod/spider/Hanime.java +++ b/app/src/main/java/com/github/catvod/spider/Hanime.java @@ -43,10 +43,10 @@ public class Hanime extends Spider { List list = new ArrayList<>(); List classes = new ArrayList<>(); LinkedHashMap> filters = new LinkedHashMap<>(); - Document doc1 = Jsoup.parse(OkHttp.string(proxy(), siteUrl.concat("/search?genre=裏番"), getHeaders())); + Document doc1 = Jsoup.parse(OkHttp.string(siteUrl.concat("/search?genre=裏番"), getHeaders())); List sorts = doc1.select("div.hentai-sort-options-wrapper").eachText(); List years = doc1.getElementById("year").select("option").eachAttr("value"); - Document doc2 = Jsoup.parse(OkHttp.string(proxy(), siteUrl, getHeaders())); + Document doc2 = Jsoup.parse(OkHttp.string(siteUrl, getHeaders())); for (Element element : doc2.select("a.nav-item")) { String text = element.text(); if (text.equals("新番預告") || text.equals("H漫畫")) continue; @@ -75,7 +75,7 @@ public class Hanime extends Spider { if (extend.get("by") == null) extend.put("by", "最新上市"); if (extend.get("year") == null) extend.put("year", ""); String target = siteUrl.concat("/search?genre=").concat(tid).concat("&page=").concat(pg).concat("&sort=").concat(extend.get("by")).concat("&year=").concat(extend.get("year")); - Document doc = Jsoup.parse(OkHttp.string(proxy(), target, getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(target, getHeaders())); for (Element element : doc.select("div.col-xs-6")) { String pic = element.select("img").get(1).attr("src"); String url = element.select("a.overlay").attr("href"); @@ -100,7 +100,7 @@ public class Hanime extends Spider { @Override public String detailContent(List ids) throws Exception { - Document doc = Jsoup.parse(OkHttp.string(proxy(), siteUrl.concat("/watch?v=").concat(ids.get(0)), getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(siteUrl.concat("/watch?v=").concat(ids.get(0)), getHeaders())); String name = doc.getElementById("shareBtn-title").text(); JSONObject json = new JSONObject(doc.select("script[type=application/ld+json]").html().trim()); String content = json.optString("description"); @@ -120,7 +120,7 @@ public class Hanime extends Spider { public String searchContent(String key, boolean quick) throws Exception { List list = new ArrayList<>(); String target = siteUrl.concat("/search?query=").concat(key).concat("&genre=&sort=&year=&month=&duration="); - Document doc = Jsoup.parse(OkHttp.string(proxy(), target, getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(target, getHeaders())); for (Element element : doc.select("div.col-xs-6")) { String pic = element.select("img").get(1).attr("src"); String url = element.select("a.overlay").attr("href"); diff --git a/app/src/main/java/com/github/catvod/spider/Jable.java b/app/src/main/java/com/github/catvod/spider/Jable.java index 68b33a92..f26cd73f 100644 --- a/app/src/main/java/com/github/catvod/spider/Jable.java +++ b/app/src/main/java/com/github/catvod/spider/Jable.java @@ -34,13 +34,13 @@ public class Jable extends Spider { public String homeContent(boolean filter) throws Exception { List list = new ArrayList<>(); List classes = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), cateUrl, getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(cateUrl, getHeaders())); for (Element element : doc.select("div.img-box > a")) { String typeId = element.attr("href").split("/")[4]; String typeName = element.select("div.absolute-center > h4").text(); classes.add(new Class(typeId, typeName)); } - doc = Jsoup.parse(OkHttp.string(proxy(), siteUrl, getHeaders())); + doc = Jsoup.parse(OkHttp.string(siteUrl, getHeaders())); for (Element element : doc.select("div.video-img-box")) { String pic = element.select("img").attr("data-src"); String url = element.select("a").attr("href"); @@ -56,7 +56,7 @@ public class Jable extends Spider { public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { List list = new ArrayList<>(); String target = cateUrl + tid + "/?mode=async&function=get_block&block_id=list_videos_common_videos_list&sort_by=post_date&from=" + String.format(Locale.getDefault(), "%02d", Integer.parseInt(pg)) + "&_=" + System.currentTimeMillis(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), target, getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(target, getHeaders())); for (Element element : doc.select("div.video-img-box")) { String pic = element.select("img").attr("data-src"); String url = element.select("a").attr("href"); @@ -69,7 +69,7 @@ public class Jable extends Spider { @Override public String detailContent(List ids) throws Exception { - Document doc = Jsoup.parse(OkHttp.string(proxy(), detailUrl.concat(ids.get(0)).concat("/"), getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(detailUrl.concat(ids.get(0)).concat("/"), getHeaders())); String name = doc.select("meta[property=og:title]").attr("content"); String pic = doc.select("meta[property=og:image]").attr("content"); String year = doc.select("span.inactive-color").get(0).text(); @@ -86,7 +86,7 @@ public class Jable extends Spider { @Override public String searchContent(String key, boolean quick) throws Exception { List list = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), searchUrl.concat(URLEncoder.encode(key)).concat("/"), getHeaders())); + Document doc = Jsoup.parse(OkHttp.string(searchUrl.concat(URLEncoder.encode(key)).concat("/"), getHeaders())); for (Element element : doc.select("div.video-img-box")) { String pic = element.select("img").attr("data-src"); String url = element.select("a").attr("href"); 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 87c2087c..e63a8f85 100644 --- a/app/src/main/java/com/github/catvod/spider/Miss.java +++ b/app/src/main/java/com/github/catvod/spider/Miss.java @@ -28,7 +28,7 @@ public class Miss extends Spider { List list = new ArrayList<>(); List classes = new ArrayList<>(); LinkedHashMap> filters = new LinkedHashMap<>(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), url)); + Document doc = Jsoup.parse(OkHttp.string(url)); List typeIds = Arrays.asList("chinese-subtitle", "new", "release", "uncensored-leak", "genres/VR", "today-hot", "weekly-hot", "monthly-hot", "siro", "luxu", "gana", "maan", "scute", "ara", "uncensored-leak", "fc2", "heyzo", "tokyohot", "1pondo", "caribbeancom", "caribbeancompr", "10musume", "pacopacomama", "gachinco", "xxxav", "marriedslash", "naughty4610", "naughty0930", "madou", "twav", "furuke"); for (Element a : doc.select("nav a")) { String typeId = a.attr("href").replace(url, ""); @@ -55,7 +55,7 @@ public class Miss extends Spider { String filters = extend.get("filters"); if (TextUtils.isEmpty(filters)) target += "?page=" + pg; else target += "?filters=" + extend.get("filters") + "&page=" + pg; - Document doc = Jsoup.parse(OkHttp.string(proxy(), target)); + Document doc = Jsoup.parse(OkHttp.string(target)); 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(); @@ -70,7 +70,7 @@ public class Miss extends Spider { @Override public String detailContent(List ids) throws Exception { - Document doc = Jsoup.parse(OkHttp.string(proxy(), url + ids.get(0))); + Document doc = Jsoup.parse(OkHttp.string(url + ids.get(0))); String name = doc.select("meta[property=og:title]").attr("content"); String pic = doc.select("meta[property=og:image]").attr("content"); Vod vod = new Vod(); @@ -99,7 +99,7 @@ public class Miss extends Spider { private String searchContent(String key, String pg) { List list = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(proxy(), url + "search/" + key + "?page=" + pg)); + 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(); diff --git a/app/src/main/java/com/github/catvod/spider/Star.java b/app/src/main/java/com/github/catvod/spider/Star.java index 58514390..c2c87fca 100644 --- a/app/src/main/java/com/github/catvod/spider/Star.java +++ b/app/src/main/java/com/github/catvod/spider/Star.java @@ -44,7 +44,7 @@ public class Star extends Spider { } private String getVer() { - for (Element script : Jsoup.parse(OkHttp.string(proxy(), siteUrl, getHeader())).select("script")) if (script.attr("src").contains("buildManifest.js")) return script.attr("src").split("/")[3]; + for (Element script : Jsoup.parse(OkHttp.string(siteUrl, getHeader())).select("script")) if (script.attr("src").contains("buildManifest.js")) return script.attr("src").split("/")[3]; return ""; } @@ -65,7 +65,7 @@ public class Star extends Spider { LinkedHashMap> filters = new LinkedHashMap<>(); for (Map.Entry entry : map.entrySet()) classes.add(new Class(entry.getKey(), entry.getValue())); for (Class type : classes) { - Element script = Jsoup.parse(OkHttp.string(proxy(), siteUrl + type.getTypeId() + "/all/all/all", getHeader())).select("#__NEXT_DATA__").get(0); + Element script = Jsoup.parse(OkHttp.string(siteUrl + type.getTypeId() + "/all/all/all", getHeader())).select("#__NEXT_DATA__").get(0); JSONObject obj = new JSONObject(script.data()).getJSONObject("props").getJSONObject("pageProps").getJSONObject("filterCondition"); Condition item = Condition.objectFrom(obj.toString()); filters.put(type.getTypeId(), item.getFilter()); @@ -76,7 +76,7 @@ public class Star extends Spider { @Override public String homeVideoContent() throws Exception { List list = new ArrayList<>(); - Element script = Jsoup.parse(OkHttp.string(proxy(), siteUrl)).select("#__NEXT_DATA__").get(0); + Element script = Jsoup.parse(OkHttp.string(siteUrl)).select("#__NEXT_DATA__").get(0); List cards = Card.arrayFrom(new JSONObject(script.data()).getJSONObject("props").getJSONObject("pageProps").getJSONArray("cards").toString()); for (Card card : cards) if (!card.getName().equals("电视直播")) for (Card item : card.getCards()) list.add(item.vod()); return Result.string(list); @@ -94,7 +94,7 @@ public class Star extends Spider { if (year.length() > 0) query.setYear(year); if (type.length() > 0) query.setLabel(type); if (area.length() > 0) query.setCountry(area); - String body = OkHttp.post(proxy(), apiUrl, query.toString()); + String body = OkHttp.post(apiUrl, query.toString()); List cards = Card.arrayFrom(new JSONObject(body).getJSONObject("data").getJSONArray("list").toString()); List list = new ArrayList<>(); for (Card card : cards) list.add(card.vod()); @@ -103,7 +103,7 @@ public class Star extends Spider { @Override public String detailContent(List ids) throws Exception { - Element script = Jsoup.parse(OkHttp.string(proxy(), detail.concat(ids.get(0)), getHeader())).select("#__NEXT_DATA__").get(0); + Element script = Jsoup.parse(OkHttp.string(detail.concat(ids.get(0)), getHeader())).select("#__NEXT_DATA__").get(0); Detail detail = Detail.objectFrom(new JSONObject(script.data()).getJSONObject("props").getJSONObject("pageProps").getJSONObject("pageData").toString()); Vod vod = new Vod(); vod.setVodId(ids.get(0)); @@ -126,7 +126,7 @@ public class Star extends Spider { @Override public String searchContent(String key, boolean quick) throws Exception { List list = new ArrayList<>(); - String json = OkHttp.string(proxy(), siteUrl + data + ver + "/search.json?word=" + URLEncoder.encode(key), getHeader()); + String json = OkHttp.string(siteUrl + data + ver + "/search.json?word=" + URLEncoder.encode(key), getHeader()); List items = Card.arrayFrom(new JSONObject(json).getJSONObject("pageProps").getJSONArray("initList").toString()); for (Card item : items) list.add(item.vod()); return Result.string(list); 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 296ae0d1..40c132e9 100644 --- a/app/src/main/java/com/github/catvod/spider/Wogg.java +++ b/app/src/main/java/com/github/catvod/spider/Wogg.java @@ -103,9 +103,8 @@ public class Wogg extends Ali { item.setTypeName(String.join(",", doc.select(".video-info-header div.tag-link a").eachText())); List shareLinks = doc.select(".module-row-text").eachAttr("data-clipboard-text"); - for (int i = 0; i < shareLinks.size(); i++) { - shareLinks.set(i, shareLinks.get(i).trim()); - } + for (int i = 0; i < shareLinks.size(); i++) shareLinks.set(i, shareLinks.get(i).trim()); + item.setVodPlayFrom(super.detailContentVodPlayFrom(shareLinks)); item.setVodPlayUrl(super.detailContentVodPlayUrl(shareLinks));