diff --git a/app/src/main/java/com/github/catvod/live/TxtSubscribe.java b/app/src/main/java/com/github/catvod/live/TxtSubscribe.java deleted file mode 100644 index 4b53d43b..00000000 --- a/app/src/main/java/com/github/catvod/live/TxtSubscribe.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.github.catvod.live; - -import com.github.catvod.net.OkHttpUtil; -import com.github.catvod.utils.Trans; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.StringReader; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; - -public class TxtSubscribe { - - public static void subscribe(LinkedHashMap>> allLives, String url, HashMap headers) { - String content = OkHttpUtil.string(url, headers); - parse(allLives, content); - } - - public static void parse(LinkedHashMap>> allLives, String txt) { - try { - BufferedReader br = new BufferedReader(new StringReader(txt)); - String line = br.readLine(); - LinkedHashMap> noGroup = new LinkedHashMap<>(); - LinkedHashMap> groupLives = noGroup; - while (line != null) { - if (line.trim().isEmpty()) { - line = br.readLine(); - continue; - } - String[] lineInfo = line.split(","); - if (lineInfo.length < 2) { - line = br.readLine(); - continue; - } - if (line.contains("#genre#")) { - String group = Trans.get(lineInfo[0].trim()); - if (!allLives.containsKey(group)) { - groupLives = new LinkedHashMap<>(); - allLives.put(group, groupLives); - } else { - groupLives = allLives.get(group); - } - } else { - String title = Trans.get(lineInfo[0].trim()); - String[] urlMix = lineInfo[1].trim().split("#"); - for (String mix : urlMix) { - String url = mix.trim(); - if (url.isEmpty()) continue; - if (url.startsWith("http") || url.startsWith("rtsp") || url.startsWith("rtmp")) { - ArrayList urls; - if (!groupLives.containsKey(title)) { - urls = new ArrayList<>(); - groupLives.put(title, urls); - } else { - urls = groupLives.get(title); - } - if (!urls.contains(url)) urls.add(url); - } - } - } - line = br.readLine(); - } - br.close(); - if (!noGroup.isEmpty()) { - allLives.put("未分類", noGroup); - } - } catch (Exception ignored) { - - } - } - - public static String live2Json(LinkedHashMap>> lives) { - JSONArray groups = new JSONArray(); - for (String group : lives.keySet()) { - JSONArray channels = new JSONArray(); - LinkedHashMap> allChannel = lives.get(group); - if (allChannel.isEmpty()) continue; - for (String channel : allChannel.keySet()) { - ArrayList allUrls = allChannel.get(channel); - if (allUrls.isEmpty()) continue; - JSONArray urls = new JSONArray(); - for (int i = 0; i < allUrls.size(); i++) { - urls.put(allUrls.get(i)); - } - JSONObject newChannel = new JSONObject(); - try { - newChannel.put("name", channel); - newChannel.put("urls", urls); - } catch (JSONException ignored) { - } - channels.put(newChannel); - } - JSONObject newGroup = new JSONObject(); - try { - newGroup.put("group", group); - newGroup.put("channels", channels); - } catch (JSONException ignored) { - } - groups.put(newGroup); - } - return groups.toString(); - } - - public static Object[] load(String ext) { - try { - LinkedHashMap>> allLives = new LinkedHashMap<>(); - TxtSubscribe.subscribe(allLives, ext, null); - String json = TxtSubscribe.live2Json(allLives); - Object[] result = new Object[3]; - result[0] = 200; - result[1] = "text/plain; charset=utf-8"; - ByteArrayInputStream baos = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); - result[2] = baos; - return result; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/app/src/main/java/com/github/catvod/spider/Dm84.java b/app/src/main/java/com/github/catvod/spider/Dm84.java index 4590d784..f63fa2d8 100644 --- a/app/src/main/java/com/github/catvod/spider/Dm84.java +++ b/app/src/main/java/com/github/catvod/spider/Dm84.java @@ -9,6 +9,7 @@ import com.github.catvod.bean.Vod; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttpUtil; import com.github.catvod.utils.Misc; +import com.github.catvod.utils.Trans; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -139,7 +140,7 @@ public class Dm84 extends Spider { List vodItems = new ArrayList<>(); for (int j = 0; j < playList.size(); j++) { Element e = playList.get(j); - vodItems.add(e.text() + "$" + e.attr("href")); + vodItems.add(Trans.get(e.text()) + "$" + e.attr("href")); } if (vodItems.size() > 0) { sites.put(sourceName, TextUtils.join("#", vodItems)); diff --git a/app/src/main/java/com/github/catvod/spider/Proxy.java b/app/src/main/java/com/github/catvod/spider/Proxy.java index 2fc15aad..43db9246 100644 --- a/app/src/main/java/com/github/catvod/spider/Proxy.java +++ b/app/src/main/java/com/github/catvod/spider/Proxy.java @@ -1,10 +1,7 @@ package com.github.catvod.spider; -import android.util.Base64; - import com.github.catvod.crawler.Spider; import com.github.catvod.crawler.SpiderDebug; -import com.github.catvod.live.TxtSubscribe; import com.github.catvod.net.OkHttpUtil; import java.io.ByteArrayInputStream; @@ -20,8 +17,6 @@ public class Proxy extends Spider { switch (Objects.requireNonNull(params.get("do"))) { case "ck": return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes(StandardCharsets.UTF_8))}; - case "live": - return TxtSubscribe.load(new String(Base64.decode(params.get("ext"), Base64.DEFAULT | Base64.URL_SAFE | Base64.NO_WRAP), StandardCharsets.UTF_8)); case "ali": return Ali.vod(params); default: diff --git a/app/src/main/java/com/github/catvod/spider/Ysj.java b/app/src/main/java/com/github/catvod/spider/Ysj.java new file mode 100644 index 00000000..b896ab8d --- /dev/null +++ b/app/src/main/java/com/github/catvod/spider/Ysj.java @@ -0,0 +1,175 @@ +package com.github.catvod.spider; + +import android.text.TextUtils; + +import com.github.catvod.bean.Class; +import com.github.catvod.bean.Filter; +import com.github.catvod.bean.Result; +import com.github.catvod.bean.Vod; +import com.github.catvod.crawler.Spider; +import com.github.catvod.net.OkHttpUtil; +import com.github.catvod.utils.Json; +import com.github.catvod.utils.Misc; +import com.github.catvod.utils.Trans; + +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class Ysj extends Spider { + + private static final String siteUrl = "https://ysjdm.net"; + private static final String cateUrl = "https://ysjdm.net/index.php/vod/show"; + private static final String homeUrl = "https://ysjdm.net/index.php/vod/show/id/20.html"; + private static final String detailUrl = "https://ysjdm.net/index.php/vod/detail/id/"; + private static final String searchUrl = "https://ysjdm.net/index.php/vod/search.html"; + private static final String playUrl = "/index.php/vod/play/id/"; + + private HashMap getHeaders() { + HashMap headers = new HashMap<>(); + headers.put("User-Agent", Misc.CHROME); + return headers; + } + + private Filter addFilter(String name, String key, List texts) { + List values = new ArrayList<>(); + for (String text : texts) { + if (text.isEmpty()) continue; + values.add(new Filter.Value(text, text.replace("全部", ""))); + } + return new Filter(key, name, values); + } + + @Override + public String homeContent(boolean filter) { + LinkedHashMap> filters = new LinkedHashMap<>(); + List classes = new ArrayList<>(); + List array = new ArrayList<>(); + List list = new ArrayList<>(); + Document doc = Jsoup.parse(OkHttpUtil.string(homeUrl, getHeaders())); + array.add(addFilter("地區", "area", doc.select("div#hl03").select("a").eachText())); + array.add(addFilter("年份", "year", doc.select("div#hl04").select("a").eachText())); + array.add(addFilter("語言", "lang", doc.select("div#hl05").select("a").eachText())); + array.add(addFilter("字母", "letter", doc.select("div#hl06").select("a").eachText())); + for (Element element : doc.select("div#hl02").select("a")) { + String typeId = element.attr("href").split("/")[5]; + typeId = typeId.contains(".html") ? "" : typeId; + String typeName = element.text().replace("BD", ""); + classes.add(new Class(typeId, typeName)); + filters.put(typeId, array); + } + for (Element element : doc.select("li.vodlist_item")) { + String id = element.select("a").attr("href").split("/")[5]; + String name = element.select("a").attr("title"); + String pic = siteUrl + element.select("a").attr("data-original"); + String remark = element.select("span.pic_text").text(); + list.add(new Vod(id, name, pic, remark)); + } + return Result.string(classes, list, filters); + } + + @Override + public String categoryContent(String tid, String pg, boolean filter, HashMap extend) { + StringBuilder sb = new StringBuilder(cateUrl); + if (extend.containsKey("area")) sb.append("/area/").append(extend.get("area")); + if (tid.length() > 0) sb.append("/class/").append(tid); + sb.append("/id/20"); + if (extend.containsKey("lang")) sb.append("/lang/").append(extend.get("lang")); + if (extend.containsKey("letter")) sb.append("/letter/").append(extend.get("letter")); + if (extend.containsKey("year")) sb.append("/year/").append(extend.get("year")); + if (!pg.equals("1")) sb.append("/page/").append(pg); + sb.append(".html"); + Document doc = Jsoup.parse(OkHttpUtil.string(sb.toString(), getHeaders())); + List list = new ArrayList<>(); + for (Element element : doc.select("li.vodlist_item")) { + String id = element.select("a").attr("href").split("/")[5]; + String name = element.select("a").attr("title"); + String pic = siteUrl + element.select("a").attr("data-original"); + String remark = element.select("span.pic_text").text(); + list.add(new Vod(id, name, pic, remark)); + } + return Result.string(list); + } + + @Override + public String detailContent(List ids) { + Document doc = Jsoup.parse(OkHttpUtil.string(detailUrl.concat(ids.get(0)), getHeaders())); + String name = doc.select("h2.title").text(); + String pic = siteUrl + doc.select("a.vodlist_thumb").attr("data-original"); + String year = doc.select("li.data").get(0).select("a").get(0).text(); + String area = doc.select("li.data").get(0).select("a").get(1).text(); + String type = doc.select("li.data").get(0).select("a").get(2).text(); + String actor = doc.select("li.data").get(2).text().replace("主演：", ""); + String director = doc.select("li.data").get(3).text().replace("导演：", ""); + String content = doc.select("div.content_desc > span").text(); + + Vod vod = new Vod(); + vod.setVodId(ids.get(0)); + vod.setVodPic(pic); + vod.setVodYear(year); + vod.setVodName(name); + vod.setVodArea(area); + vod.setVodActor(actor); + vod.setVodContent(content); + vod.setVodDirector(director); + vod.setVodName(type); + + Map sites = new LinkedHashMap<>(); + Elements sources = doc.select("div.play_source_tab > a"); + Elements sourceList = doc.select("ul.content_playlist"); + for (int i = 0; i < sources.size(); i++) { + Element source = sources.get(i); + String sourceName = source.attr("alt"); + Elements playList = sourceList.get(i).select("a"); + List vodItems = new ArrayList<>(); + for (int j = 0; j < playList.size(); j++) { + Element e = playList.get(j); + String href = e.attr("href").replace(playUrl, ""); + vodItems.add(Trans.get(e.text()) + "$" + href); + } + if (vodItems.size() > 0) { + sites.put(sourceName, TextUtils.join("#", vodItems)); + } + } + if (sites.size() > 0) { + vod.setVodPlayFrom(TextUtils.join("$$$", sites.keySet())); + vod.setVodPlayUrl(TextUtils.join("$$$", sites.values())); + } + return Result.string(vod); + } + + @Override + public String searchContent(String key, boolean quick) { + List list = new ArrayList<>(); + String target = searchUrl.concat("?wd=").concat(key).concat("&submit="); + Document doc = Jsoup.parse(OkHttpUtil.string(target, getHeaders())); + if (doc.html().contains("很抱歉，暂无相关视频")) return Result.string(list); + for (Element element : doc.select("li.searchlist_item")) { + String id = element.select("a").attr("href").split("/")[5]; + String name = element.select("a").attr("title"); + String pic = siteUrl + element.select("a").attr("data-original"); + String remark = element.select("span.pic_text").text(); + list.add(new Vod(id, name, pic, remark)); + } + return Result.string(list); + } + + @Override + public String playerContent(String flag, String id, List vipFlags) { + String data = OkHttpUtil.string(siteUrl + playUrl + id, getHeaders()); + for (String text : data.split("var")) { + if (!text.contains("player_aaaa")) continue; + data = text.split("=")[1]; + data = data.substring(0, data.indexOf("}") + 1); + break; + } + return Result.get().url(Json.getString(data, "url")).header(getHeaders()).string(); + } +} diff --git a/app/src/main/java/com/github/catvod/utils/Json.java b/app/src/main/java/com/github/catvod/utils/Json.java new file mode 100644 index 00000000..4829c91a --- /dev/null +++ b/app/src/main/java/com/github/catvod/utils/Json.java @@ -0,0 +1,22 @@ +package com.github.catvod.utils; + +import com.google.gson.JsonParser; + +public class Json { + + public static String getString(String result, String column) { + return JsonParser.parseString(result).getAsJsonObject().get(column).getAsString(); + } + + public static int getInt(String result, String column) { + return JsonParser.parseString(result).getAsJsonObject().get(column).getAsInt(); + } + + public static long getLong(String result, String column) { + return JsonParser.parseString(result).getAsJsonObject().get(column).getAsLong(); + } + + public static boolean getBoolean(String result, String column) { + return JsonParser.parseString(result).getAsJsonObject().get(column).getAsBoolean(); + } +} \ No newline at end of file