夸克部分

app/src/main/java/com/github/catvod/api/QuarkApi.java

@@ -1,7 +1,8 @@
-/*
 package com.github.catvod.api;
 
+import com.github.catvod.bean.Vod;
 import com.github.catvod.bean.quark.Item;
+import com.github.catvod.bean.quark.ShareData;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.net.OkResult;
 import com.github.catvod.utils.Json;
@@ -31,6 +32,21 @@ public class QuarkApi {
     private String saveDirName = "TV";
     private boolean isVip = false;
 
+    public Vod getVod(ShareData shareData) throws Exception {
+        getShareToken(shareData);
+
+        return null;
+    }
+
+    private static class Loader {
+        static volatile QuarkApi INSTANCE = new QuarkApi();
+    }
+
+    public static QuarkApi get() {
+        return QuarkApi.Loader.INSTANCE;
+    }
+
+
     public void initQuark(String cookie) throws Exception {
         this.ckey = bytesToHex(MessageDigest.getInstance("MD5").digest(cookie.getBytes()));
         this.cookie = cookie;
@@ -52,7 +68,7 @@ public class QuarkApi {
 
         int leftRetry = retry != null ? retry : 3;
         OkResult okResult;
-        if ("get".equals(method)) {
+        if ("GET".equals(method)) {
             okResult = OkHttp.get(this.apiUrl + url, data, getHeaders());
         } else {
             okResult = OkHttp.post(this.apiUrl + url, data, getHeaders());
@@ -76,14 +92,11 @@ public class QuarkApi {
         return okResult.getBody();
     }
 
-    private Map<String, String> getShareData(String url) {
+    public ShareData getShareData(String url) {
         Pattern pattern = Pattern.compile("https://pan\\.quark\\.cn/s/([^\\\\|#/]+)");
         Matcher matcher = pattern.matcher(url);
         if (matcher.find()) {
-            Map<String, String> shareData = new HashMap<>();
+            return new ShareData(matcher.group(1), "0");
-            shareData.put("shareId", matcher.group(1));
-            shareData.put("folderId", "0");
-            return shareData;
         }
         return null;
     }
@@ -109,17 +122,17 @@ public class QuarkApi {
         }
     }
 
-    private void getShareToken(Map<String, String> shareData) throws Exception {
+    private void getShareToken(ShareData shareData) throws Exception {
-        if (!this.shareTokenCache.containsKey(shareData.get("shareId"))) {
+        if (!this.shareTokenCache.containsKey(shareData.getShareId())) {
-            this.shareTokenCache.remove(shareData.get("shareId"));
+            this.shareTokenCache.remove(shareData.getShareId());
-            Map<String, Object> shareToken = Json.parseSafe(api("share/sharepage/token?" + this.pr, Map.of("pwd_id", shareData.get("shareId"), "passcode", shareData.get("sharePwd")), 0, "POST"), Map.class);
+            Map<String, Object> shareToken = Json.parseSafe(api("share/sharepage/token?" + this.pr, Map.of("pwd_id", shareData.getShareId(), "passcode", shareData.getSharePwd()), 0, "POST"), Map.class);
             if (shareToken.containsKey("data") && ((Map<String, Object>) shareToken.get("data")).containsKey("stoken")) {
-                this.shareTokenCache.put(shareData.get("shareId"), (Map<String, Object>) shareToken.get("data"));
+                this.shareTokenCache.put(shareData.getShareId(), (Map<String, Object>) shareToken.get("data"));
             }
         }
     }
 
-    private List<Map<String, Object>> listFile(int shareIndex, Map<String, String> shareData, List<Item> videos, List<Item> subtitles, String shareId, String folderId, Integer page) throws Exception {
+    private List<Map<String, Object>> listFile(int shareIndex, ShareData shareData, List<Item> videos, List<Item> subtitles, String shareId, String folderId, Integer page) throws Exception {
         int prePage = 200;
         page = page != null ? page : 1;
         Map<String, Object> listData = Json.parseSafe(api("share/sharepage/detail?" + this.pr + "&pwd_id=" + shareId + "&stoken=" + encodeURIComponent((String) this.shareTokenCache.get(shareId).get("stoken")) + "&pdir_fid=" + folderId + "&force=0&_page=" + page + "&_size=" + prePage + "&_sort=file_type:asc,file_name:asc", null, 0, "GET"), Map.class);
@@ -132,10 +145,10 @@ public class QuarkApi {
                 subDir.add(item);
             } else if (Boolean.TRUE.equals(item.get("file")) && "video".equals(item.get("obj_category"))) {
                 if ((int) item.get("size") < 1024 * 1024 * 5) continue;
-                item.put("stoken", this.shareTokenCache.get(shareData.get("shareId")).get("stoken"));
+                item.put("stoken", this.shareTokenCache.get(shareData.getShareId()).get("stoken"));
-                videos.add(Item.objectFrom(Json.toJson(item), shareData.get("shareId"), shareIndex));
+                videos.add(Item.objectFrom(Json.toJson(item), shareData.getShareId(), shareIndex));
             } else if ("file".equals(item.get("type")) && this.subtitleExts.contains("." + Util.getExt((String) item.get("file_name")))) {
-                subtitles.add(Item.objectFrom(Json.toJson(item), shareData.get("shareId"), shareIndex));
+                subtitles.add(Item.objectFrom(Json.toJson(item), shareData.getShareId(), shareIndex));
             }
         }
         if (page < Math.ceil((double) ((Map<String, Object>) listData.get("metadata")).get("_total") / prePage)) {
@@ -170,12 +183,12 @@ public class QuarkApi {
         return finalResult;
     }
 
-    public void getFilesByShareUrl(int shareIndex, Object shareInfo, List<Item> videos, List<Item> subtitles) throws Exception {
+    public void getFilesByShareUrl(int shareIndex, String shareInfo, List<Item> videos, List<Item> subtitles) throws Exception {
-        Map<String, String> shareData = shareInfo instanceof String ? getShareData((String) shareInfo) : (Map<String, String>) shareInfo;
+        ShareData shareData = getShareData((String) shareInfo);
         if (shareData == null) return;
         getShareToken(shareData);
-        if (!this.shareTokenCache.containsKey(shareData.get("shareId"))) return;
+        if (!this.shareTokenCache.containsKey(shareData.getShareId())) return;
-        listFile(shareIndex, shareData, videos, subtitles, shareData.get("shareId"), shareData.get("folderId"), 1);
+        listFile(shareIndex, shareData, videos, subtitles, shareData.getShareId(), shareData.getFolderId(), 1);
         if (!subtitles.isEmpty()) {
             for (Item video : videos) {
                 Map<String, Object> matchSubtitle = findBestLCS(video, subtitles);
@@ -193,7 +206,14 @@ public class QuarkApi {
     private void clearSaveDir() throws Exception {
         Map<String, Object> listData = Json.parseSafe(api("file/sort?" + this.pr + "&pdir_fid=" + this.saveDirId + "&_page=1&_size=200&_sort=file_type:asc,updated_at:desc", Collections.emptyMap(), 0, "GET"), Map.class);
         if (listData.get("data") != null && ((List<Map<String, Object>>) ((Map<String, Object>) listData.get("data")).get("list")).size() > 0) {
-            api("file/delete?" + this.pr, Map.of("action_type", 2, "filelist", ((List<Map<String, Object>>) ((Map<String, Object>) listData.get("data")).get("list")).stream().map(v -> v.get("fid")).toArray(), "exclude_fids", new Object[]{}), 0, "POST");
+            List<String> list = new ArrayList<>();
+            for (Map<String, Object> stringStringMap : ((List<Map<String, Object>>) ((Map<String, Object>) listData.get("data")).get("list"))) {
+                list.add((String) stringStringMap.get("fid"));
+            }
+            api("file/delete?" + this.pr,
+
+
+                    Map.of("action_type", "2", "filelist", Json.toJson(list), "exclude_fids", ""), 0, "POST");
         }
     }
 
@@ -213,7 +233,7 @@ public class QuarkApi {
             }
         }
         if (this.saveDirId == null) {
-            Map<String, Object> create = Json.parseSafe(api("file?" + this.pr, Map.of("pdir_fid", "0", "file_name", this.saveDirName, "dir_path", "", "dir_init_lock", false), 0, "POST"), Map.class);
+            Map<String, Object> create = Json.parseSafe(api("file?" + this.pr, Map.of("pdir_fid", "0", "file_name", this.saveDirName, "dir_path", "", "dir_init_lock", "false"), 0, "POST"), Map.class);
             if (create.get("data") != null && ((Map<String, Object>) create.get("data")).get("fid") != null) {
                 this.saveDirId = ((Map<String, Object>) create.get("data")).get("fid").toString();
             }
@@ -227,10 +247,10 @@ public class QuarkApi {
         }
         if (this.saveDirId == null) return null;
         if (stoken == null) {
-            getShareToken(Map.of("shareId", shareId));
+            getShareToken(new ShareData(shareId, null));
             if (!this.shareTokenCache.containsKey(shareId)) return null;
         }
-        Map<String, Object> saveResult = Json.parseSafe(api("share/sharepage/save?" + this.pr, Map.of("fid_list", new String[]{fileId}, "fid_token_list", new String[]{fileToken}, "to_pdir_fid", this.saveDirId, "pwd_id", shareId, "stoken", stoken != null ? stoken : this.shareTokenCache.get(shareId).get("stoken"), "pdir_fid", "0", "scene", "link"), 0, "POST"), Map.class);
+        Map<String, Object> saveResult = Json.parseSafe(api("share/sharepage/save?" + this.pr, Map.of("fid_list", fileId, "fid_token_list", fileToken, "to_pdir_fid", this.saveDirId, "pwd_id", shareId, "stoken", stoken != null ? stoken : (String) this.shareTokenCache.get(shareId).get("stoken"), "pdir_fid", "0", "scene", "link"), 0, "POST"), Map.class);
         if (saveResult.get("data") != null && ((Map<String, Object>) saveResult.get("data")).get("task_id") != null) {
             int retry = 0;
             while (true) {
@@ -255,7 +275,7 @@ public class QuarkApi {
         Map<String, Object> transcoding = Json.parseSafe(api("file/v2/play?" + this.pr, Map.of("fid", this.saveFileIdCaches.get(fileId), "resolutions", "normal,low,high,super,2k,4k", "supports", "fmp4"), 0, "POST"), Map.class);
         if (transcoding.get("data") != null && ((Map<String, Object>) transcoding.get("data")).get("video_list") != null) {
             String flagId = flag.split("-")[flag.split("-").length - 1];
-            int index = Utils.findAllIndexes(getPlayFormatList(), flagId);
+            int index = Util.findAllIndexes(getPlayFormatList(), flagId);
             String quarkFormat = getPlayFormatQuarkList().get(index);
             for (Map<String, Object> video : (List<Map<String, Object>>) ((Map<String, Object>) transcoding.get("data")).get("video_list")) {
                 if (video.get("resolution").equals(quarkFormat)) {
@@ -299,4 +319,5 @@ public class QuarkApi {
     }
 
 
-}*/
+}
+

