diff --git a/app/src/main/java/com/github/catvod/spider/AList.java b/app/src/main/java/com/github/catvod/spider/AList.java index b9abb826..563297eb 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -250,12 +250,16 @@ public class AList extends Spider { } @Override - public List call() throws Exception { - List list = new ArrayList<>(); - String response = post(drive, drive.searchApi(), drive.params(keyword)); - List items = Item.arrayFrom(getSearchJson(drive.isNew(), response)); - for (Item item : items) if (!item.ignore(drive.isNew())) list.add(item.getVod(drive, vodPic)); - return list; + public List call() { + try { + List list = new ArrayList<>(); + String response = post(drive, drive.searchApi(), drive.params(keyword)); + List items = Item.arrayFrom(getSearchJson(drive.isNew(), response)); + for (Item item : items) if (!item.ignore(drive.isNew())) list.add(item.getVod(drive, vodPic)); + return list; + } catch (Exception e) { + return Collections.emptyList(); + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/spider/Doll.java b/app/src/main/java/com/github/catvod/spider/Doll.java index b8d717e8..5087c686 100644 --- a/app/src/main/java/com/github/catvod/spider/Doll.java +++ b/app/src/main/java/com/github/catvod/spider/Doll.java @@ -1,19 +1,15 @@ package com.github.catvod.spider; -import android.util.Base64; - import com.github.catvod.bean.Class; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; -import com.github.catvod.utils.Utils; 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; @@ -61,24 +57,19 @@ public class Doll extends Spider { public String detailContent(List ids) throws Exception { String html = OkHttp.string(url + ids.get(0)); Document doc = Jsoup.parse(html); - StringBuilder sb = new StringBuilder(); - String videoId = ids.get(0).split("/")[1].split("\\.")[0]; String pic = doc.select("meta[property=og:image]").attr("content"); String name = doc.select("meta[property=og:title]").attr("content"); - String voteTag = new String(Base64.decode(Utils.getVar(html, "voteTag").getBytes(), 0)); - for (int i = 0; i < voteTag.length(); i++) sb.append(Character.toChars(voteTag.charAt(i) ^ videoId.charAt(i % videoId.length()))); - String playUrl = URLDecoder.decode(new String(Base64.decode(sb.toString().getBytes(), 0))); Vod vod = new Vod(); vod.setVodId(ids.get(0)); vod.setVodPic(pic); vod.setVodName(name); vod.setVodPlayFrom("玩偶姐姐"); - vod.setVodPlayUrl("播放$" + playUrl); + vod.setVodPlayUrl("播放$" + url + ids.get(0)); return Result.string(vod); } @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { - return Result.get().url(id).string(); + return Result.get().url(id).parse().string(); } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 7efda2b3..562cc767 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 b3b9fd25..1ba8d628 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -da248d3decd2fb6776b2ce39013c3e6e +a04665ee58c5c24676bd43b11a01e918