diff --git a/app/src/main/java/com/github/catvod/spider/Push.java b/app/src/main/java/com/github/catvod/spider/Push.java index 7989440c..7d5d30a9 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -9,6 +9,7 @@ import com.github.catvod.bean.Vod; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Image; +import com.github.catvod.utils.Path; import com.github.catvod.utils.Util; import java.io.File; @@ -26,11 +27,12 @@ public class Push extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) { if (id.contains("://") && id.contains("***")) id = id.replace("***", "#"); - if (flag.equals("直連")) return Result.get().url(id).subs(getSubs(id)).string(); - 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().url(id).string(); - return ""; + return switch (flag) { + case "直連" -> Result.get().url(id).subs(getSubs(id)).string(); + case "解析" -> Result.get().parse().jx().url(id).string(); + case "嗅探" -> Result.get().parse().url(id).string(); + default -> Result.get().url(id).string(); + }; } private Vod vod(String url) { @@ -43,6 +45,9 @@ public class Push extends Spider { if (Util.isThunder(url)) { vod.setVodPlayUrl(url); vod.setVodPlayFrom("迅雷"); + } else if (url.contains("youtube.com")) { + vod.setVodPlayUrl(url); + vod.setVodPlayFrom("YouTube"); } else if (url.contains("$")) { vod.setVodPlayFrom("直連"); vod.setVodPlayUrl(TextUtils.join("#", url.split("\n"))); @@ -76,8 +81,7 @@ public class Push extends Spider { private void setFileSub(String url, List subs) { File file = new File(url.replace("file://", "")); - if (file.getParentFile() == null) return; - for (File f : file.getParentFile().listFiles()) { + for (File f : Path.list(file.getParentFile())) { String ext = Util.getExt(f.getName()); if (Util.isSub(ext)) subs.add(Sub.create().name(Util.removeExt(f.getName())).ext(ext).url("file://" + f.getAbsolutePath())); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 26871f3c..c9237d09 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 132ade87..dc8a15f5 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e7eabe878887922e3e2e6b011caa80fc +fe1c0645034f7063eceec49e9c0f5c72