Update Global.cs

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

.github/workflows/build_latest.yml

@@ -0,0 +1,34 @@
+name: Build_Latest
+ 
+on: [push]
+ 
+jobs:
+  build:
+ 
+    runs-on: windows-latest
+ 
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout Code
+     
+    - 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
+ 
+    - name: Build 
+      run: msbuild N_m3u8DL-CLI.sln /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
+ 
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v1.0.0
+      with:
+        name: N_m3u8DL-CLI_latest
+        path: N_m3u8DL-CLI\bin\Release\

N_m3u8DL-CLI/CommandLineArgument.cs

@@ -2,6 +2,9 @@
 
 namespace N_m3u8DL_CLI
 {
+    /**
+     * https://www.cnblogs.com/linxuanchen/p/c-sharp-command-line-argument-parser.html
+     */
     public class CommandLineArgument
     {
         List<CommandLineArgument> _arguments;

N_m3u8DL-CLI/DecodeDdyun.cs

@@ -0,0 +1,41 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace N_m3u8DL_CLI
+{
+    class DecodeDdyun
+    {
+        public static string DecryptM3u8(byte[] byteArray)
+        {
+            string tmp = DecodeNfmovies.DecryptM3u8(byteArray);
+            if (tmp.StartsWith("duoduo.key"))
+            {
+                tmp = Regex.Replace(tmp, @"#EXT-X-BYTERANGE:.*\s", "");
+                tmp = tmp.Replace("https:", "jump/https:")
+                    .Replace("inews.gtimg.com", "puui.qpic.cn");
+            }
+            return tmp;
+        }
+
+        //https://player.ddyunp.com/jQuery.min.js?v1.5
+        public static string GetVaildM3u8Url(string url)
+        {
+            //url: https://hls.ddyunp.com/ddyun/id/1/key/playlist.m3u8
+            string id = Regex.Match(url, @"\w{20,}").Value;
+            string tm = Global.GetTimeStamp(false);
+            string t = ((long.Parse(tm) / 0x186a0) * 0x64).ToString();
+            string tmp = id + "duoduo" + "1" + t;
+            MD5 md5 = MD5.Create();
+            byte[] bs = Encoding.UTF8.GetBytes(tmp);
+            byte[] hs = md5.ComputeHash(bs);
+            StringBuilder sb = new StringBuilder();
+            foreach (byte b in hs)
+            {
+                sb.Append(b.ToString("x2"));
+            }
+            string key = sb.ToString();
+            return Regex.Replace(url, @"1/\w{20,}", "1/" + key);
+        }
+    }
+}

N_m3u8DL-CLI/DecodeNfmovies.cs

@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace N_m3u8DL_CLI
+{
+    class DecodeNfmovies
+    {
+        //https://jx.nfmovies.com/hls.min.js
+        public static string DecryptM3u8(byte[] byteArray)
+        {
+            var t = byteArray;
+            var decrypt = "";
+            if (137 == t[0] && 80 == t[1] && 130 == t[354] && 96 == t[353]) t = t.Skip(355).ToArray();
+            else
+            {
+                if (137 != t[0] || 80 != t[1] || 130 != t[394] || 96 != t[393])
+                {
+                    for (var i = 0; i < t.Length; i++) decrypt += Convert.ToChar(t[i]);
+                    return decrypt;
+                }
+                t = t.Skip(395).ToArray();
+            }
+            using (var zipStream =
+                new System.IO.Compression.GZipStream(new MemoryStream(t), System.IO.Compression.CompressionMode.Decompress))
+            {
+                using (StreamReader sr = new StreamReader(zipStream, Encoding.UTF8))
+                {
+                    decrypt = sr.ReadToEnd();
+                }
+            }
+            return decrypt;
+        }
+    }
+}

N_m3u8DL-CLI/FFmpeg.cs

@@ -10,19 +10,20 @@ namespace N_m3u8DL_CLI
 {
     class FFmpeg
     {
-        private static string outPutPath = string.Empty;
-        private static string reportFile = string.Empty;
-        private static bool useAACFilter = false;  //是否启用滤镜
-        private static bool writeDate = true;  //是否写入录制日期
-        public static string OutPutPath { get => outPutPath; set => outPutPath = value; }
-        public static string ReportFile { get => reportFile; set => reportFile = value; }
-        public static bool UseAACFilter { get => useAACFilter; set => useAACFilter = value; }
-        public static bool WriteDate { get => writeDate; set => writeDate = value; }
+        public static string FFMPEG_PATH = "ffmpeg";
+        public static string REC_TIME = ""; //录制日期
+
+        public static string OutPutPath { get; set; } = string.Empty;
+        public static string ReportFile { get; set; } = string.Empty;
+        public static bool UseAACFilter { get; set; } = false;  //是否启用滤镜
+        public static bool WriteDate { get; set; } = true;  //是否写入录制日期
 
         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/N_m3u8DL-CLI.csproj

@@ -40,11 +40,11 @@
   <ItemGroup>
     <Reference Include="Microsoft.JScript" />
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <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.dll</HintPath>
+      <HintPath>..\packages\NiL.JS.2.5.1428\lib\net45\NiL.JS.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -63,6 +63,9 @@
     <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="FFmpeg.cs" />
     <Compile Include="Global.cs" />
@@ -70,10 +73,26 @@
     <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" />
     <Compile Include="Downloader.cs" />
+    <Compile Include="strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="strings.en-US.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>strings.en-US.resx</DependentUpon>
+    </Compile>
+    <Compile Include="strings.zh-TW.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>strings.zh-TW.resx</DependentUpon>
+    </Compile>
     <Compile Include="Watcher.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -82,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>
@@ -100,16 +116,18 @@
     <Content Include="logo_3Iv_icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Include="strings.en-US.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <LastGenOutput>strings.en-US.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="strings.en-US.resx" />
     <EmbeddedResource Include="strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="strings.zh-TW.resx" />
+    <EmbeddedResource Include="strings.zh-TW.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>strings.zh-TW.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

N_m3u8DL-CLI/Program.cs

@@ -273,6 +273,27 @@ namespace N_m3u8DL_CLI.NetCore
     /// 2020年7月18日
     ///   - 从当前路径和exe路径同时寻找ffmpeg
     ///   - 支持多语言本地化(简繁英)
+    /// 2020年8月4日
+    ///   - 修复外挂字幕命名问题
+    ///   - 修复外挂字幕识别问题
+    ///   - 修复外挂轨道的一些逻辑问题
+    ///   - 优化多语言识别逻辑
+    /// 2020年8月5日
+    ///   - 支持相对时间的vtt合并(还存在问题)
+    /// 2020年8月9日
+    ///   - 修复IV错误导致的AES-128解密异常问题
+    ///   - 支持自定义IV(--useKeyIV)
+    /// 2020年9月12日
+    ///   - 支持nfmovies m3u8解密
+    ///   - 支持自动去除PNG Header(https://puui.qpic.cn/newsapp_ls/0/12418116195/0)
+    ///   - 修复相对时间的vtt合并的一些错误逻辑(还存在问题)
+    /// 2020年9月19日
+    ///   - 在自定义KEY且未自定义IV情况下，自动读取m3u8中存在的IV
+    ///   - 支持阿房影视等ddyun m3u8解密
+    /// 2020年10月14日
+    ///   - 咪咕分片链接后拼接m3u8_url参数
+    ///   - 修复文件名过长导致的BUG
+    ///   - 优化ffmpeg调用逻辑
     /// </summary>
     /// 
 
@@ -318,7 +339,11 @@ namespace N_m3u8DL_CLI.NetCore
             {
                 loc = "zh-TW";
             }
-            else if (loc != "zh-CN" && loc != "zh-SG")
+            else if (loc == "zh-CN" || loc == "zh-SG")
+            {
+                loc = "zh-CN";
+            }
+            else
             {
                 loc = "en-US";
             }
@@ -334,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
                     {
@@ -342,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)
@@ -356,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("x64 https://ffmpeg.zeranoe.com/builds/win64/static/");
+                    Console.WriteLine("http://ffmpeg.org/download.html#build-windows");
                     Console.WriteLine();
                     Console.WriteLine(strings.pressAnyKeyExit);
                     Console.ReadKey();
@@ -384,6 +419,7 @@ namespace N_m3u8DL_CLI.NetCore
                 string reqHeaders = "";
                 string keyFile = "";
                 string keyBase64 = "";
+                string keyIV = "";
                 string muxSetJson = "MUXSETS.json";
                 string workDir = CURRENT_PATH + "\\Downloads";
                 bool muxFastStart = false;
@@ -472,6 +508,10 @@ namespace N_m3u8DL_CLI.NetCore
                 {
                     keyBase64 = arguments.Get("--useKeyBase64").Next;
                 }
+                if (arguments.Has("--useKeyIV"))
+                {
+                    keyIV = arguments.Get("--useKeyIV").Next;
+                }
                 if (arguments.Has("--stopSpeed"))
                 {
                     Global.STOP_SPEED = Convert.ToInt64(arguments.Get("--stopSpeed").Next);
@@ -619,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);
+                    }
+                }
 
                 //开始解析
 
@@ -631,6 +685,7 @@ namespace N_m3u8DL_CLI.NetCore
                 parser.DownDir = Path.Combine(workDir, parser.DownName);
                 parser.M3u8Url = testurl;
                 parser.KeyBase64 = keyBase64;
+                parser.KeyIV = keyIV;
                 parser.KeyFile = keyFile;
                 if (baseUrl != "")
                     parser.BaseUrl = baseUrl;

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>

N_m3u8DL-CLI/strings.en-US.resx

@@ -197,6 +197,7 @@
     --muxSetJson File           Set a json file for mux
     --useKeyFile File           Use 16 bytes file as KEY for AES-128 decryption
     --useKeyBase64 Base64String Use Base64 String as KEY for AES-128 decryption
+    --useKeyIV     HEXString    Use HEX String as IV for AES-128 decryption
     --downloadRange Range       Set range for a video
     --stopSpeed  Number         Speed below this, retry(KB/s)
     --maxSpeed   Number         Set max download speed(KB/s)

N_m3u8DL-CLI/strings.resx

@@ -197,6 +197,7 @@
     --muxSetJson File           使用外部json文件定义混流选项
     --useKeyFile File           使用外部16字节文件定义AES-128解密KEY
     --useKeyBase64 Base64String 使用Base64字符串定义AES-128解密KEY
+    --useKeyIV     HEXString    使用HEX字符串定义AES-128解密IV
     --downloadRange Range       仅下载视频的一部分分片或长度
     --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)

N_m3u8DL-CLI/strings.zh-TW.resx

@@ -197,6 +197,7 @@
     --muxSetJson File           使用外部json文件定義混流選項
     --useKeyFile File           使用外部16字節文件定義AES-128解密KEY
     --useKeyBase64 Base64String 使用Base64字符串定義AES-128解密KEY
+    --useKeyIV     HEXString    使用HEX字符串定義AES-128解密IV
     --downloadRange Range       僅下載視頻的壹部分分片或長度
     --liveRecDur HH:MM:SS       直播錄制時，達到此長度自動退出軟件
     --stopSpeed  Number         當速度低於此值時，重試(單位為KB/s)

README.md

@@ -61,6 +61,7 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
     --muxSetJson File           使用外部json文件定义混流选项
     --useKeyFile File           使用外部16字节文件定义AES-128解密KEY
     --useKeyBase64 Base64String 使用Base64字符串定义AES-128解密KEY
+    --useKeyIV     HEXString    使用HEX字符串定义AES-128解密IV
     --downloadRange Range       仅下载视频的一部分分片或长度
     --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)

README_ENG.md

@@ -43,6 +43,7 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
     --muxSetJson File           Set a json file for mux
     --useKeyFile File           Use 16 bytes file as KEY for AES-128 decryption
     --useKeyBase64 Base64String Use Base64 String as KEY for AES-128 decryption
+    --useKeyIV     HEXString    Use HEX String as IV for AES-128 decryption
     --downloadRange Range       Set range for a video
     --stopSpeed  Number         Speed below this, retry(KB/s)
     --maxSpeed   Number         Set max download speed(KB/s)