Update Docs

Update Downloader.cs

N_m3u8DL-CLI/Decrypter.cs

@@ -10,7 +10,7 @@ namespace N_m3u8DL_CLI
 {
     class Decrypter
     {
-        public static byte[] AES128Decrypt(string filePath, byte[] keyByte, byte[] ivByte)
+        public static byte[] AES128Decrypt(string filePath, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC)
         {
             FileStream fs = new FileStream(filePath, FileMode.Open);
             //获取文件大小
@@ -24,7 +24,7 @@ namespace N_m3u8DL_CLI
             dcpt.KeySize = 128;
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
-            dcpt.Mode = CipherMode.CBC;
+            dcpt.Mode = mode;
             dcpt.Padding = PaddingMode.PKCS7;
 
             ICryptoTransform cTransform = dcpt.CreateDecryptor();
@@ -32,7 +32,7 @@ namespace N_m3u8DL_CLI
             return resultArray;
         }
 
-        public static byte[] AES128Decrypt(byte[] encryptedBuff, byte[] keyByte, byte[] ivByte)
+        public static byte[] AES128Decrypt(byte[] encryptedBuff, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC)
         {
             byte[] inBuff = encryptedBuff;
 
@@ -41,7 +41,7 @@ namespace N_m3u8DL_CLI
             dcpt.KeySize = 128;
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
-            dcpt.Mode = CipherMode.CBC;
+            dcpt.Mode = mode;
             dcpt.Padding = PaddingMode.PKCS7;
 
             ICryptoTransform cTransform = dcpt.CreateDecryptor();

N_m3u8DL-CLI/DownloadManager.cs

@@ -36,7 +36,7 @@ namespace N_m3u8DL_CLI
         bool externalSub = false;  //额外的字幕
         string externalSubUrl = "";
         string fflogName = "_ffreport.log";
-        private bool binaryMerge = false;
+        public static bool BinaryMerge = false;
         private bool noMerge = false;
         private bool muxFastStart = true;
         private string muxFormat = "mp4";
@@ -51,7 +51,6 @@ namespace N_m3u8DL_CLI
         public string MuxFormat { get => muxFormat; set => muxFormat = value; }
         public bool MuxFastStart { get => muxFastStart; set => muxFastStart = value; }
         public string MuxSetJson { get => muxSetJson; set => muxSetJson = value; }
-        public bool BinaryMerge { get => binaryMerge; set => binaryMerge = value; }
         public int TimeOut { get => timeOut; set => timeOut = value; }
         public static double DownloadedSize { get => downloadedSize; set => downloadedSize = value; }
         public static bool HasSetDir { get => hasSetDir; set => hasSetDir = value; }
@@ -171,6 +170,8 @@ namespace N_m3u8DL_CLI
                 sd.SavePath = DownDir + "\\!MAP.tsdownloading";
                 if (File.Exists(sd.SavePath))
                     File.Delete(sd.SavePath);
+                if (File.Exists(DownDir + "\\Part_0\\!MAP.ts"))
+                    File.Delete(DownDir + "\\Part_0\\!MAP.ts");
                 LOGGER.PrintLine("下载MAP文件...");
                 sd.Down();  //开始下载
             }
@@ -397,6 +398,10 @@ namespace N_m3u8DL_CLI
                         {
                             LOGGER.PrintLine("二进制合并...请耐心等待");
                             MuxFormat = "ts";
+                            //有MAP文件，一般为mp4，采取默认动作
+                            if(File.Exists(DownDir + "\\Part_0\\!MAP.ts"))
+                                MuxFormat = "mp4";
+
                             if (Global.AUDIO_TYPE != "")
                                 MuxFormat = Global.AUDIO_TYPE;
                             Global.CombineMultipleFilesIntoSingleFile(Global.GetFiles(DownDir + "\\Part_0", ".ts"), FFmpeg.OutPutPath + $".{MuxFormat}");
@@ -547,6 +552,9 @@ namespace N_m3u8DL_CLI
                     {
                         LOGGER.PrintLine("二进制合并...请耐心等待");
                         MuxFormat = "ts";
+                        //有MAP文件，一般为mp4，采取默认动作
+                        if (File.Exists(DownDir + "\\!MAP.ts")) 
+                            MuxFormat = "mp4";
                         Global.CombineMultipleFilesIntoSingleFile(Global.GetFiles(DownDir, ".ts"), FFmpeg.OutPutPath + $".{MuxFormat}");
                     }
                     else

N_m3u8DL-CLI/Downloader.cs

@@ -1,4 +1,5 @@
-using System;
+//using DecryptYK;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
@@ -12,6 +13,8 @@ namespace N_m3u8DL_CLI
 {
     class Downloader
     {
+        public static bool YouKuAES = false;
+
         private int timeOut = 0;
         private int retry = 5;
         private int count = 0;
@@ -72,43 +75,67 @@ namespace N_m3u8DL_CLI
                 {
                     IsDone = false;  //设置为未完成下载
 
-                    if (Method == "NONE")
+                    if (Method == "NONE" || method.Contains("NOTSUPPORTED")) 
                     {
                         LOGGER.PrintLine("<" + SegIndex + " Downloading>");
+                        LOGGER.WriteLine("<" + SegIndex + " Downloading>");
                         byte[] segBuff = Global.HttpDownloadFileToBytes(fileUrl, Headers, TimeOut);
                         //byte[] segBuff = Global.WebClientDownloadToBytes(fileUrl, Headers);
                         Global.AppendBytesToFileStreamAndDoNotClose(LiveStream, segBuff);
                         LOGGER.PrintLine("<" + SegIndex + " Complete>\r\n");
+                        LOGGER.WriteLine("<" + SegIndex + " Complete>");
                         IsDone = true;
                     }
                     else if (Method == "AES-128")
                     {
                         LOGGER.PrintLine("<" + SegIndex + " Downloading>");
+                        LOGGER.WriteLine("<" + SegIndex + " Downloading>");
                         byte[] encryptedBuff = Global.HttpDownloadFileToBytes(fileUrl, Headers, TimeOut);
                         //byte[] encryptedBuff = Global.WebClientDownloadToBytes(fileUrl, Headers);
-                        byte[] decryptBuff = Decrypter.AES128Decrypt(
-                            encryptedBuff,
-                            Convert.FromBase64String(Key),
-                            Decrypter.HexStringToBytes(Iv)
-                            );
+                        byte[] decryptBuff = null;
+                        if (YouKuAES)
+                        {
+                            //decryptBuff = DecrypterYK.Decrypt(
+                            decryptBuff = Decrypter.AES128Decrypt(
+                                encryptedBuff,
+                                Convert.FromBase64String(Key),
+                                Decrypter.HexStringToBytes(Iv)
+                                );
+                        }
+                        else
+                        {
+                            decryptBuff = Decrypter.AES128Decrypt(
+                                encryptedBuff,
+                                Convert.FromBase64String(Key),
+                                Decrypter.HexStringToBytes(Iv)
+                                );
+                        }
                         Global.AppendBytesToFileStreamAndDoNotClose(LiveStream, decryptBuff);
                         LOGGER.PrintLine("<" + SegIndex + " Complete>\r\n");
+                        LOGGER.WriteLine("<" + SegIndex + " Complete>");
                         IsDone = true;
                     }
                     else
                     {
-                        LOGGER.PrintLine("不支持这种加密方式!", LOGGER.Error);
+                        //LOGGER.PrintLine("不支持这种加密方式!", LOGGER.Error);
                         IsDone = true;
                     }
                     if (firstSeg && Global.FileSize(LiveFile) != 0)
                     {
-                        LOGGER.STOPLOG = false;  //记录日志
+                        //LOGGER.STOPLOG = false;  //记录日志
                         foreach (string ss in (string[])Global.GetVideoInfo(LiveFile).ToArray(typeof(string)))
                         {
                             LOGGER.WriteLine(ss.Trim());
                         }
                         firstSeg = false;
-                        LOGGER.STOPLOG = true;  //停止记录日志
+                        //LOGGER.STOPLOG = true;  //停止记录日志
+                    }
+                    HLSLiveDownloader.REC_DUR += SegDur;
+                    if (HLSLiveDownloader.REC_DUR_LIMIT != -1 && HLSLiveDownloader.REC_DUR >= HLSLiveDownloader.REC_DUR_LIMIT)
+                    {
+                        LOGGER.PrintLine("录制已到达限定长度", LOGGER.Warning);
+                        LOGGER.WriteLine("录制已到达限定长度");
+                        Environment.Exit(0); //正常退出
                     }
                     return;
                 }
@@ -167,7 +194,7 @@ namespace N_m3u8DL_CLI
                 if (File.Exists(savePath) && Global.ShouldStop == false) 
                 {
                     FileInfo fi = new FileInfo(savePath);
-                    if (Method == "NONE")
+                    if (Method == "NONE" || method.Contains("NOTSUPPORTED"))
                     {
                         fi.MoveTo(Path.GetDirectoryName(savePath) + "\\" + Path.GetFileNameWithoutExtension(savePath) + ".ts");
                         DownloadManager.DownloadedSize += fi.Length;
@@ -179,11 +206,33 @@ namespace N_m3u8DL_CLI
                         //解密
                         try
                         {
-                            byte[] decryptBuff = Decrypter.AES128Decrypt(
-                                fi.FullName,
-                                Convert.FromBase64String(Key),
-                                Decrypter.HexStringToBytes(Iv)
-                                );
+                            byte[] decryptBuff = null;
+                            if (YouKuAES)
+                            {
+                                //decryptBuff = DecrypterYK.Decrypt(
+                                decryptBuff = Decrypter.AES128Decrypt(
+                                        File.ReadAllBytes(fi.FullName),
+                                    Convert.FromBase64String(Key),
+                                    Decrypter.HexStringToBytes(Iv)
+                                    );
+                            }
+                            else if(fileUrl.Contains(".51cto.com/")) //使用AES-128-ECB模式解密
+                            {
+                                decryptBuff = Decrypter.AES128Decrypt(
+                                    fi.FullName,
+                                    Convert.FromBase64String(Key),
+                                    Decrypter.HexStringToBytes(Iv),
+                                    System.Security.Cryptography.CipherMode.ECB
+                                    );
+                            }
+                            else
+                            {
+                                decryptBuff = Decrypter.AES128Decrypt(
+                                    fi.FullName,
+                                    Convert.FromBase64String(Key),
+                                    Decrypter.HexStringToBytes(Iv)
+                                    );
+                            }
                             FileStream fs = new FileStream(Path.GetDirectoryName(savePath) + "\\" + Path.GetFileNameWithoutExtension(savePath) + ".ts", FileMode.Create);
                             fs.Write(decryptBuff, 0, decryptBuff.Length);
                             fs.Close();
@@ -193,16 +242,11 @@ namespace N_m3u8DL_CLI
                         }
                         catch (Exception ex)
                         {
+                            LOGGER.PrintLine(ex.Message, LOGGER.Error);
                             LOGGER.WriteLineError(ex.Message);
+                            Environment.Exit(-1);
                         }
                     }
-                    else if(File.Exists(fi.FullName)
-                        && Method != "AES-128")
-                    {
-                        LOGGER.WriteLineError($"Do not support this METHOD: {Method}");
-                        LOGGER.PrintLine("不支持这种加密方式!", LOGGER.Error);
-                        return;
-                    }
                     else
                     {
                         LOGGER.WriteLineError("Something was wrong!");
@@ -215,14 +259,14 @@ namespace N_m3u8DL_CLI
             catch (Exception ex)
             {
                 LOGGER.WriteLineError(ex.Message);
-                if (ex.Message.Contains("404"))
+                if (ex.Message.Contains("404") || ex.Message.Contains("400"))//(400) 错误的请求,片段过期会提示400错误
                 {
                     IsDone = true;
                     return;
                 }
                 else if (IsLive && count++ < Retry) 
                 {
-                    Thread.Sleep(5000);
+                    Thread.Sleep(2000);//直播一般3-6秒一个片段
                     Down();
                 }
             }

N_m3u8DL-CLI/FFmpeg.cs

@@ -23,6 +23,13 @@ namespace N_m3u8DL_CLI
             string poster = "", string audioName = "", string title = "",
             string copyright = "", string comment = "", string encodingTool = "")
         {
+            //同名文件已存在的共存策略
+            if (File.Exists($"{OutPutPath}.{muxFormat.ToLower()}")) 
+            {
+                OutPutPath = Path.Combine(Path.GetDirectoryName(OutPutPath),
+                    Path.GetFileName(OutPutPath) + "_" + DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"));
+            }
+
             string command = "-loglevel warning -i concat:\"";
             string data = string.Empty;
             string ddpAudio = string.Empty;
@@ -86,7 +93,7 @@ namespace N_m3u8DL_CLI
             if (Global.VIDEO_TYPE == "H264")
             {
                 Run("ffmpeg",
-                    "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -f mpegts -bsf:v h264_mp4toannexb \""
+                    "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -copy_unknown -f mpegts -bsf:v h264_mp4toannexb \""
                     + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts\"", 
                     Path.GetDirectoryName(file));
                 if (File.Exists(Path.GetDirectoryName(file) + "\\" + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts"))
@@ -98,7 +105,7 @@ namespace N_m3u8DL_CLI
             else if (Global.VIDEO_TYPE == "H265")
             {
                 Run("ffmpeg",
-                    "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -f mpegts -bsf:v hevc_mp4toannexb \""
+                    "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -copy_unknown -f mpegts -bsf:v hevc_mp4toannexb \""
                     + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts\"",
                     Path.GetDirectoryName(file));
                 if (File.Exists(Path.GetDirectoryName(file) + "\\" + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts"))

N_m3u8DL-CLI/Global.cs

@@ -30,8 +30,8 @@ namespace N_m3u8DL_CLI
 
 
         /*===============================================================================*/
-        static string nowVer = "2.4.8";
-        static string nowDate = "20200131";
+        static string nowVer = "2.5.7";
+        static string nowDate = "20200305";
         public static void WriteInit()
         {
             Console.Clear();
@@ -100,87 +100,93 @@ namespace N_m3u8DL_CLI
         public static string GetWebSource(String url, string headers = "", int TimeOut = 60000)
         {
             string htmlCode = string.Empty;
-            try
+            for(int i = 0; i < 10; i++)
             {
-                HttpWebRequest webRequest = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url);
-                webRequest.Method = "GET";
-                if (NoProxy) webRequest.Proxy = null;
-                webRequest.UserAgent = "Mozilla/4.0";
-                webRequest.Headers.Add("Accept-Encoding", "gzip, deflate");
-                webRequest.Timeout = TimeOut;  //设置超时
-                webRequest.KeepAlive = false;
-                webRequest.AllowAutoRedirect = true;  //自动跳转
-                if (url.Contains("pcvideo") && url.Contains(".titan.mgtv.com"))
+                try
                 {
-                    webRequest.UserAgent = "";
-                    if (!url.Contains("/internettv/"))
-                        webRequest.Referer = "https://player.mgtv.com/mgtv_v6_player/PlayerCore.swf";
-                    webRequest.Headers.Add("Cookie", "MQGUID");
-                }
-                //添加headers
-                if (headers != "")
-                {
-                    foreach (string att in headers.Split('|'))
+                    HttpWebRequest webRequest = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url);
+                    webRequest.Method = "GET";
+                    if (NoProxy) webRequest.Proxy = null;
+                    webRequest.UserAgent = "Mozilla/4.0";
+                    webRequest.Headers.Add("Accept-Encoding", "gzip, deflate");
+                    webRequest.Timeout = TimeOut;  //设置超时
+                    webRequest.KeepAlive = false;
+                    webRequest.AllowAutoRedirect = true;  //自动跳转
+                    if (url.Contains("pcvideo") && url.Contains(".titan.mgtv.com"))
                     {
-                        try
+                        webRequest.UserAgent = "";
+                        if (!url.Contains("/internettv/"))
+                            webRequest.Referer = "https://player.mgtv.com/mgtv_v6_player/PlayerCore.swf";
+                        webRequest.Headers.Add("Cookie", "MQGUID");
+                    }
+                    //添加headers
+                    if (headers != "")
+                    {
+                        foreach (string att in headers.Split('|'))
                         {
-                            if (att.Split(':')[0].ToLower() == "referer")
-                                webRequest.Referer = att.Substring(att.IndexOf(":") + 1);
-                            else if (att.Split(':')[0].ToLower() == "user-agent")
-                                webRequest.UserAgent = att.Substring(att.IndexOf(":") + 1);
-                            else if (att.Split(':')[0].ToLower() == "range")
-                                webRequest.AddRange(Convert.ToInt32(att.Substring(att.IndexOf(":") + 1).Split('-')[0], Convert.ToInt32(att.Substring(att.IndexOf(":") + 1).Split('-')[1])));
-                            else if (att.Split(':')[0].ToLower() == "accept")
-                                webRequest.Accept = att.Substring(att.IndexOf(":") + 1);
-                            else
-                                webRequest.Headers.Add(att);
-                        }
-                        catch (Exception e)
-                        {
-                            LOGGER.WriteLineError(e.Message);
+                            try
+                            {
+                                if (att.Split(':')[0].ToLower() == "referer")
+                                    webRequest.Referer = att.Substring(att.IndexOf(":") + 1);
+                                else if (att.Split(':')[0].ToLower() == "user-agent")
+                                    webRequest.UserAgent = att.Substring(att.IndexOf(":") + 1);
+                                else if (att.Split(':')[0].ToLower() == "range")
+                                    webRequest.AddRange(Convert.ToInt32(att.Substring(att.IndexOf(":") + 1).Split('-')[0], Convert.ToInt32(att.Substring(att.IndexOf(":") + 1).Split('-')[1])));
+                                else if (att.Split(':')[0].ToLower() == "accept")
+                                    webRequest.Accept = att.Substring(att.IndexOf(":") + 1);
+                                else
+                                    webRequest.Headers.Add(att);
+                            }
+                            catch (Exception e)
+                            {
+                                LOGGER.WriteLineError(e.Message);
+                            }
                         }
                     }
-                }
-                HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
-                if (webResponse.ContentEncoding != null
-                    && webResponse.ContentEncoding.ToLower() == "gzip") //如果使用了GZip则先解压
-                {
-                    using (Stream streamReceive = webResponse.GetResponseStream())
+                    HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
+                    if (webResponse.ContentEncoding != null
+                        && webResponse.ContentEncoding.ToLower() == "gzip") //如果使用了GZip则先解压
                     {
-                        using (var zipStream =
-                            new System.IO.Compression.GZipStream(streamReceive, System.IO.Compression.CompressionMode.Decompress))
+                        using (Stream streamReceive = webResponse.GetResponseStream())
                         {
-                            using (StreamReader sr = new StreamReader(zipStream, Encoding.UTF8))
+                            using (var zipStream =
+                                new System.IO.Compression.GZipStream(streamReceive, System.IO.Compression.CompressionMode.Decompress))
+                            {
+                                using (StreamReader sr = new StreamReader(zipStream, Encoding.UTF8))
+                                {
+                                    htmlCode = sr.ReadToEnd();
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        using (Stream streamReceive = webResponse.GetResponseStream())
+                        {
+                            using (StreamReader sr = new StreamReader(streamReceive, Encoding.UTF8))
                             {
                                 htmlCode = sr.ReadToEnd();
                             }
                         }
                     }
-                }
-                else
-                {
-                    using (Stream streamReceive = webResponse.GetResponseStream())
-                    {
-                        using (StreamReader sr = new StreamReader(streamReceive, Encoding.UTF8))
-                        {
-                            htmlCode = sr.ReadToEnd();
-                        }
-                    }
-                }
 
-                if (webResponse != null)
-                {
-                    webResponse.Close();
+                    if (webResponse != null)
+                    {
+                        webResponse.Close();
+                    }
+                    if (webRequest != null)
+                    {
+                        webRequest.Abort();
+                    }
+                    break;
                 }
-                if (webRequest != null)
+                catch (Exception e)  //捕获所有异常
                 {
-                    webRequest.Abort();
+                    LOGGER.WriteLineError(e.Message);
+                    Thread.Sleep(1000); //1秒后重试
+                    continue;
                 }
             }
-            catch (Exception e)  //捕获所有异常
-            {
-                LOGGER.WriteLineError(e.Message);
-            }
 
             return htmlCode;
         }
@@ -290,6 +296,12 @@ namespace N_m3u8DL_CLI
         /// <param name="outputFilePath"></param>
         public static void CombineMultipleFilesIntoSingleFile(string[] files, string outputFilePath)
         {
+            //同名文件已存在的共存策略
+            if (File.Exists(outputFilePath))
+            {
+                outputFilePath = Path.Combine(Path.GetDirectoryName(outputFilePath),
+                    Path.GetFileNameWithoutExtension(outputFilePath) + "_" + DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + Path.GetExtension(outputFilePath));
+            }
             if (files.Length == 1)
             {
                 FileInfo fi = new FileInfo(files[0]);

N_m3u8DL-CLI/HLSLiveDownloader.cs

@@ -12,15 +12,17 @@ namespace N_m3u8DL_CLI
 {
     class HLSLiveDownloader
     {
+        public static int REC_DUR_LIMIT = -1; //默认不限制录制时长
+        public static double REC_DUR = 0; //已录制时长
         private string liveFile = string.Empty;
         private string jsonFile = string.Empty;
         private string headers = string.Empty;
         private string downDir = string.Empty;
         private FileStream liveStream = null;
-        private int targetduration = 10;
+        private double targetduration = 10;
         private bool isFirstJson = true;
 
-
+        public double TotalDuration { get; set; }
         public string Headers { get => headers; set => headers = value; }
         public string DownDir { get => downDir; set => downDir = value; }
         public FileStream LiveStream { get => liveStream; set => liveStream = value; }
@@ -33,7 +35,7 @@ namespace N_m3u8DL_CLI
         public void TimerStart()
         {
             timer.Enabled = true;
-            timer.Interval = (targetduration - 2) * 1000; //执行间隔时间,单位为毫秒
+            //timer.Interval = (targetduration - 2) * 1000; //执行间隔时间,单位为毫秒
             timer.Start();
             timer.Elapsed += new ElapsedEventHandler(UpdateList);
             UpdateList(timer, new EventArgs());  //立即执行一次
@@ -57,7 +59,9 @@ namespace N_m3u8DL_CLI
             string jsonContent = File.ReadAllText(jsonFile);
             JObject initJson = JObject.Parse(jsonContent);
             string m3u8Url = initJson["m3u8"].Value<string>();
-            targetduration = initJson["m3u8Info"]["targetDuration"].Value<int>();
+            targetduration = initJson["m3u8Info"]["targetDuration"].Value<double>();
+            TotalDuration = initJson["m3u8Info"]["totalDuration"].Value<double>();
+            timer.Interval = (TotalDuration - targetduration) * 1000;//设置定时器运行间隔
             JArray lastSegments = JArray.Parse(initJson["m3u8Info"]["segments"][0].ToString().Trim());  //上次的分段，用于比对新分段
             ArrayList tempList = new ArrayList();  //所有待下载的列表
             tempList.Clear();
@@ -76,6 +80,7 @@ namespace N_m3u8DL_CLI
             Parser parser = new Parser();
             parser.DownDir = Path.GetDirectoryName(jsonFile);
             parser.M3u8Url = m3u8Url;
+            parser.LiveStream = true;
             parser.Parse();  //产生新的json文件
 
             jsonContent = File.ReadAllText(jsonFile);
@@ -89,6 +94,8 @@ namespace N_m3u8DL_CLI
                     //Console.WriteLine(seg.ToString());
                 }
             }
+            if (toDownList.Count > 0)
+                Record();
         }
 
         //public void TryDownload()
@@ -108,10 +115,9 @@ namespace N_m3u8DL_CLI
 
         private void Record()
         {
-            ArrayList temp = toDownList;
-            while(temp.Count != 0)
+            while (toDownList.Count > 0 && (sd.FileUrl != "" ? sd.IsDone : true)) 
             {
-                JObject info = JObject.Parse(temp[0].ToString());
+                JObject info = JObject.Parse(toDownList[0].ToString());
                 int index = info["index"].Value<int>();
                 sd.FileUrl = info["segUri"].Value<string>();
                 sd.Method = info["method"].Value<string>();
@@ -120,22 +126,20 @@ namespace N_m3u8DL_CLI
                     sd.Key = info["key"].Value<string>();
                     sd.Iv = info["iv"].Value<string>();
                 }
-                sd.TimeOut = 60000;
+                sd.TimeOut = (int)timer.Interval - 1000;//超时时间不超过下次执行时间
                 sd.SegIndex = index;
                 sd.Headers = Headers;
+                sd.SegDur = info["duration"].Value<double>();
                 sd.IsLive = true;  //标记为直播
                 sd.LiveFile = LiveFile;
                 sd.LiveStream = LiveStream;
                 sd.Down();  //开始下载
-                while (sd.IsDone != true) ;  //忙等待
+                while (sd.IsDone != true) { Thread.Sleep(1); };  //忙等待 Thread.Sleep(1) 可防止cpu 100% 防止电脑风扇狂转
                 if (toDownList.Count > 0)
                     toDownList.RemoveAt(0);  //下完删除一项
             }
-            LOGGER.PrintLine("Waiting...");
-            //不断查找是否有新分段，有的话立即开始下载
-            while (isNewSeg() != true)
-                isNewSeg();
-            Record();
+            LOGGER.PrintLine("Waiting...", LOGGER.Warning);
+            LOGGER.WriteLine("Waiting...");
         }
 
         //检测是否有新分片

N_m3u8DL-CLI/LOGGER.cs

@@ -61,6 +61,11 @@ namespace N_m3u8DL_CLI
         {
             try
             {
+                if (CursorIndex > 1000)
+                {
+                    Console.Clear();
+                    CursorIndex = 0;
+                }
                 if (cursorIndex == 0)
                     Console.SetCursorPosition(0, CursorIndex++);
                 else

N_m3u8DL-CLI/N_m3u8DL-CLI.csproj

@@ -39,7 +39,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.JScript" />
-    <Reference Include="Newtonsoft.Json" />
+    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NiL.JS, Version=2.5.1428.0, Culture=neutral, PublicKeyToken=fa941a7c2a4de689, processorArchitecture=MSIL">
+      <HintPath>..\packages\NiL.JS.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Collections" />
@@ -56,6 +62,7 @@
   <ItemGroup>
     <Compile Include="CommandLineArgument.cs" />
     <Compile Include="CommandLineArgumentParser.cs" />
+    <Compile Include="Decode51CtoKey.cs" />
     <Compile Include="Decrypter.cs" />
     <Compile Include="FFmpeg.cs" />
     <Compile Include="Global.cs" />
@@ -73,6 +80,7 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\Debug\Newtonsoft.Json.dll" />

N_m3u8DL-CLI/Parser.cs

@@ -2,15 +2,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Web;
 
 namespace N_m3u8DL_CLI
 {
@@ -29,6 +24,7 @@ namespace N_m3u8DL_CLI
         private string downName = string.Empty;
         private string keyFile = string.Empty;
         private string keyBase64 = string.Empty;
+        private bool liveStream = false;
         private long bestBandwidth = 0;
         private string bestUrl = string.Empty;
         private string bestUrlAudio = string.Empty;
@@ -63,6 +59,7 @@ namespace N_m3u8DL_CLI
         public static string DurEnd { get => durEnd; set => durEnd = value; }
         public string KeyFile { get => keyFile; set => keyFile = value; }
         public string KeyBase64 { get => keyBase64; set => keyBase64 = value; }
+        public bool LiveStream { get => liveStream; set => liveStream = value; }
 
         public void Parse()
         {
@@ -91,11 +88,16 @@ namespace N_m3u8DL_CLI
 
 
             //获取m3u8内容
-
-            LOGGER.PrintLine("获取m3u8内容", LOGGER.Warning);
+            if (!liveStream)
+                LOGGER.PrintLine("获取m3u8内容", LOGGER.Warning);
 
             if (M3u8Url.StartsWith("http"))
                 m3u8Content = Global.GetWebSource(M3u8Url, headers);
+            else if (M3u8Url.StartsWith("file:"))
+            {
+                Uri t = new Uri(M3u8Url);
+                m3u8Content = File.ReadAllText(t.LocalPath);
+            }
             else if (File.Exists(M3u8Url))
             {
                 m3u8Content = File.ReadAllText(M3u8Url);
@@ -126,8 +128,11 @@ namespace N_m3u8DL_CLI
                     BaseUrl = GetBaseUrl(M3u8Url, headers);
             }
 
-            LOGGER.WriteLine("Parsing Content");
-            LOGGER.PrintLine("解析m3u8内容");
+            if (!liveStream)
+            {
+                LOGGER.WriteLine("Parsing Content");
+                LOGGER.PrintLine("解析m3u8内容");
+            }
 
             if (!string.IsNullOrEmpty(keyBase64))
             {
@@ -194,7 +199,7 @@ namespace N_m3u8DL_CLI
                     //解析定义的分段长度
                     else if (line.StartsWith(HLSTags.ext_x_targetduration))
                     {
-                        targetDuration = Convert.ToInt32(line.Replace(HLSTags.ext_x_targetduration + ":", "").Trim());
+                        targetDuration = Convert.ToInt32(Convert.ToDouble(line.Replace(HLSTags.ext_x_targetduration + ":", "").Trim()));
                     }
                     //解析起始编号
                     else if (line.StartsWith(HLSTags.ext_x_media_sequence))
@@ -304,10 +309,22 @@ namespace N_m3u8DL_CLI
                     //#EXT-X-MAP
                     else if (line.StartsWith(HLSTags.ext_x_map))
                     {
-                        extMAP[0] = Global.GetTagAttribute(line, "URI");
-                        if (line.Contains("BYTERANGE"))
-                            extMAP[1] = Global.GetTagAttribute(line, "BYTERANGE");
-                        if (!extMAP[0].StartsWith("http")) extMAP[0] = CombineURL(BaseUrl, extMAP[0]);
+                        if (extMAP[0] == "")
+                        {
+                            extMAP[0] = Global.GetTagAttribute(line, "URI");
+                            if (line.Contains("BYTERANGE"))
+                                extMAP[1] = Global.GetTagAttribute(line, "BYTERANGE");
+                            if (!extMAP[0].StartsWith("http")) extMAP[0] = CombineURL(BaseUrl, extMAP[0]);
+                        }
+                        //遇到了其他的map，说明已经不是一个视频了，全部丢弃即可
+                        else
+                        {
+                            if (segments.Count > 0)
+                                parts.Add(segments);
+                            segments = new JArray();
+                            isEndlist = true;
+                            break;
+                        }
                     }
                     else if (line.StartsWith(HLSTags.ext_x_start)) ;
                     //评论行不解析
@@ -536,10 +553,13 @@ namespace N_m3u8DL_CLI
             jsonM3u8Info.Add("segments", parts);
             jsonResult.Add("m3u8Info", jsonM3u8Info);
 
-            
+
             //输出JSON文件
-            LOGGER.WriteLine("Writing Json: [meta.json]");
-            LOGGER.PrintLine("写出meta.json");
+            if (!liveStream)
+            {
+                LOGGER.WriteLine("Writing Json: [meta.json]");
+                LOGGER.PrintLine("写出meta.json");
+            }
             File.WriteAllText(jsonSavePath, jsonResult.ToString());
             //检测是否为master list
             MasterListCheck();
@@ -557,6 +577,12 @@ namespace N_m3u8DL_CLI
             //存在加密
             if (m != "")
             {
+                if (m != "AES-128")
+                {
+                    LOGGER.PrintLine($"不支持{m}加密方式,将不被处理,且强制开启二进制合并", LOGGER.Error);
+                    DownloadManager.BinaryMerge = true;
+                    return new string[] { $"{m}(NOTSUPPORTED)", "", "" };
+                }
                 //METHOD
                 key[0] = m;
                 //URI
@@ -671,7 +697,17 @@ namespace N_m3u8DL_CLI
                     else
                     {
                         string keyUrl = CombineURL(BaseUrl, key[1]);
-                        key[1] = Convert.ToBase64String(Global.HttpDownloadFileToBytes(keyUrl, Headers));
+                        if (keyUrl.Contains("edu.51cto.com")) //51cto
+                        {
+                            keyUrl = keyUrl + "&sign=" + Global.GetTimeStamp(false);
+                            string lessonId = Global.GetQueryString("lesson_id", keyUrl);
+                            var encodeKey = Encoding.UTF8.GetString(Global.HttpDownloadFileToBytes(keyUrl, Headers));
+                            key[1] = Decode51CtoKey.GetDecodeKey(encodeKey, lessonId);
+                        }
+                        else
+                        {
+                            key[1] = Convert.ToBase64String(Global.HttpDownloadFileToBytes(keyUrl, Headers));
+                        }
                     }
                 }
                 //IV
@@ -766,7 +802,7 @@ namespace N_m3u8DL_CLI
         {
             if (!isQiQiuYun && Global.Get302(m3u8url, headers) != m3u8url)
                 m3u8url = Global.Get302(m3u8url, headers);
-            string url = m3u8url;
+            string url = Global.Get302(m3u8url);
             if (url.Contains("?"))
                 url = url.Remove(url.LastIndexOf('?'));
             url = url.Substring(0, url.LastIndexOf('/') + 1);

N_m3u8DL-CLI/Program.cs

@@ -222,6 +222,47 @@ namespace N_m3u8DL_CLI.NetCore
     ///   - 修复vtt字幕无法正常合并的bug
     /// 2020年1月31日
     ///   - ?__gda__行为优化
+    /// 2020年2月1日
+    ///   - 修复bug
+    ///   - 支援twitcasting下载
+    /// 2020年2月3日
+    ///   - 解密异常则退出程序
+    ///   - 通过json下载时若已存在文件则覆盖
+    /// 2020年2月18日
+    ///   - 修正获取BaseUrl的BUG
+    ///   - 重新打包dll
+    /// 2020年2月23日
+    ///   - 不支持的加密方式将标记为NOTSUPPORTED并强制启用二进制合并
+    ///   - 启用二进制合并的情况下，如果m3u8文件中存在map文件，则合并为mp4格式
+    ///   - 支持优酷视频解密
+    /// 2020年2月24日
+    ///   - 直播流录制优化逻辑，避免忙等待
+    ///   - 直播Waiting时，不再输出Parser内容
+    ///   - 直播录制的日志记录
+    ///   - 增加新的选项--liveRecDur限制直播录制时长
+    /// 2020年2月25日
+    ///   - 修复优酷解密过程错误写入冗余数据的bug
+    /// 2020年2月27日
+    ///   - 细节bug修复
+    /// 2020年2月28日
+    ///   - 修复本地masterList的读取问题
+    ///   - 在程序目录下创建NO_UPDATE文件可以禁止启动时检测更新
+    /// 2020年2月29日
+    ///   - 识别#EXT-X-TARGETDURATION时，支持非整数
+    /// 2020年3月2日
+    ///   - 支持51cto的key自动解密
+    ///   - 请求m3u8内容时，有10次自动重试
+    ///   - 直播下载自动设置请求分段文件时间间隔
+    ///   - 修复网络断线一直Downloading及cpu 100%
+    ///   - 加入savename参数仍可读取N_m3u8DL-CLI.args.txt
+    ///   - 直播下载跳过响应码为400的片段
+    /// 2020年3月3日
+    ///   - 修复输出太长只在最后一行显示的问题
+    /// 2020年3月4日
+    ///   - 只认第一个"#EXT-X-MAP", 其余的全部丢弃
+    ///   - 逻辑优化
+    /// 2020年3月5日
+    ///   - 增加同名文件合并时共存策略
     /// </summary>
     /// 
 
@@ -302,12 +343,15 @@ namespace N_m3u8DL_CLI.NetCore
 
             HasFFmpeg:
                 Global.WriteInit();
-                Thread checkUpdate = new Thread(() =>
-                  {
-                      Global.CheckUpdate();
-                  });
-                checkUpdate.IsBackground = true;
-                checkUpdate.Start();
+                if (!File.Exists(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "NO_UPDATE"))) 
+                {
+                    Thread checkUpdate = new Thread(() =>
+                    {
+                        Global.CheckUpdate();
+                    });
+                    checkUpdate.IsBackground = true;
+                    checkUpdate.Start();
+                }
 
                 int maxThreads = Environment.ProcessorCount;
                 int minThreads = 16;
@@ -320,7 +364,6 @@ namespace N_m3u8DL_CLI.NetCore
                 string muxSetJson = "MUXSETS.json";
                 string workDir = CURRENT_PATH + "\\Downloads";
                 bool muxFastStart = false;
-                bool binaryMerge = false;
                 bool delAfterDone = false;
                 bool parseOnly = false;
                 bool noMerge = false;
@@ -355,8 +398,10 @@ namespace N_m3u8DL_CLI.NetCore
     --useKeyFile File           使用外部16字节文件定义AES-128解密KEY
     --useKeyBase64 Base64String 使用Base64字符串定义AES-128解密KEY
     --downloadRange Range       仅下载视频的一部分分片或长度
+    --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)
     --maxSpeed   Number         设置下载速度上限(单位为KB/s)
+    --enableYouKuAes            使用优酷AES-128解密方案
     --enableDelAfterDone        开启下载后删除临时文件夹的功能
     --enableMuxFastStart        开启混流mp4的FastStart特性
     --enableBinaryMerge         开启二进制合并分片
@@ -365,7 +410,7 @@ namespace N_m3u8DL_CLI.NetCore
     --disableDateInfo           关闭混流中的日期写入
     --noMerge                   禁用自动合并
     --noProxy                   不自动使用系统代理
-    --disableIntegrityCheck      不检测分片数量是否完整");
+    --disableIntegrityCheck     不检测分片数量是否完整");
                     return;
                 }
                 if (arguments.Has("--enableDelAfterDone"))
@@ -378,7 +423,7 @@ namespace N_m3u8DL_CLI.NetCore
                 }
                 if (arguments.Has("--enableBinaryMerge"))
                 {
-                    binaryMerge = true;
+                    DownloadManager.BinaryMerge = true;
                 }
                 if (arguments.Has("--disableDateInfo"))
                 {
@@ -400,6 +445,10 @@ namespace N_m3u8DL_CLI.NetCore
                 {
                     muxFastStart = true;
                 }
+                if (arguments.Has("--enableYouKuAes"))
+                {
+                    Downloader.YouKuAES = true;
+                }
                 if (arguments.Has("--disableIntegrityCheck"))
                 {
                     DownloadManager.DisableIntegrityCheck = true;
@@ -458,6 +507,19 @@ namespace N_m3u8DL_CLI.NetCore
                 {
                     timeOut = Convert.ToInt32(arguments.Get("--timeOut").Next);
                 }
+                if (arguments.Has("--liveRecDur"))
+                {
+                    //时间码
+                    Regex reg2 = new Regex(@"(\d+):(\d+):(\d+)");
+                    var t = arguments.Get("--liveRecDur").Next;
+                    if (reg2.IsMatch(t))
+                    {
+                        int HH = Convert.ToInt32(reg2.Match(t).Groups[1].Value);
+                        int MM = Convert.ToInt32(reg2.Match(t).Groups[2].Value);
+                        int SS = Convert.ToInt32(reg2.Match(t).Groups[3].Value);
+                        HLSLiveDownloader.REC_DUR_LIMIT = SS + MM * 60 + HH * 60 * 60;
+                    }
+                }
                 if (arguments.Has("--downloadRange"))
                 {
                     string p = arguments.Get("--downloadRange").Next;
@@ -494,11 +556,18 @@ namespace N_m3u8DL_CLI.NetCore
                 }
 
                 //如果只有URL，没有附加参数，则尝试解析配置文件
-                if (args.Length == 1)
+                if (args.Length == 1 || (args.Length == 3 && args[1].ToLower() == "--savename"))
                 {
                     if (File.Exists(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "N_m3u8DL-CLI.args.txt")))
                     {
-                        args = Global.ParseArguments($"\"{args[0]}\"" + File.ReadAllText(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "N_m3u8DL-CLI.args.txt"))).ToArray();  //解析命令行
+                        if (args.Length == 3)
+                        {
+                            args = Global.ParseArguments($"\"{args[0]}\" {args[1]} {args[2]} " + File.ReadAllText(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "N_m3u8DL-CLI.args.txt"))).ToArray();  //解析命令行
+                        }
+                        else
+                        {
+                            args = Global.ParseArguments($"\"{args[0]}\" " + File.ReadAllText(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "N_m3u8DL-CLI.args.txt"))).ToArray();  //解析命令行
+                        }
                         goto parseArgs;
                     }
                 }
@@ -535,6 +604,11 @@ namespace N_m3u8DL_CLI.NetCore
                     fileName = Global.GetUrlFileName(testurl) + "_" + DateTime.Now.ToString("yyyyMMddHHmmss");
 
 
+                if (testurl.Contains("twitcasting") && testurl.Contains("/fmp4/"))
+                {
+                    DownloadManager.BinaryMerge = true;
+                }
+
                 //优酷DRM设备更改
                 /*if (testurl.Contains("playlist/m3u8"))
                 {
@@ -577,7 +651,7 @@ namespace N_m3u8DL_CLI.NetCore
                 {
                     if (!Directory.Exists(Path.Combine(workDir, fileName)))//若文件夹不存在则新建文件夹   
                         Directory.CreateDirectory(Path.Combine(workDir, fileName)); //新建文件夹  
-                    File.Copy(testurl, Path.Combine(Path.Combine(workDir, fileName), "meta.json"));
+                    File.Copy(testurl, Path.Combine(Path.Combine(workDir, fileName), "meta.json"), true);
                 }
                 else
                 {
@@ -633,7 +707,6 @@ namespace N_m3u8DL_CLI.NetCore
                     md.NoMerge = noMerge;
                     md.DownName = fileName;
                     md.DelAfterDone = delAfterDone;
-                    md.BinaryMerge = binaryMerge;
                     md.MuxFormat = "mp4";
                     md.RetryCount = retryCount;
                     md.MuxSetJson = muxSetJson;
@@ -646,8 +719,8 @@ namespace N_m3u8DL_CLI.NetCore
                     LOGGER.WriteLine("Living Stream Found");
                     LOGGER.WriteLine("Start Recording");
                     LOGGER.PrintLine("识别为直播流, 开始录制");
-                    LOGGER.STOPLOG = true;  //停止记录日志
-                                            //开辟文件流，且不关闭。（便于播放器不断读取文件）
+                    //LOGGER.STOPLOG = true;  //停止记录日志
+                    //开辟文件流，且不关闭。（便于播放器不断读取文件）
                     string LivePath = Path.Combine(Directory.GetParent(parser.DownDir).FullName
                         , DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + "_" + fileName + ".ts");
                     FileStream outputStream = new FileStream(LivePath, FileMode.Append);

N_m3u8DL-CLI/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NiL.JS" version="2.5.1428" targetFramework="net46" />
+</packages>

README.md

@@ -18,19 +18,20 @@
 本项目已与2019年10月9日开源，采用MIT许可证，各取所需。
 
 # 关于跨平台
-本项目已通过`.NET Core`实现跨平台，理论支持Mac、Linux、Windows等平台，请移步：https://github.com/nilaoda/N_m3u8DL-CLI_Core
+~~本项目已通过`.NET Core`实现跨平台，理论支持Mac、Linux、Windows等平台，请移步：https://github.com/nilaoda/N_m3u8DL-CLI_Core~~
+
+暂时放弃跨平台（很多API需要重写才能实现功能，日后有空再维护）
 
 # N_m3u8DL-CLI
 一个**简单易用的**m3u8下载器，下载地址：https://github.com/nilaoda/N_m3u8DL-CLI/releases  
 
 支持下载m3u8链接或文件为`mp4`或`ts`格式，并提供丰富的命令行选项。
-  * 支持`AES-128`加密自动解密
+  * 支持`AES-128-CBC`加密自动解密
   * 支持多线程下载
   * 支持下载限速
   * 支持断点续传
   * 支持`Master List`
   * 支持直播流录制(`BETA`)
-  * 支持腾讯、爱奇艺、优酷的`杜比视界m3u8`下载
   * 支持自定义`HTTP Headers`
   * 支持自动合并 (二进制合并或使用ffmpeg合并)
   * 支持选择下载`m3u8`中的指定时间段/分片内容
@@ -61,8 +62,10 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
     --useKeyFile File           使用外部16字节文件定义AES-128解密KEY
     --useKeyBase64 Base64String 使用Base64字符串定义AES-128解密KEY
     --downloadRange Range       仅下载视频的一部分分片或长度
+    --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)
     --maxSpeed   Number         设置下载速度上限(单位为KB/s)
+    --enableYouKuAes            使用优酷AES-128解密方案
     --enableDelAfterDone        开启下载后删除临时文件夹的功能
     --enableMuxFastStart        开启混流mp4的FastStart特性
     --enableBinaryMerge         开启二进制合并分片
@@ -76,3 +79,6 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
 
 # 用户文档
 https://nilaoda.github.io/N_m3u8DL-CLI/
+
+# 赞赏
+https://nilaoda.github.io/N_m3u8DL-CLI/source/images/alipay.png

README_ENG.md

@@ -11,10 +11,9 @@
 This is a m3u8 downloader.  
 ## Summary
 Supports: 
-  * Auto deceypt for `AES-128`
+  * Auto deceypt for `AES-128-CBC`
   * `Master List`
   * Live stream recording(`BETA`)
-  * `Dolby Vision` from IQiYi, YouKu, Tencent
   * Customize HTTP headers
   * Auto merge clips(Binary or ffmpeg)
   * Select save clip by `time code` or `index`

docs/gitbook/gitbook-plugin-livereload/plugin.js

@@ -1,11 +0,0 @@
-(function() {
-  var newEl = document.createElement('script'),
-      firstScriptTag = document.getElementsByTagName('script')[0];
-
-  if (firstScriptTag) {
-    newEl.async = 1;
-    newEl.src = '//' + window.location.hostname + ':35729/livereload.js';
-    firstScriptTag.parentNode.insertBefore(newEl, firstScriptTag);
-  }
-
-})();