修复长链接致使文件名过长引起任务异常的问题

修复m3u8中ts的url为具体直链时引起的下载异常的问题
调整本地m3u8切片文件命名策略

Author: JinJieGu

README.md

@@ -11,7 +11,7 @@ allprojects {
 	}
 	
 dependencies {
-	        compile 'com.github.Jay-Goo:M3U8Downloader:V1.0.6'
+	        compile 'com.github.Jay-Goo:M3U8Downloader:V1.0.7'
 	}
 ```
 

app/src/main/java/jaygoo/m3u8downloader/MainActivity.java

@@ -24,6 +24,7 @@
 import jaygoo.library.m3u8downloader.bean.M3U8Task;
 import jaygoo.library.m3u8downloader.utils.AES128Utils;
 import jaygoo.library.m3u8downloader.utils.M3U8Log;
+import jaygoo.library.m3u8downloader.utils.MD5Utils;
 import jaygoo.library.m3u8downloader.utils.MUtils;
 
 public class MainActivity extends AppCompatActivity {
@@ -32,7 +33,7 @@ public class MainActivity extends AppCompatActivity {
             Manifest.permission.READ_EXTERNAL_STORAGE,
     };
 
-    M3U8Task[] taskList = new M3U8Task[6];
+    M3U8Task[] taskList = new M3U8Task[5];
     private VideoListAdapter adapter;
     private String dirPath;
     private String encryptKey = "63F06F99D823D33AAB89A0A93DECFEE0"; //get the key by AES128Utils.getAESKey()
@@ -90,19 +91,16 @@ public void onClick(View v) {
     }
 
     private void initData(){
-
-        M3U8Task bean0 = new M3U8Task("https://media6.smartstudy.com/52/9c/10732/4/dest.m3u8");
-        M3U8Task bean1 = new M3U8Task("https://media6.smartstudy.com/b2/75/2475/4/dest.m3u8");
+        M3U8Task bean0 = new M3U8Task("http://hls.ciguang.tv/hdtv/video.m3u8");
+        M3U8Task bean1 = new M3U8Task("http://pl-ali.youku.com/playlist/m3u8?ts=1524205957&keyframe=0&m3u8Md5=a85842b9ca4e77db4aa57c314c8e61c7&t1=200&pid=1133275aa6ac0891&vid=XMzU1MDY0NjEyMA==&type=flv&oip=1779113856&sid=0524205957937209643a0&token=2124&did=ae8263a35f7eaca76f68bb61436e6dac&ev=1&ctype=20&ep=YlUi3d%2BWQ%2F5shnijRhmbvlc%2FYJ8QmCsaCWAJ1RRpNbA%3D&ymovie=1");
         M3U8Task bean2 = new M3U8Task("https://media6.smartstudy.com/ae/07/3997/2/dest.m3u8");
-        M3U8Task bean3 = new M3U8Task("http://hls.ciguang.tv/hdtv/video.m3u8");
+        M3U8Task bean3 = new M3U8Task("https://www3.laqddc.com/hls/2018/04/07/BQ2cqpyZ/playlist.m3u8");
         M3U8Task bean4 = new M3U8Task("http://hcjs2ra2rytd8v8np1q.exp.bcevod.com/mda-hegtjx8n5e8jt9zv/mda-hegtjx8n5e8jt9zv.m3u8");
-        M3U8Task bean5 = new M3U8Task("https://media6.smartstudy.com/55/34/2542/4/dest.m3u8");
         taskList[0] = bean0;
         taskList[1] = bean1;
         taskList[2] = bean2;
         taskList[3] = bean3;
         taskList[4] = bean4;
-        taskList[5] = bean5;
     }
 
     private OnM3U8DownloadListener onM3U8DownloadListener = new OnM3U8DownloadListener() {

library/src/main/java/jaygoo/library/m3u8downloader/M3U8DownloadTask.java

@@ -253,18 +253,18 @@ public void run() {
 
                     File file;
                     try {
-                        String fileName = M3U8EncryptHelper.encryptFileName(encryptKey,m3U8Ts.getFile());
+                        String fileName = M3U8EncryptHelper.encryptFileName(encryptKey, m3U8Ts.obtainEncodeTsFileName());
                         file = new File(dir + File.separator + fileName);
                     } catch (Exception e) {
-                        file = new File(dir + File.separator + m3U8Ts.getFile());
+                        file = new File(dir + File.separator + m3U8Ts.getUrl());
                     }
 
                     if (!file.exists()) {//下载过的就不管了
 
                         FileOutputStream fos = null;
                         InputStream inputStream = null;
                         try {
-                            URL url = new URL(basePath + m3U8Ts.getFile());
+                            URL url = new URL(m3U8Ts.obtainFullUrl(basePath));
                             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                             conn.setConnectTimeout(connTimeout);
                             conn.setReadTimeout(readTimeout);

library/src/main/java/jaygoo/library/m3u8downloader/bean/M3U8Ts.java

@@ -2,27 +2,32 @@
 
 import android.support.annotation.NonNull;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jaygoo.library.m3u8downloader.utils.MD5Utils;
+
 /**
  * m3u8切片类
  * Created by HDL on 2017/7/24.
  */
 
 public class M3U8Ts implements Comparable<M3U8Ts> {
-    private String file;
+    private String url;
     private long fileSize;
     private float seconds;
 
-    public M3U8Ts(String file, float seconds) {
-        this.file = file;
+    public M3U8Ts(String url, float seconds) {
+        this.url = url;
         this.seconds = seconds;
     }
 
-    public String getFile() {
-        return file;
+    public String getUrl() {
+        return url;
     }
 
-    public void setFile(String file) {
-        this.file = file;
+    public void setUrl(String url) {
+        this.url = url;
     }
 
     public float getSeconds() {
@@ -33,25 +38,42 @@ public void setSeconds(float seconds) {
         this.seconds = seconds;
     }
 
+    public String obtainEncodeTsFileName(){
+        if (url == null)return "error.ts";
+        return MD5Utils.encode(url).concat(".ts");
+    }
+
+    public String obtainFullUrl(String hostUrl){
+        if (url == null) {
+            return null;
+        }
+        if (url.startsWith("http")) {
+            return url;
+        }else if (url.startsWith("//")) {
+            return "http:".concat(url);
+        }else {
+            return hostUrl.concat(url);
+        }
+    }
     @Override
     public String toString() {
-        return file + " (" + seconds + "sec)";
+        return url + " (" + seconds + "sec)";
     }
 
     /**
      * 获取时间
      */
     public long getLongDate() {
         try {
-            return Long.parseLong(file.substring(0, file.lastIndexOf(".")));
+            return Long.parseLong(url.substring(0, url.lastIndexOf(".")));
         }catch (NumberFormatException e){
             return 0;
         }
     }
 
     @Override
     public int compareTo(@NonNull M3U8Ts o) {
-        return file.compareTo(o.file);
+        return url.compareTo(o.url);
     }
 
     public long getFileSize() {

library/src/main/java/jaygoo/library/m3u8downloader/utils/MUtils.java

@@ -130,7 +130,7 @@ public static File createLocalM3U8(File m3u8Dir, String fileName, M3U8 m3U8, Str
         for (M3U8Ts m3U8Ts : m3U8.getTsList()) {
             if (keyPath != null) bfw.write("#EXT-X-KEY:METHOD=AES-128,URI=\""+keyPath+"\"\n");
             bfw.write("#EXTINF:" + m3U8Ts.getSeconds()+",\n");
-            bfw.write(m3U8Ts.getFile());
+            bfw.write(m3U8Ts.obtainEncodeTsFileName());
             bfw.newLine();
         }
         bfw.write("#EXT-X-ENDLIST");