dongge
/
CatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/FongMi/CatVodSpider

This commit is contained in:
GH Action - Upstream Sync 2023-03-28 12:35:03 +00:00
parent 99b2dbb073 27add43a85
commit 40b3efa3b2
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/catvod/spider/AList.java
View File

@ -136,8 +136,8 @@ public class AList extends Spider {
String path = id.contains("/") ? id.substring(id.indexOf("/")) : ""; String path = id.contains("/") ? id.substring(id.indexOf("/")) : "";
Drive drive = getDrive(key); Drive drive = getDrive(key);
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put("path", drive.getPath() + path);
params.put("password", drive.getPassword()); params.put("password", drive.getPassword());
params.put("path", path.startsWith(drive.getPath()) ? path : drive.getPath() + path);
String response = OkHttp.postJson(drive.getApi(), params.toString()); String response = OkHttp.postJson(drive.getApi(), params.toString());
return Item.objectFrom(getDetailJson(drive.isNew(), response)); return Item.objectFrom(getDetailJson(drive.isNew(), response));
} catch (Exception e) { } catch (Exception e) {
@ -151,8 +151,8 @@ public class AList extends Spider {
String path = id.contains("/") ? id.substring(id.indexOf("/")) : ""; String path = id.contains("/") ? id.substring(id.indexOf("/")) : "";
Drive drive = getDrive(key); Drive drive = getDrive(key);
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put("path", drive.getPath() + path);
params.put("password", drive.getPassword()); params.put("password", drive.getPassword());
params.put("path", path.startsWith(drive.getPath()) ? path : drive.getPath() + path);
String response = OkHttp.postJson(drive.listApi(), params.toString()); String response = OkHttp.postJson(drive.listApi(), params.toString());
List<Item> items = Item.arrayFrom(getListJson(drive.isNew(), response)); List<Item> items = Item.arrayFrom(getListJson(drive.isNew(), response));
Iterator<Item> iterator = items.iterator(); Iterator<Item> iterator = items.iterator();

3
app/src/main/java/com/github/catvod/spider/Push.java
View File

@ -6,6 +6,7 @@ import android.text.TextUtils;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -34,8 +35,8 @@ public class Push extends Ali {
private Vod vod(String url) { private Vod vod(String url) {
Vod vod = new Vod(); Vod vod = new Vod();
vod.setVodId(url); vod.setVodId(url);
vod.setVodName(url);
vod.setTypeName("FongMi"); vod.setTypeName("FongMi");
vod.setVodName(url.startsWith("file://") ? new File(url).getName() : url);
vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg");
vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析")));
vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url))); vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url)));

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
3473c6feb44308efdb18ef8ea90ed6eb 3b702732dd7f792513d3f3cf006f8898

2
json/adult.json
View File

@ -1,5 +1,5 @@
{ {
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3473c6feb44308efdb18ef8ea90ed6eb", "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3b702732dd7f792513d3f3cf006f8898",
"wallpaper": "https://gao.chuqiuyu.tk", "wallpaper": "https://gao.chuqiuyu.tk",
"sites": [ "sites": [
{ {

2
json/config.json
View File

@ -1,5 +1,5 @@
{ {
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3473c6feb44308efdb18ef8ea90ed6eb", "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3b702732dd7f792513d3f3cf006f8898",
"wallpaper": "http://饭太硬.ga/深色壁纸/api.php", "wallpaper": "http://饭太硬.ga/深色壁纸/api.php",
"sites": [ "sites": [
{ {