Update Global.cs

解决HTTPS协议自动重定向后，Referer丢失问题

.github/workflows/build_latest.yml

@@ -13,9 +13,13 @@ jobs:
      
     - name: Setup MSBuild Path
       uses: warrenbuckley/Setup-MSBuild@v1
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
        
     - name: Setup NuGet
       uses: NuGet/setup-nuget@v1.0.2
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
      
     - name: Restore NuGet Packages
       run: nuget restore N_m3u8DL-CLI.sln

N_m3u8DL-CLI/DownloadManager.cs

@@ -11,25 +11,12 @@ namespace N_m3u8DL_CLI
 {
     class DownloadManager
     {
-        private static int calcTime = 1;            //计算文件夹大小的间隔
         private int stopCount = 0;           //速度为零的停止
-        private int timeOut = 10000;         //超时设置
-        private static double downloadedSize = 0;   //已下载大小
-        private static bool disableIntegrityCheck = false; //关闭完整性检查
 
         private string jsonFile = string.Empty;
-        private string headers = string.Empty;
-        private string downDir = string.Empty;
-        private string downName = string.Empty;
-        private string muxSetJson = string.Empty;
-        private int threads = 1;
-        private int retryCount = 5;
-        private static int count = 0;
-        private static int partsCount = 0;
         private int total = 0;
         public static string partsPadZero = string.Empty;
         string segsPadZero = string.Empty;
-        bool delAfterDone = false;
         private bool isVTT = false;
         bool externalAudio = false;  //额外的音轨
         string externalAudioUrl = "";
@@ -37,28 +24,56 @@ namespace N_m3u8DL_CLI
         string externalSubUrl = "";
         string fflogName = "_ffreport.log";
         public static bool BinaryMerge = false;
-        private bool noMerge = false;
-        private bool muxFastStart = true;
-        private string muxFormat = "mp4";
-        private static bool hasSetDir = false;
 
-        public int Threads { get => threads; set => threads = value; }
+        public int Threads { get; set; } = 1;
-        public int RetryCount { get => retryCount; set => retryCount = value; }
+        public int RetryCount { get; set; } = 5;
-        public string Headers { get => headers; set => headers = value; }
+        public string Headers { get; set; } = string.Empty;
-        public string DownDir { get => downDir; set => downDir = value; }
+        public string DownDir { get; set; } = string.Empty;
-        public string DownName { get => downName; set => downName = value; }
+        public string DownName { get; set; } = string.Empty;
-        public bool DelAfterDone { get => delAfterDone; set => delAfterDone = value; }
+        public bool DelAfterDone { get; set; } = false;
-        public string MuxFormat { get => muxFormat; set => muxFormat = value; }
+        public string MuxFormat { get; set; } = "mp4";
-        public bool MuxFastStart { get => muxFastStart; set => muxFastStart = value; }
+        public bool MuxFastStart { get; set; } = true;
-        public string MuxSetJson { get => muxSetJson; set => muxSetJson = value; }
+        public string MuxSetJson { get; set; } = string.Empty;
-        public int TimeOut { get => timeOut; set => timeOut = value; }
+        public int TimeOut { get; set; } = 10000;         //超时设置
-        public static double DownloadedSize { get => downloadedSize; set => downloadedSize = value; }
+        public static double DownloadedSize { get; set; } = 0;   //已下载大小
-        public static bool HasSetDir { get => hasSetDir; set => hasSetDir = value; }
+        public static bool HasSetDir { get; set; } = false;
-        public bool NoMerge { get => noMerge; set => noMerge = value; }
+        public bool NoMerge { get; set; } = false;
-        public static int CalcTime { get => calcTime; set => calcTime = value; }
+        public static int CalcTime { get; set; } = 1;            //计算速度的间隔
-        public static int Count { get => count; set => count = value; }
+        public static int Count { get; set; } = 0;
-        public static int PartsCount { get => partsCount; set => partsCount = value; }
+        public static int PartsCount { get; set; } = 0;
-        public static bool DisableIntegrityCheck { get => disableIntegrityCheck; set => disableIntegrityCheck = value; }
+        public static bool DisableIntegrityCheck { get; set; } = false; //关闭完整性检查
+
+        static CancellationTokenSource cts = new CancellationTokenSource();
+        //计算下载速度
+        static System.Timers.Timer timer = new System.Timers.Timer(1000 * CalcTime);   //实例化Timer类
+
+        public DownloadManager()
+        {
+            timer.AutoReset = true;
+            timer.Elapsed += delegate
+            {
+                Console.SetCursorPosition(0, 1);
+                Console.Write("Speed: " + Global.FormatFileSize((Global.BYTEDOWN) / CalcTime) + " / s".PadRight(70));
+
+                if (Global.HadReadInfo && Global.BYTEDOWN <= Global.STOP_SPEED * 1024 * CalcTime)
+                {
+                    stopCount++;
+                    Console.SetCursorPosition(0, 1);
+                    Console.Write("Speed: " + Global.FormatFileSize((Global.BYTEDOWN) / CalcTime) + " / s [" + stopCount + "]".PadRight(70));
+
+                    if (stopCount >= 12)
+                    {
+                        Global.ShouldStop = true;
+                        cts.Cancel();
+                    }
+                }
+                else
+                {
+                    stopCount = 0;
+                    Global.BYTEDOWN = 0;
+                }
+            };
+        }
 
         public void DoDownload()
         {
@@ -94,7 +109,6 @@ namespace N_m3u8DL_CLI
             PartsCount = parts.Count;
             segsPadZero = string.Empty.PadRight(oriCount.Length, '0');
             partsPadZero = string.Empty.PadRight(Convert.ToString(parts.Count).Length, '0');
-            CancellationTokenSource cts = new CancellationTokenSource();
 
             //是直播视频
             if (isVOD == "False")
@@ -104,7 +118,6 @@ namespace N_m3u8DL_CLI
 
             Global.ShouldStop = false; //是否该停止下载
 
-            //监控文件夹变化
             if (!Directory.Exists(DownDir))
                 Directory.CreateDirectory(DownDir); //新建文件夹  
             Watcher watcher = new Watcher(DownDir);
@@ -112,41 +125,9 @@ namespace N_m3u8DL_CLI
             watcher.PartsCount = PartsCount;
             watcher.WatcherStrat();
 
-            //监控文件夹大小变化 via https://stackoverflow.com/questions/2869561/what-is-the-fastest-way-to-calculate-a-windows-folders-size/12665904#12665904
+            //开始计算速度
-            System.Timers.Timer timer = new System.Timers.Timer(1000 * CalcTime);   //实例化Timer类
-            timer.AutoReset = true;
             timer.Enabled = true;
-            //Scripting.FileSystemObject fso = new Scripting.FileSystemObject();
+            cts = new CancellationTokenSource();
-            //Scripting.Folder folder  = fso.GetFolder(DownDir);
-            timer.Elapsed += delegate
-            {
-                //采用COM组件获取文件夹的大小，需要引入 "Microsoft Scripting Runtime" 
-                //double sizeInBytes = folder.Size;
-                Console.SetCursorPosition(0, 1);
-                //Console.WriteLine("Speed: " + Global.FormatFileSize((sizeInBytes - lastSizeInBytes) / calcTime) + " / s               ");
-                Console.Write("Speed: " + Global.FormatFileSize((Global.BYTEDOWN) / CalcTime) + " / s".PadRight(70));
-
-                if (Global.HadReadInfo && Global.BYTEDOWN <= Global.STOP_SPEED * 1024 * CalcTime) 
-                {
-                    stopCount++;
-                    Console.SetCursorPosition(0, 1);
-                    Console.Write("Speed: " + Global.FormatFileSize((Global.BYTEDOWN) / CalcTime) + " / s [" + stopCount + "]".PadRight(70));
-
-                    if (stopCount >= 12)
-                    {
-                        Global.ShouldStop = true;
-                        cts.Cancel();
-                        GC.Collect();
-                        return;
-                    }
-                }
-                else
-                {
-                    stopCount = 0;
-                    Global.BYTEDOWN = 0;
-
-                }
-            };
 
             //开始调用下载
             LOGGER.WriteLine(strings.startDownloading);
@@ -200,16 +181,10 @@ namespace N_m3u8DL_CLI
                         sd.Key = firstSeg["key"].Value<string>();
                         sd.Iv = firstSeg["iv"].Value<string>();
                     }
-                    try
+                    if (firstSeg["expectByte"] != null)
-                    {
                         sd.ExpectByte = firstSeg["expectByte"].Value<long>();
-                    }
+                    if (firstSeg["startByte"] != null)
-                    catch (Exception) { }
-                    try
-                    {
                         sd.StartByte = firstSeg["startByte"].Value<long>();
-                    }
-                    catch (Exception) { }
                     sd.Headers = Headers;
                     sd.SavePath = DownDir + "\\Part_" + 0.ToString(partsPadZero) + "\\" + firstSeg["index"].Value<int>().ToString(segsPadZero) + ".tsdownloading";
                     if (File.Exists(sd.SavePath))
@@ -290,16 +265,10 @@ namespace N_m3u8DL_CLI
                                 sd.Key = info["key"].Value<string>();
                                 sd.Iv = info["iv"].Value<string>();
                             }
-                            try
+                            if (firstSeg["expectByte"] != null)
-                            {
                                 sd.ExpectByte = info["expectByte"].Value<long>();
-                            }
+                            if (firstSeg["startByte"] != null)
-                            catch (Exception) { }
-                            try
-                            {
                                 sd.StartByte = info["startByte"].Value<long>();
-                            }
-                            catch (Exception) { }
                             sd.Headers = Headers;
                             sd.SavePath = DownDir + "\\Part_" + info["part"].Value<int>().ToString(partsPadZero) + "\\" + info["index"].Value<int>().ToString(segsPadZero) + ".tsdownloading";
                             if (File.Exists(sd.SavePath))
@@ -327,12 +296,8 @@ namespace N_m3u8DL_CLI
 
             watcher.WatcherStop();
 
-            //监控文件夹大小变化的收尾工作
+            //停止速度监测
             timer.Enabled = false;
-            timer.Close();
-            // cleanup COM
-            //System.Runtime.InteropServices.Marshal.ReleaseComObject(folder);
-            //System.Runtime.InteropServices.Marshal.ReleaseComObject(fso);
 
             //检测是否下完
             IsComplete(Convert.ToInt32(segCount));
@@ -363,14 +328,13 @@ namespace N_m3u8DL_CLI
                     Count++;
                     LOGGER.WriteLine(strings.retryCount + Count + " / " + RetryCount);
                     LOGGER.PrintLine(strings.retryCount + Count + " / " + RetryCount, LOGGER.Warning);
-                    Thread.Sleep(3000);
+                    Thread.Sleep(6000);
-                    GC.Collect(); //垃圾回收
                     DoDownload();
                 }
             }
             else  //开始合并
             {
-                LOGGER.PrintLine(strings.downloadComplete + (DisableIntegrityCheck ? "("+strings.disableIntegrityCheck+")" : ""));
+                LOGGER.PrintLine(strings.downloadComplete + (DisableIntegrityCheck ? "(" + strings.disableIntegrityCheck + ")" : ""));
                 Console.WriteLine();
                 if (NoMerge == false)
                 {
@@ -539,7 +503,7 @@ namespace N_m3u8DL_CLI
 
                     FFmpeg.OutPutPath = Path.Combine(Directory.GetParent(DownDir).FullName, DownName);
                     FFmpeg.ReportFile = driverName + "\\:" + exePath.Remove(0, exePath.IndexOf(':') + 1).Replace("\\", "/") + "/Logs/" + Path.GetFileNameWithoutExtension(LOGGER.LOGFILE) + fflogName;
-                    
+
                     //合并分段
                     LOGGER.PrintLine(strings.startMerging);
                     for (int i = 0; i < PartsCount; i++)
@@ -640,7 +604,7 @@ namespace N_m3u8DL_CLI
                         parser.DownDir = Path.Combine(Path.GetDirectoryName(DownDir), parser.DownName);
                         LOGGER.WriteLine(strings.startParsing + externalAudioUrl);
                         LOGGER.WriteLine(strings.downloadingExternalAudioTrack);
-                        DownName = DownName + "(Audio)";
+                        DownName = parser.DownName;
                         fflogName = "_ffreport(Audio).log";
                         DownDir = parser.DownDir;
                         parser.Parse();  //开始解析

N_m3u8DL-CLI/FFmpeg.cs

@@ -10,19 +10,20 @@ namespace N_m3u8DL_CLI
 {
     class FFmpeg
     {
-        private static string outPutPath = string.Empty;
+        public static string FFMPEG_PATH = "ffmpeg";
-        private static string reportFile = string.Empty;
+        public static string REC_TIME = ""; //录制日期
-        private static bool useAACFilter = false;  //是否启用滤镜
+
-        private static bool writeDate = true;  //是否写入录制日期
+        public static string OutPutPath { get; set; } = string.Empty;
-        public static string OutPutPath { get => outPutPath; set => outPutPath = value; }
+        public static string ReportFile { get; set; } = string.Empty;
-        public static string ReportFile { get => reportFile; set => reportFile = value; }
+        public static bool UseAACFilter { get; set; } = false;  //是否启用滤镜
-        public static bool UseAACFilter { get => useAACFilter; set => useAACFilter = value; }
+        public static bool WriteDate { get; set; } = true;  //是否写入录制日期
-        public static bool WriteDate { get => writeDate; set => writeDate = value; }
 
         public static void Merge(string[] files, string muxFormat, bool fastStart,
             string poster = "", string audioName = "", string title = "",
             string copyright = "", string comment = "", string encodingTool = "")
         {
+            string dateString = string.IsNullOrEmpty(REC_TIME) ? DateTime.Now.ToString("o") : REC_TIME;
+
             //同名文件已存在的共存策略
             if (File.Exists($"{OutPutPath}.{muxFormat.ToLower()}")) 
             {
@@ -50,7 +51,7 @@ namespace N_m3u8DL_CLI
                     command += " " + (string.IsNullOrEmpty(ddpAudio) ? "" : "-i \"" + ddpAudio + "\"");
                     command +=
                         $" -map 0:v? {(string.IsNullOrEmpty(ddpAudio) ? "-map 0:a?" : $"-map {(string.IsNullOrEmpty(poster) ? "1" : "2")}:a -map 0:a?")} -map 0:s? " + (string.IsNullOrEmpty(poster) ? "" : addPoster)
-                        + (writeDate ? " -metadata date=\"" + DateTime.Now.ToString("o") + "\"" : "") +
+                        + (WriteDate ? " -metadata date=\"" + dateString + "\"" : "") +
                         " -metadata encoding_tool=\"" + encodingTool + "\" -metadata title=\"" + title +
                         "\" -metadata copyright=\"" + copyright + "\" -metadata comment=\"" + comment +
                         $"\" -metadata:s:a:{(string.IsNullOrEmpty(ddpAudio) ? "0" : "1")} handler_name=\"" + audioName + $"\" -metadata:s:a:{(string.IsNullOrEmpty(ddpAudio) ? "0" : "1")} handler=\"" + audioName + "\" ";
@@ -83,7 +84,7 @@ namespace N_m3u8DL_CLI
 
             }
 
-            Run("ffmpeg", command, Path.GetDirectoryName(files[0]));
+            Run(FFMPEG_PATH, command, Path.GetDirectoryName(files[0]));
             LOGGER.WriteLine(strings.ffmpegDone);
             //Console.WriteLine(command);
         }
@@ -92,7 +93,7 @@ namespace N_m3u8DL_CLI
         {
             if (Global.VIDEO_TYPE == "H264")
             {
-                Run("ffmpeg",
+                Run(FFMPEG_PATH,
                     "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -copy_unknown -f mpegts -bsf:v h264_mp4toannexb \""
                     + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts\"", 
                     Path.GetDirectoryName(file));
@@ -104,7 +105,7 @@ namespace N_m3u8DL_CLI
             }
             else if (Global.VIDEO_TYPE == "H265")
             {
-                Run("ffmpeg",
+                Run(FFMPEG_PATH,
                     "-loglevel quiet -i \"" + file + "\" -map 0 -c copy -copy_unknown -f mpegts -bsf:v hevc_mp4toannexb \""
                     + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts\"",
                     Path.GetDirectoryName(file));

N_m3u8DL-CLI/Global.cs

@@ -30,8 +30,9 @@ namespace N_m3u8DL_CLI
 
 
         /*===============================================================================*/
-        static string nowVer = "2.7.4";
+        static Version ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-        static string nowDate = "20200920";
+        static string nowVer = $"{ver.Major}.{ver.Minor}.{ver.Build}";
+        static string nowDate = "20201122";
         public static void WriteInit()
         {
             Console.Clear();
@@ -101,18 +102,20 @@ namespace N_m3u8DL_CLI
         public static string GetWebSource(String url, string headers = "", int TimeOut = 60000)
         {
             string htmlCode = string.Empty;
-            for(int i = 0; i < 10; i++)
+            for (int i = 0; i < 10; i++)
             {
                 try
                 {
+                reProcess:
                     HttpWebRequest webRequest = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url);
                     webRequest.Method = "GET";
                     if (NoProxy) webRequest.Proxy = null;
-                    webRequest.UserAgent = "Mozilla/4.0";
+                    webRequest.UserAgent = "Mozilla/5.0 (Linux; U; Android 7.0; zh-cn; 15 Plus Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.4 Mobile Safari/537.36";
-                    webRequest.Headers.Add("Accept-Encoding", "gzip, deflate");
+                    webRequest.Accept = "*/*";
+                    webRequest.Headers.Add("Accept-Encoding", "gzip, deflate, br");
                     webRequest.Timeout = TimeOut;  //设置超时
                     webRequest.KeepAlive = false;
-                    webRequest.AllowAutoRedirect = true;  //自动跳转
+                    webRequest.AllowAutoRedirect = false; //手动处理重定向，否则会丢失Referer
                     if (url.Contains("pcvideo") && url.Contains(".titan.mgtv.com"))
                     {
                         webRequest.UserAgent = "";
@@ -145,6 +148,18 @@ namespace N_m3u8DL_CLI
                         }
                     }
                     HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
+
+                    //302
+                    if (webResponse.Headers.Get("Location") != null)
+                    {
+                        url = webResponse.Headers.Get("Location");
+                        webResponse.Close();
+                        goto reProcess;
+                    }
+
+                    //文件过大则认为不是m3u8
+                    if (webResponse.ContentLength != -1 && webRequest.ContentLength > 50 * 1024 * 1024) return "";
+
                     if (webResponse.ContentEncoding != null
                         && webResponse.ContentEncoding.ToLower() == "gzip") //如果使用了GZip则先解压
                     {
@@ -402,14 +417,17 @@ namespace N_m3u8DL_CLI
                 }
             }
 
+        reProcess:
             byte[] arraryByte;
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
             req.Method = "GET";
             req.Timeout = timeOut;
             req.ReadWriteTimeout = timeOut; //重要
+            req.AllowAutoRedirect = false; //手动处理重定向，否则会丢失Referer
             if (NoProxy) req.Proxy = null;
             req.Headers.Add("Accept-Encoding", "gzip, deflate");
             req.Accept = "*/*";
+            req.UserAgent = "Mozilla/5.0 (Linux; U; Android 7.0; zh-cn; 15 Plus Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.4 Mobile Safari/537.36";
             //添加headers
             if (headers != "")
             {
@@ -437,6 +455,13 @@ namespace N_m3u8DL_CLI
 
             using (HttpWebResponse wr = (HttpWebResponse)req.GetResponse())
             {
+                //302
+                if (wr.Headers.Get("Location") != null)
+                {
+                    url = wr.Headers.Get("Location");
+                    wr.Close();
+                    goto reProcess;
+                }
                 if (wr.ContentEncoding != null && wr.ContentEncoding.ToLower() == "gzip") //如果使用了GZip则先解压
                 {
                     using (Stream streamReceive = wr.GetResponseStream())
@@ -497,10 +522,11 @@ namespace N_m3u8DL_CLI
                 if (shouldStop)
                     return;
 
+                reProcess:
                 HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
                 request.Timeout = timeOut;
                 request.ReadWriteTimeout = timeOut; //重要
-                request.AllowAutoRedirect = true;
+                request.AllowAutoRedirect = false; //手动处理重定向，否则会丢失Referer
                 request.KeepAlive = false;
                 request.Method = "GET";
                 if (NoProxy) request.Proxy = null;
@@ -514,7 +540,7 @@ namespace N_m3u8DL_CLI
                     request.Headers.Add("Cookie", "MQGUID");
                 }
                 else
-                    request.UserAgent = "VLC/2.2.1 LibVLC/2.2.1";
+                    request.UserAgent = "Mozilla/5.0 (Linux; U; Android 7.0; zh-cn; 15 Plus Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.4 Mobile Safari/537.36";
                 //下载部分字节
                 if (expectByte != -1)
                     request.AddRange("bytes", startByte, startByte + expectByte - 1);
@@ -548,6 +574,13 @@ namespace N_m3u8DL_CLI
                 bool pngHeader = false; //PNG HEADER检测
                 using (var response = (HttpWebResponse)request.GetResponse())
                 {
+                    //302
+                    if (response.Headers.Get("Location") != null)
+                    {
+                        url = response.Headers.Get("Location");
+                        response.Close();
+                        goto reProcess;
+                    }
                     using (var responseStream = response.GetResponseStream())
                     {
                         using (var stream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Write))
@@ -556,10 +589,17 @@ namespace N_m3u8DL_CLI
                             totalLen = response.ContentLength;
                             byte[] bArr = new byte[1024];
                             int size = responseStream.Read(bArr, 0, (int)bArr.Length);
-                            if (!pngHeader && size > 3 && 137 == bArr[0] && 80 == bArr[1] && 78 == bArr[2] && 71 == bArr[3]) ;
+                            if (!pngHeader && size > 3 && 137 == bArr[0] && 80 == bArr[1] && 78 == bArr[2] && 71 == bArr[3])
                             {
                                 pngHeader = true;
                             }
+                            //GIF HEADER检测
+                            if (!pngHeader && size > 3 && 0x47 == bArr[0] && 0x49 == bArr[1] && 0x46 == bArr[2] && 0x38 == bArr[3])
+                            {
+                                bArr = bArr.Skip(42).ToArray();
+                                size -= 42;
+                                downLen += 42;
+                            }
                             while (size > 0)
                             {
                                 stream.Write(bArr, 0, size);
@@ -582,10 +622,11 @@ namespace N_m3u8DL_CLI
                 }
                 if (shouldStop)
                     try { File.Delete(path); } catch (Exception) { }
-                if (totalLen != -1 && downLen != totalLen) 
+                if (totalLen != -1 && downLen != totalLen)
                     try { File.Delete(path); } catch (Exception) { }
                 if (pngHeader)
                     TrySkipPngHeader(path);
+
             }
             catch (Exception e)
             {
@@ -800,11 +841,17 @@ namespace N_m3u8DL_CLI
                     }
                 }
 
-                if(res.Contains("Audio aac"))
+                if (res.Contains("Audio aac"))
                 {
                     FFmpeg.UseAACFilter = true;
                 }
 
+                //有非AAC音轨则关闭UseAACFilter
+                if (res.Contains("Audio") && !res.Contains("Audio aac"))
+                {
+                    FFmpeg.UseAACFilter = false;
+                }
+
                 if ((VIDEO_TYPE == "" || VIDEO_TYPE == "IGNORE") && res.Contains("Audio eac3")) 
                 {
                     AUDIO_TYPE = "eac3";

N_m3u8DL-CLI/N_m3u8DL-CLI.csproj

@@ -40,8 +40,8 @@
   <ItemGroup>
     <Reference Include="Microsoft.JScript" />
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NiL.JS, Version=2.5.1428.0, Culture=neutral, PublicKeyToken=fa941a7c2a4de689, processorArchitecture=MSIL">
       <HintPath>..\packages\NiL.JS.2.5.1428\lib\net45\NiL.JS.dll</HintPath>
@@ -63,15 +63,17 @@
     <Compile Include="CommandLineArgument.cs" />
     <Compile Include="CommandLineArgumentParser.cs" />
     <Compile Include="Decode51CtoKey.cs" />
+    <Compile Include="DecodeDdyun.cs" />
     <Compile Include="DecodeImooc.cs" />
+    <Compile Include="DecodeNfmovies.cs" />
     <Compile Include="Decrypter.cs" />
-    <Compile Include="DecryptNfmovies.cs" />
     <Compile Include="FFmpeg.cs" />
     <Compile Include="Global.cs" />
     <Compile Include="HLSLiveDownloader.cs" />
     <Compile Include="HLSTags.cs" />
     <Compile Include="LOGGER.cs" />
     <Compile Include="DownloadManager.cs" />
+    <Compile Include="MPDParser.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -99,9 +101,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="bin\Debug\Newtonsoft.Json.dll" />
-  </ItemGroup>
   <ItemGroup>
     <COMReference Include="Scripting">
       <Guid>{420B2830-E718-11CF-893D-00A0C9054228}</Guid>
@@ -131,4 +130,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

N_m3u8DL-CLI/Parser.cs

@@ -17,15 +17,6 @@ namespace N_m3u8DL_CLI
         string[] m3u8CurrentKey = new string[] { "NONE", "", "" };
         private string m3u8SavePath = string.Empty;
         private string jsonSavePath = string.Empty;
-        private string headers = string.Empty;
-        private string baseUrl = string.Empty;
-        private string m3u8Url = string.Empty;
-        private string downDir = string.Empty;
-        private string downName = string.Empty;
-        private string keyFile = string.Empty;
-        private string keyBase64 = string.Empty;
-        private string keyIV = string.Empty;
-        private bool liveStream = false;
         private long bestBandwidth = 0;
         private string bestUrl = string.Empty;
         private string bestUrlAudio = string.Empty;
@@ -37,34 +28,31 @@ namespace N_m3u8DL_CLI
         //存放多轨道的信息
         private ArrayList extLists = new ArrayList();
         private static bool isQiQiuYun = false;
-        //存放Range信息，允许用户只下载部分视频
-        private static int rangeStart = 0;
-        private static int rangeEnd = -1;
-        //存放Range信息，允许用户只下载部分视频
-        private static string durStart = "";
-        private static string durEnd = "";
-        //是否自动清除优酷广告分片
-        private static bool delAd = true;
         //标记是否已清除优酷广告分片
         private static bool hasAd = false;
 
-        public string BaseUrl { get => baseUrl; set => baseUrl = value; }
+        public string BaseUrl { get; set; } = string.Empty;
-        public string M3u8Url { get => m3u8Url; set => m3u8Url = value; }
+        public string M3u8Url { get; set; } = string.Empty;
-        public string DownDir { get => downDir; set => downDir = value; }
+        public string DownDir { get; set; } = string.Empty;
-        public string DownName { get => downName; set => downName = value; }
+        public string DownName { get; set; } = string.Empty;
-        public string Headers { get => headers; set => headers = value; }
+        public string Headers { get; set; } = string.Empty;
-        public static int RangeStart { get => rangeStart; set => rangeStart = value; }
+        //存放Range信息，允许用户只下载部分视频
-        public static int RangeEnd { get => rangeEnd; set => rangeEnd = value; }
+        public static int RangeStart { get; set; } = 0;
-        public static bool DelAd { get => delAd; set => delAd = value; }
+        public static int RangeEnd { get; set; } = -1;
-        public static string DurStart { get => durStart; set => durStart = value; }
+        //是否自动清除优酷广告分片
-        public static string DurEnd { get => durEnd; set => durEnd = value; }
+        public static bool DelAd { get; set; } = true;
-        public string KeyFile { get => keyFile; set => keyFile = value; }
+        //存放Range信息，允许用户只下载部分视频
-        public string KeyBase64 { get => keyBase64; set => keyBase64 = value; }
+        public static string DurStart { get; set; } = "";
-        public bool LiveStream { get => liveStream; set => liveStream = value; }
+        public static string DurEnd { get; set; } = "";
-        public string KeyIV { get => keyIV; set => keyIV = value; }
+        public string KeyFile { get; set; } = string.Empty;
+        public string KeyBase64 { get; set; } = string.Empty;
+        public bool LiveStream { get; set; } = false;
+        public string KeyIV { get; set; } = string.Empty;
 
         public void Parse()
         {
+            FFmpeg.REC_TIME = "";
+
             m3u8SavePath = Path.Combine(DownDir, "raw.m3u8");
             jsonSavePath = Path.Combine(DownDir, "meta.json");
 
@@ -90,17 +78,17 @@ namespace N_m3u8DL_CLI
 
 
             //获取m3u8内容
-            if (!liveStream)
+            if (!LiveStream)
                 LOGGER.PrintLine(strings.downloadingM3u8, LOGGER.Warning);
 
             if (M3u8Url.StartsWith("http"))
             {
                 if (M3u8Url.Contains("nfmovies.com/hls"))
-                    m3u8Content = DecodeNfmovies.DecryptM3u8(Global.HttpDownloadFileToBytes(M3u8Url, headers));
+                    m3u8Content = DecodeNfmovies.DecryptM3u8(Global.HttpDownloadFileToBytes(M3u8Url, Headers));
                 else if (M3u8Url.Contains("hls.ddyunp.com/ddyun"))
-                    m3u8Content = DecodeDdyun.DecryptM3u8(Global.HttpDownloadFileToBytes(DecodeDdyun.GetVaildM3u8Url(M3u8Url), headers));
+                    m3u8Content = DecodeDdyun.DecryptM3u8(Global.HttpDownloadFileToBytes(DecodeDdyun.GetVaildM3u8Url(M3u8Url), Headers));
                 else
-                    m3u8Content = Global.GetWebSource(M3u8Url, headers);
+                    m3u8Content = Global.GetWebSource(M3u8Url, Headers);
             }
             else if (M3u8Url.StartsWith("file:"))
             {
@@ -130,6 +118,18 @@ namespace N_m3u8DL_CLI
                 m3u8Content = DecodeImooc.DecodeM3u8(m3u8Content);
             }
 
+            if (m3u8Content.Trim().StartsWith("<?xml version") && m3u8Content.Contains("<MPD"))
+            {
+                var mpdSavePath = Path.Combine(DownDir, "dash.mpd");
+                //输出mpd文件
+                File.WriteAllText(mpdSavePath, m3u8Content);
+                //分析mpd文件
+                M3u8Url = Global.Get302(M3u8Url, Headers);
+                var newUri = MPDParser.Parse(DownDir, M3u8Url, m3u8Content, BaseUrl);
+                M3u8Url = newUri;
+                m3u8Content = File.ReadAllText(new Uri(M3u8Url).LocalPath);
+            }
+
             //输出m3u8文件
             File.WriteAllText(m3u8SavePath, m3u8Content);
 
@@ -149,32 +149,32 @@ namespace N_m3u8DL_CLI
                 if (new Regex("#YUMING\\|(.*)").IsMatch(m3u8Content))
                     BaseUrl = new Regex("#YUMING\\|(.*)").Match(m3u8Content).Groups[1].Value;
                 else
-                    BaseUrl = GetBaseUrl(M3u8Url, headers);
+                    BaseUrl = GetBaseUrl(M3u8Url, Headers);
             }
 
-            if (!liveStream)
+            if (!LiveStream)
             {
                 LOGGER.WriteLine(strings.parsingM3u8);
                 LOGGER.PrintLine(strings.parsingM3u8);
             }
 
-            if (!string.IsNullOrEmpty(keyBase64))
+            if (!string.IsNullOrEmpty(KeyBase64))
             {
                 string line = "";
-                if (string.IsNullOrEmpty(keyIV))
+                if (string.IsNullOrEmpty(KeyIV))
-                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"base64:{keyBase64}\"";
+                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"base64:{KeyBase64}\"";
                 else
-                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"base64:{keyBase64}\",IV=0x{keyIV.Replace("0x", "")}";
+                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"base64:{KeyBase64}\",IV=0x{KeyIV.Replace("0x", "")}";
                 m3u8CurrentKey = ParseKey(line);
             }
-            if (!string.IsNullOrEmpty(keyFile))
+            if (!string.IsNullOrEmpty(KeyFile))
             {
                 string line = "";
-                Uri u = new Uri(keyFile);
+                Uri u = new Uri(KeyFile);
-                if (string.IsNullOrEmpty(keyIV))
+                if (string.IsNullOrEmpty(KeyIV))
                     line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"{u.ToString()}\"";
                 else
-                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"{u.ToString()}\",IV=0x{keyIV.Replace("0x", "")}";
+                    line = $"#EXT-X-KEY:METHOD=AES-128,URI=\"{u.ToString()}\",IV=0x{KeyIV.Replace("0x", "")}";
 
                 m3u8CurrentKey = ParseKey(line);
             }
@@ -241,7 +241,13 @@ namespace N_m3u8DL_CLI
                         startIndex = segIndex;
                     }
                     else if (line.StartsWith(HLSTags.ext_x_discontinuity_sequence)) ;
-                    else if (line.StartsWith(HLSTags.ext_x_program_date_time)) ;
+                    else if (line.StartsWith(HLSTags.ext_x_program_date_time))
+                    {
+                        if (string.IsNullOrEmpty(FFmpeg.REC_TIME))
+                        {
+                            FFmpeg.REC_TIME = line.Replace(HLSTags.ext_x_program_date_time + ":", "").Trim();
+                        }
+                    }
                     //解析不连续标记，需要单独合并（timestamp不同）
                     else if (line.StartsWith(HLSTags.ext_x_discontinuity))
                     {
@@ -269,7 +275,7 @@ namespace N_m3u8DL_CLI
                     else if (line.StartsWith(HLSTags.ext_x_key))
                     {
                         //自定义KEY情况 判断是否需要读取IV
-                        if (!string.IsNullOrEmpty(keyFile) || !string.IsNullOrEmpty(keyBase64))
+                        if (!string.IsNullOrEmpty(KeyFile) || !string.IsNullOrEmpty(KeyBase64))
                         {
                             if (m3u8CurrentKey[2] == "" && line.Contains("IV=0x"))
                             {
@@ -326,7 +332,7 @@ namespace N_m3u8DL_CLI
                     else if (line.StartsWith(HLSTags.ext_x_i_frame_stream_inf)) ;
                     else if (line.StartsWith(HLSTags.ext_x_media))
                     {
-                        if (Global.GetTagAttribute(line, "TYPE") == "AUDIO")
+                        if (Global.GetTagAttribute(line, "TYPE") == "AUDIO" && !MEDIA_AUDIO.ContainsKey(Global.GetTagAttribute(line, "GROUP-ID")))
                             MEDIA_AUDIO.Add(Global.GetTagAttribute(line, "GROUP-ID"), CombineURL(BaseUrl, Global.GetTagAttribute(line, "URI")));
                         if (Global.GetTagAttribute(line, "TYPE") == "SUBTITLES")
                         {
@@ -384,6 +390,10 @@ namespace N_m3u8DL_CLI
                         {
                             segUrl += new Regex("\\?__gda__.*").Match(M3u8Url).Value;
                         }
+                        if (M3u8Url.Contains("//dlsc.hcs.cmvideo.cn") && (segUrl.EndsWith(".ts") || segUrl.EndsWith(".mp4")))
+                        {
+                            segUrl += new Regex("\\?.*").Match(M3u8Url).Value;
+                        }
                         segInfo.Add("segUri", segUrl);
                         segments.Add(segInfo);
                         segInfo = new JObject();
@@ -600,7 +610,7 @@ namespace N_m3u8DL_CLI
 
 
             //输出JSON文件
-            if (!liveStream)
+            if (!LiveStream)
             {
                 LOGGER.WriteLine(strings.wrtingMeta);
                 LOGGER.PrintLine(strings.wrtingMeta);

N_m3u8DL-CLI/Program.cs

@@ -290,6 +290,10 @@ namespace N_m3u8DL_CLI.NetCore
     /// 2020年9月19日
     ///   - 在自定义KEY且未自定义IV情况下，自动读取m3u8中存在的IV
     ///   - 支持阿房影视等ddyun m3u8解密
+    /// 2020年10月14日
+    ///   - 咪咕分片链接后拼接m3u8_url参数
+    ///   - 修复文件名过长导致的BUG
+    ///   - 优化ffmpeg调用逻辑
     /// </summary>
     /// 
 
@@ -355,7 +359,15 @@ namespace N_m3u8DL_CLI.NetCore
                 string fileName = "";
 
                 //寻找ffmpeg.exe
-                if (!File.Exists("ffmpeg.exe") && !File.Exists(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "ffmpeg.exe")))
+                if (File.Exists("ffmpeg.exe"))
+                {
+                    FFmpeg.FFMPEG_PATH = Path.Combine(Environment.CurrentDirectory, "ffmpeg.exe");
+                }
+                else if (File.Exists(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "ffmpeg.exe")))
+                {
+                    FFmpeg.FFMPEG_PATH = Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "ffmpeg.exe");
+                }
+                else
                 {
                     try
                     {
@@ -363,7 +375,10 @@ namespace N_m3u8DL_CLI.NetCore
                         foreach (var de in EnvironmentPath)
                         {
                             if (File.Exists(Path.Combine(de.Trim('\"').Trim(), "ffmpeg.exe")))
+                            {
+                                FFmpeg.FFMPEG_PATH = Path.Combine(de.Trim('\"').Trim(), "ffmpeg.exe");
                                 goto HasFFmpeg;
+                            }
                         }
                     }
                     catch (Exception)
@@ -377,8 +392,7 @@ namespace N_m3u8DL_CLI.NetCore
                     Console.ResetColor(); //将控制台的前景色和背景色设为默认值
                     Console.WriteLine(strings.ffmpegTip);
                     Console.WriteLine();
-                    Console.WriteLine("x86 https://ffmpeg.zeranoe.com/builds/win32/static/");
+                    Console.WriteLine("http://ffmpeg.org/download.html#build-windows");
-                    Console.WriteLine("x64 https://ffmpeg.zeranoe.com/builds/win64/static/");
                     Console.WriteLine();
                     Console.WriteLine(strings.pressAnyKeyExit);
                     Console.ReadKey();
@@ -645,6 +659,20 @@ namespace N_m3u8DL_CLI.NetCore
                 string m3u8Content = string.Empty;
                 bool isVOD = true;
 
+                //避免文件路径过长
+                if (workDir.Length >= 200)
+                {
+                    //目录不能随便改 直接抛出异常
+                    throw new Exception("保存目录过长!");
+                }
+                else if (workDir.Length + fileName.Length >= 200)
+                {
+                    //尝试缩短文件名
+                    while (workDir.Length + fileName.Length >= 200)
+                    {
+                        fileName = fileName.Substring(0, fileName.Length - 1);
+                    }
+                }
 
                 //开始解析
 

N_m3u8DL-CLI/packages.config

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