Update doll

app/src/main/java/com/github/catvod/bean/Result.java

@@ -30,6 +30,8 @@ public class Result {
     private String format;
     @SerializedName("danmaku")
     private String danmaku;
+    @SerializedName("click")
+    private String click;
     @SerializedName("msg")
     private String msg;
     @SerializedName("url")
@@ -174,6 +176,11 @@ public class Result {
         return this;
     }
 
+    public Result click(String click) {
+        this.click = click;
+        return this;
+    }
+
     public Result msg(String msg) {
         this.msg = msg;
         return this;

app/src/main/java/com/github/catvod/debug/MainActivity.java

@@ -6,8 +6,8 @@ import android.widget.Button;
 
 import com.github.catvod.R;
 import com.github.catvod.crawler.Spider;
+import com.github.catvod.spider.Doll;
 import com.github.catvod.spider.Init;
-import com.github.catvod.spider.Wogg;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.Logger;
 
@@ -46,7 +46,7 @@ public class MainActivity extends Activity {
     private void initSpider() {
         try {
             Init.init(getApplicationContext());
-            spider = new Wogg();
+            spider = new Doll();
             spider.init(this, "");
         } catch (Throwable e) {
             e.printStackTrace();

app/src/main/java/com/github/catvod/spider/Doll.java

@@ -1,8 +1,5 @@
 package com.github.catvod.spider;
 
-import android.text.TextUtils;
-import android.util.Base64;
-
 import com.github.catvod.bean.Class;
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
@@ -13,12 +10,9 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class Doll extends Spider {
 
@@ -29,14 +23,14 @@ public class Doll extends Spider {
         List<Class> classes = new ArrayList<>();
         List<Vod> list = new ArrayList<>();
         Document doc = Jsoup.parse(OkHttp.string(url));
-        for (Element a : doc.select("ul#side-menu").get(0).select("li > a")) {
+        for (Element a : doc.select("ul.menu").get(0).select("li > a")) {
             String typeName = a.text();
-            String typeId = a.attr("href").replace(url, "");
+            String typeId = a.attr("href");
-            classes.add(new Class(typeId, typeName));
+            if (typeId.contains(url)) classes.add(new Class(typeId.replace(url, ""), typeName));
         }
-        for (Element div : doc.select("div.video-detail")) {
+        for (Element div : doc.select("div.video-item")) {
-            String id = div.select("h3.video-title > a").attr("href").replace(url, "");
+            String id = div.select("a.video-title").attr("href").replace(url, "");
-            String name = div.select("h3.video-title > a").text();
+            String name = div.select("a.video-title").text();
             String pic = div.select("div.thumb > a > img").attr("data-src");
             String remark = div.select("div.date").text();
             list.add(new Vod(id, name, pic, remark));
@@ -49,9 +43,9 @@ public class Doll extends Spider {
         List<Vod> list = new ArrayList<>();
         String target = pg.equals("1") ? url + tid : url + tid + "/" + pg + ".html";
         Document doc = Jsoup.parse(OkHttp.string(target));
-        for (Element div : doc.select("div.video-detail")) {
+        for (Element div : doc.select("div.video-item")) {
-            String id = div.select("h3.video-title > a").attr("href").replace(url, "");
+            String id = div.select("a.video-title").attr("href").replace(url, "");
-            String name = div.select("h3.video-title > a").text();
+            String name = div.select("a.video-title").text();
             String pic = div.select("div.thumb > a > img").attr("data-src");
             String remark = div.select("div.date").text();
             list.add(new Vod(id, name, pic, remark));
@@ -76,29 +70,17 @@ public class Doll extends Spider {
 
     @Override
     public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
-        String key = "";
+        return Result.get().url(id).parse().click("document.getElementById('player-wrapper').click()").string();
-        String voteTag = "";
-        StringBuilder code = new StringBuilder();
-        String html = OkHttp.string(id);
-        Document doc = Jsoup.parse(html);
-        Matcher m = Pattern.compile("/video/(\\w+).html").matcher(id);
-        if (m.find()) key = m.group(1);
-        for (Element a : doc.select("script")) {
-            if (a.html().startsWith("var voteTag")) {
-                Pattern pattern = Pattern.compile("voteTag=\"([^&]+)\"");
-                Matcher matcher = pattern.matcher(a.html());
-                if (matcher.find()) voteTag = matcher.group(1);
-                break;
     }
+
+    @Override
+    public boolean manualVideoCheck() throws Exception {
+        return true;
     }
-        if (TextUtils.isEmpty(voteTag)) return Result.get().url(id).parse().string();
+
-        voteTag = new String(Base64.decode(voteTag, 0));
+    @Override
-        for (int i = 0; i < voteTag.length(); i++) {
+    public boolean isVideoFormat(String url) throws Exception {
-            int k = i % key.length();
+        return !url.contains("afcdn.net") && url.contains(".m3u8");
-            code.append((char) (voteTag.charAt(i) ^ key.charAt(k)));
-        }
-        String playUrl = URLDecoder.decode(new String(Base64.decode(code.toString(), 0)));
-        return Result.get().url(playUrl).string();
     }
 
     @Override
@@ -114,9 +96,9 @@ public class Doll extends Spider {
     private String searchContent(String query) {
         List<Vod> list = new ArrayList<>();
         Document doc = Jsoup.parse(OkHttp.string(url + query));
-        for (Element div : doc.select("div.video-detail")) {
+        for (Element div : doc.select("div.video-item")) {
-            String id = div.select("h3.video-title > a").attr("href").replace(url, "");
+            String id = div.select("a.video-title").attr("href").replace(url, "");
-            String name = div.select("h3.video-title > a").text();
+            String name = div.select("a.video-title").text();
             String pic = div.select("div.thumb > a > img").attr("data-src");
             String remark = div.select("div.date").text();
             list.add(new Vod(id, name, pic, remark));

jar/custom_spider.jar.md5

@@ -1 +1 @@
-883df69d6854363bcb610b44946ed374
+528c76fdf519c0411b619b75032eacb7