Update mqitv

app/src/main/java/com/github/catvod/bean/mqitv/Data.java

@@ -14,6 +14,8 @@ public class Data {
     private String id;
     @SerializedName("name")
     private String name;
+    @SerializedName("playing")
+    private String playing;
     @SerializedName("port")
     private String port;
     @SerializedName("stat")
@@ -39,6 +41,10 @@ public class Data {
         return port == null ? "" : port;
     }
 
+    public String getPlaying() {
+        return playing == null ? "" : playing;
+    }
+
     public Stat getStat() {
         return stat == null ? new Stat() : stat;
     }

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

@@ -41,24 +41,36 @@ public class MQiTV extends Spider {
         StringBuilder sb = new StringBuilder();
         boolean fixed = ext.startsWith("http");
         loadUser(data = Data.objectFrom(OkHttp.string(getHost() + "/api/post?item=itv_traffic")).getData());
-        for (Data item : data) sb.append(item.getName()).append(",").append("proxy://do=mqitv").append("&id=").append(item.getId()).append("&port=").append(fixed ? item.getPort() : "5003").append("&type=m3u8").append("\n");
+        for (Data item : data) sb.append(item.getName()).append(",").append("proxy://do=mqitv").append("&id=").append(item.getId()).append("&playing=").append(item.getPlaying()).append("&port=").append(fixed ? item.getPort() : "5003").append("&type=m3u8").append("\n");
         return sb.toString();
     }
 
     public static Object[] proxy(Map<String, String> params) {
-        String id = params.get("id");
         String ip = params.get("ip");
         String port = params.get("port");
         if (port == null) port = "5003";
         if (ip != null) ext = ip;
         String token = getToken();
-        String auth = authChannel(id, token);
+        if (token.isEmpty()) {
-        SpiderDebug.log("id=" + id + ", token=" + token + ", auth=" + auth);
+            Map<String, String> header = new HashMap<>();
-        Object[] result = new Object[3];
+            String playing = params.get("playing");
-        result[0] = 200;
+            header.put("Location", getStaticUrl(port, playing));
-        result[1] = "application/vnd.apple.mpegurl";
+            Object[] result = new Object[4];
-        result[2] = new ByteArrayInputStream(getM3u8(id, port, token).getBytes());
+            result[0] = 302;
-        return result;
+            result[1] = "text/plain";
+            result[2] = new ByteArrayInputStream("302 Found".getBytes());
+            result[3] = header;
+            return result;
+        } else {
+            String id = params.get("id");
+            String auth = authChannel(id, token);
+            SpiderDebug.log("id=" + id + ", token=" + token + ", auth=" + auth);
+            Object[] result = new Object[3];
+            result[0] = 200;
+            result[1] = "application/vnd.apple.mpegurl";
+            result[2] = new ByteArrayInputStream(getM3u8(id, port, token).getBytes());
+            return result;
+        }
     }
 
     private static void loadUser(List<Data> data) {
@@ -88,8 +100,7 @@ public class MQiTV extends Spider {
         String url = String.format(Locale.getDefault(), "%s/HSAndroidLogin.ecgi?ty=json&net_account=%s&mac_address1=%s&_=%d", getHost(), user.getId(), user.getMac(), System.currentTimeMillis());
         Pattern pattern = Pattern.compile("\"Token\"\\s*:\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(OkHttp.string(url));
-        if (matcher.find()) return matcher.group(1);
+        return matcher.find() ? matcher.group(1) : "";
-        return getToken();
     }
 
     private static String authChannel(String id, String token) {
@@ -110,4 +121,8 @@ public class MQiTV extends Spider {
         }
         return sb.toString();
     }
+
+    private static String getStaticUrl(String port, String playing) {
+        return "http://" + Uri.parse(getHost()).getHost() + ":" + port + "/" + playing;
+    }
 }

jar/custom_spider.jar.md5

@@ -1 +1 @@
-2389f95e0c10d62ec636ccb2a8b8de4e
+2fceaaa9b351c56808bd6c477f229348