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

Clean code

This commit is contained in:
FongMi 2023-12-01 22:01:26 +08:00
parent 13604345d7
commit 542afa9915
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/github/catvod/api/AliYun.java
View File

@ -243,7 +243,7 @@ public class AliYun {
List<Item> subs = new ArrayList<>(); List<Item> subs = new ArrayList<>();
listFiles(shareId, new Item(getParentFileId(fileId, share)), files, subs); listFiles(shareId, new Item(getParentFileId(fileId, share)), files, subs);
Collections.sort(files); Collections.sort(files);
List<String> playFrom = Arrays.asList("原畫", "普畫"); List<String> playFrom = Arrays.asList("轉存原畫", "分享原畫", "代理普畫");
List<String> episode = new ArrayList<>(); List<String> episode = new ArrayList<>();
List<String> playUrl = new ArrayList<>(); List<String> playUrl = new ArrayList<>();
for (Item file : files) episode.add(file.getDisplayName() + "$" + shareId + "+" + file.getFileId() + findSubs(file.getName(), subs)); for (Item file : files) episode.add(file.getDisplayName() + "$" + shareId + "+" + file.getFileId() + findSubs(file.getName(), subs));
@ -387,9 +387,9 @@ public class AliYun {
} }
public String playerContent(String[] ids, String flag) { public String playerContent(String[] ids, String flag) {
if (flag.split("#")[0].equals("普畫")) { if (flag.split("#")[0].equals("代理普畫")) {
return getPreviewContent(ids); return getPreviewContent(ids);
} else if (flag.split("#")[0].equals("原畫")) { } else if (flag.split("#")[0].equals("轉存原畫")) {
return Result.get().url(proxyVideoUrl("open", ids[0], ids[1])).octet().subs(getSubs(ids)).header(getHeader()).string(); return Result.get().url(proxyVideoUrl("open", ids[0], ids[1])).octet().subs(getSubs(ids)).header(getHeader()).string();
} else if (flag.split("#")[0].equals("分享原畫")) { } else if (flag.split("#")[0].equals("分享原畫")) {
return Result.get().url(proxyVideoUrl("share", ids[0], ids[1])).octet().subs(getSubs(ids)).header(getHeader()).string(); return Result.get().url(proxyVideoUrl("share", ids[0], ids[1])).octet().subs(getSubs(ids)).header(getHeader()).string();
@ -400,24 +400,18 @@ public class AliYun {
private String getPreviewContent(String[] ids) { private String getPreviewContent(String[] ids) {
Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]); Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]);
List<String> url = getPreviewUrl(info); List<String> url = getPreviewUrl(info, ids[0], ids[1]);
List<String> proxyUrl = new ArrayList<>();
for (int i = 0; i < url.size(); i++) {
String item = url.get(i);
if (item.startsWith("http")) item = proxyVideoUrl("preview", ids[0], ids[1], url.get(i - 1));
proxyUrl.add(item);
}
List<Sub> subs = getSubs(ids); List<Sub> subs = getSubs(ids);
subs.addAll(getSubs(info)); subs.addAll(getSubs(info));
return Result.get().url(proxyUrl).m3u8().subs(subs).header(getHeader()).string(); return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string();
} }
private List<String> getPreviewUrl(Preview.Info info) { private List<String> getPreviewUrl(Preview.Info info, String shareId, String fileId) {
List<Preview.LiveTranscodingTask> tasks = info.getLiveTranscodingTaskList(); List<Preview.LiveTranscodingTask> tasks = info.getLiveTranscodingTaskList();
List<String> url = new ArrayList<>(); List<String> url = new ArrayList<>();
for (int i = tasks.size() - 1; i >= 0; i--) { for (int i = tasks.size() - 1; i >= 0; i--) {
url.add(tasks.get(i).getTemplateId()); url.add(tasks.get(i).getTemplateId());
url.add(tasks.get(i).getUrl()); url.add(proxyVideoUrl("preview", shareId, fileId, tasks.get(i).getUrl()));
} }
return url; return url;
} }
@ -531,7 +525,7 @@ public class AliYun {
private String getM3u8Url(String shareId, String fileId, String templateId) { private String getM3u8Url(String shareId, String fileId, String templateId) {
Preview.Info info = getVideoPreviewPlayInfo(shareId, fileId); Preview.Info info = getVideoPreviewPlayInfo(shareId, fileId);
List<String> url = getPreviewUrl(info); List<String> url = getPreviewUrl(info, shareId, fileId);
Map<String, String> previewMap = new HashMap<>(); Map<String, String> previewMap = new HashMap<>();
for (int i = 0; i < url.size(); i = i + 2) { for (int i = 0; i < url.size(); i = i + 2) {
previewMap.put(url.get(i), url.get(i + 1)); previewMap.put(url.get(i), url.get(i + 1));

7
app/src/main/java/com/github/catvod/spider/Ali.java
View File

@ -54,10 +54,11 @@ public class Ali extends Spider {
*/ */
public String detailContentVodPlayFrom(List<String> ids) { public String detailContentVodPlayFrom(List<String> ids) {
List<String> playFrom = new ArrayList<>(); List<String> playFrom = new ArrayList<>();
if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫")); if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("轉存原畫", "分享原畫", "代理普畫"));
for (int i = 1; i <= ids.size(); i++) { for (int i = 1; i <= ids.size(); i++) {
playFrom.add(String.format(Locale.getDefault(), "原畫#%02d", i)); playFrom.add(String.format(Locale.getDefault(), "轉存原畫#%02d", i));
playFrom.add(String.format(Locale.getDefault(), "普畫#%02d", i)); playFrom.add(String.format(Locale.getDefault(), "分享原畫#%02d", i));
playFrom.add(String.format(Locale.getDefault(), "代理普畫#%02d", i));
} }
return TextUtils.join("$$$", playFrom); return TextUtils.join("$$$", playFrom);
} }

7
app/src/main/java/com/github/catvod/utils/MultiThread.java
View File

@ -1,5 +1,8 @@
package com.github.catvod.utils; package com.github.catvod.utils;
import com.github.catvod.spider.Proxy;
import java.net.URLEncoder;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@ -7,6 +10,10 @@ import fi.iki.elonen.NanoHTTPD;
public class MultiThread { public class MultiThread {
public static String url(String url, int thread) {
return String.format(Proxy.getUrl() + "?do=multi&url=%s&thread=%d", URLEncoder.encode(url), thread);
}
public static Object[] proxy(Map<String, String> params) throws Exception { public static Object[] proxy(Map<String, String> params) throws Exception {
String url = params.get("url"); String url = params.get("url");
int thread = Integer.parseInt(params.get("thread")); int thread = Integer.parseInt(params.get("thread"));