app/src/main/java/com/github/catvod/spider/Quark.java

@@ -0,0 +1,106 @@
+package com.github.catvod.spider;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.github.catvod.api.AliYun;
+import com.github.catvod.api.QuarkApi;
+import com.github.catvod.bean.Result;
+import com.github.catvod.bean.Vod;
+import com.github.catvod.bean.quark.ShareData;
+import com.github.catvod.crawler.Spider;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+/**
+ * @author ColaMint & Adam & FongMi
+ */
+public class Quark extends Spider {
+
+
+    @Override
+    public void init(Context context, String extend) {
+
+        //QuarkApi.get().setRefreshToken(extend);
+    }
+
+    @Override
+    public String detailContent(List<String> ids) throws Exception {
+      /*  List<Item> videoItems = new ArrayList<>();
+        List<Item> subItems = new ArrayList<>();
+
+        try {
+            quarkApi.getFilesByShareUrl(1, ids.get(0), videoItems, subItems);
+
+            if (!videoItems.isEmpty()) {
+                SpiderDebug.log("获取播放链接成功,分享链接为:" + String.join("\t", ids));
+            } else {
+                SpiderDebug.log("获取播放链接失败,检查分享链接为:" + String.join("\t", ids));
+            }
+        } catch (InterruptedException e) {
+            SpiderDebug.log("获取夸克视频失败,失败原因为:" + e.getMessage() + " 行数为:" + e.getStackTrace()[0].getLineNumber());
+        }
+
+*/
+        ShareData shareData = QuarkApi.get().getShareData(ids.get(0));
+        return Result.string(QuarkApi.get().getVod(shareData));
+    }
+
+
+    @Override
+    public String playerContent(String flag, String id, List<String> vipFlags) {
+        return AliYun.get().playerContent(id.split("\\+"), flag);
+    }
+
+    private Vod parseVod(Matcher matcher, String id) {
+        String shareId = matcher.group(2);
+        String fileId = matcher.groupCount() == 4 ? matcher.group(4) : "";
+        return AliYun.get().getVod(id, shareId, fileId);
+    }
+
+    /**
+     * 獲取詳情內容視頻播放來源（多 shared_link）
+     *
+     * @param ids share_link 集合
+     * @return 詳情內容視頻播放來源
+     */
+    public String detailContentVodPlayFrom(List<String> ids) {
+        List<String> playFrom = new ArrayList<>();
+        if (ids.size() < 2)
+            return TextUtils.join("$$$", Arrays.asList("轉存原畫", "分享原畫", "代理普畫"));
+        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));
+        }
+        return TextUtils.join("$$$", playFrom);
+    }
+
+    /**
+     * 獲取詳情內容視頻播放地址（多 share_link）
+     *
+     * @param ids share_link 集合
+     * @return 詳情內容視頻播放地址
+     */
+    public String detailContentVodPlayUrl(List<String> ids) {
+       /* List<String> playUrl = new ArrayList<>();
+        for (String id : ids) {
+            Matcher matcher = pattern.matcher(id);
+            if (matcher.find()) playUrl.add(parseVod(matcher, id).getVodPlayUrl());
+        }
+        return TextUtils.join("$$$", playUrl);*/
+        return null;
+    }
+
+    public static Object[] proxy(Map<String, String> params) throws Exception {
+        String type = params.get("type");
+        if ("video".equals(type)) return AliYun.get().proxyVideo(params);
+        if ("sub".equals(type)) return AliYun.get().proxySub(params);
+        return null;
+    }
+}

app/src/main/java/com/github/catvod/utils/Util.java

@@ -323,6 +323,18 @@ public class Util {
         return new LCSResult(maxlen, sequence.toString(), lastSubsBegin);
     }
 
+
+    public static Integer findAllIndexes(List<String> arr, String value) {
+
+        for (int i = 0; i < arr.size(); i++) {
+            if (arr.get(i).equals(value)) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+
     public static class LCSResult {
         public int length;
         public String sequence;