diff --git a/app/src/main/java/com/github/catvod/spider/Ddrk.java b/app/src/main/java/com/github/catvod/spider/Ddrk.java index 18e1b235..889cd14c 100644 --- a/app/src/main/java/com/github/catvod/spider/Ddrk.java +++ b/app/src/main/java/com/github/catvod/spider/Ddrk.java @@ -111,18 +111,11 @@ public class Ddrk extends Cloud { Document doc = Jsoup.parse(OkHttp.string(url, getHeaders(url))); Elements elements = doc.select("li.menu-item a"); List classes = new ArrayList<>(); - ArrayList allClass = new ArrayList<>(); + for (Element ele : elements) { String name = ele.attr("title"); - boolean show = !filter || (name.equals("热映中") || name.equals("欧美剧") || name.equals("日剧") || name.equals("韩剧") || name.equals("华语剧") || name.equals("其他地区") || name.equals("全部") || name.equals("欧美电影") || name.equals("日韩电影") || name.equals("华语电影") || name.equals("新番") || name.equals("动画") || name.equals("纪录片") || name.equals("综艺")); - if (allClass.contains(name)) show = false; - if (show) { - allClass.add(name); - Matcher mather = regexCategory.matcher(ele.attr("href")); - if (!mather.find()) continue; - // 把分类的id和名称取出来加到列表里 - String id = mather.group(1).trim(); - + String id = ele.attr("href"); + if (ele.attr("href").contains("category") || ele.attr("href").contains("tag")) { classes.add(new Class(id, name)); } } @@ -175,7 +168,7 @@ public class Ddrk extends Cloud { } } } else { - url = siteUrl + "/category/" + tid; + url = tid; } if (pg.equals("1")) { url = url + "/"; @@ -416,9 +409,9 @@ public class Ddrk extends Cloud { */ @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { - if(flag.contains("quark")){ + if (flag.contains("quark")) { return super.playerContent(flag, id, vipFlags); - }else{ + } else { return Result.get().url(ProxyVideo.buildCommonProxyUrl(id, Util.webHeaders(siteUrl))).string(); } } diff --git a/app/src/test/java/DdrkTest.java b/app/src/test/java/DdrkTest.java index e5edec35..c6393705 100644 --- a/app/src/test/java/DdrkTest.java +++ b/app/src/test/java/DdrkTest.java @@ -59,7 +59,7 @@ public class DdrkTest { @org.junit.Test public void categoryContent() throws Exception { - String content = spider.categoryContent("drama/western-drama", "2", true, null); + String content = spider.categoryContent("https://ddys.mov/drama/western-drama", "2", true, null); JsonObject map = Json.safeObject(content); Gson gson = new GsonBuilder().setPrettyPrinting().create(); System.out.println("categoryContent--" + gson.toJson(map)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index e049e2ae..5c354f6f 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 7917dcf3..f3e01653 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -8669c4e59677fb468d72b104c792c67d +8c701767a5109d01ea59c6b4619c334c diff --git a/json/index.json b/json/index.json index 1179b7b0..efc64f18 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8669c4e59677fb468d72b104c792c67d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8c701767a5109d01ea59c6b4619c334c", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index e4b32f03..e96ff2d5 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8669c4e59677fb468d72b104c792c67d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8c701767a5109d01ea59c6b4619c334c", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 41f779ea..646cb1a4 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8669c4e59677fb468d72b104c792c67d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;8c701767a5109d01ea59c6b4619c334c", "lives": [ { "name": "直播ipv6",