Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
This commit is contained in:
dukun 2023-02-10 11:49:03 +08:00
commit 80f80c755e
4 changed files with 20 additions and 18 deletions

View File

@ -1,12 +1,13 @@
package com.github.catvod.spider;
import android.content.Context;
import android.text.TextUtils;
import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod;
import com.github.catvod.crawler.Spider;
import com.github.catvod.utils.Utils;
import java.util.Arrays;
import java.util.List;
public class Push extends Spider {
@ -20,26 +21,27 @@ public class Push extends Spider {
public String detailContent(List<String> ids) throws Exception {
String url = ids.get(0).trim();
if (url.contains("aliyundrive")) return Ali.get().detailContent(ids);
if (Utils.isVip(url)) return Result.string(vod(url, "官源"));
if (Utils.isVideoFormat(url)) return Result.string(vod(url, "直連"));
return Result.string(vod(url, "網頁"));
List<String> playFrom = Arrays.asList("直連", "嗅探", "解析");
List<String> playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url);
Vod vod = create(url);
vod.setVodPlayFrom(TextUtils.join("$$$", playFrom));
vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
return Result.string(vod);
}
@Override
public String playerContent(String flag, String id, List<String> vipFlags) {
if (flag.contains("")) return Ali.get().playerContent(flag, id);
if (flag.equals("官源")) return Result.get().parse().jx().url(id).string();
if (flag.equals("網頁")) return Result.get().parse().url(id).string();
if (flag.equals("嗅探")) return Result.get().parse().url(id).string();
if (flag.equals("解析")) return Result.get().parse().jx().url(id).string();
return Result.get().url(id).string();
}
private Vod vod(String url, String type) {
private Vod create(String url) {
Vod vod = new Vod();
vod.setTypeName(type);
vod.setTypeName("FongMi");
vod.setVodId(url);
vod.setVodName(url);
vod.setVodPlayFrom(type);
vod.setVodPlayUrl("播放$" + url);
vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg");
return vod;
}

View File

@ -1,5 +1,5 @@
{
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78",
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;384628eab024a2a40a57835d2f0684d8",
"wallpaper": "https://gao.chuqiuyu.tk",
"lives": [
{

View File

@ -9,7 +9,7 @@
"filterable": 1,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "易搜",
@ -20,7 +20,7 @@
"filterable": 0,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "盤搜",
@ -31,7 +31,7 @@
"filterable": 0,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "UP雲搜",
@ -42,7 +42,7 @@
"filterable": 0,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "找資源",
@ -53,7 +53,7 @@
"filterable": 0,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt$$$yingshi$$$abcd1234",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "push_agent",
@ -64,7 +64,7 @@
"filterable": 0,
"switchable": 0,
"ext": "https://agit.ai/Yoursmile7/TVBox/raw/branch/master/token.txt",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78"
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
}
]
}

View File

@ -1,5 +1,5 @@
{
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5f350e3b859432e66db59eebc3ccce78",
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;384628eab024a2a40a57835d2f0684d8",
"wallpaper": "http://www.kf666888.cn/api/tvbox/img",
"lives": [
{