Update changelog.txt

- 修复M3U8选择音轨/字幕不生效问题
  - 外挂音轨时enableAudioOnly可仅下载音频

N_m3u8DL-CLI/DecodeHuke88Key.cs

@@ -0,0 +1,53 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace N_m3u8DL_CLI
+{
+    //https://js.huke88.com/assets/revision/js/plugins/tcplayer/tcplayer.v4.1.min.js?v=930
+    //https://js.huke88.com/assets/revision/js/plugins/tcplayer/libs/hls.min.0.13.2m.js?v=930
+    class DecodeHuke88Key
+    {
+        private static string[] GetOverlayInfo(string url)
+        {
+            var enc = new Regex("eyJ\\w{100,}").Match(url).Value;
+            var json = Encoding.UTF8.GetString(Convert.FromBase64String(enc));
+            JObject jObject = JObject.Parse(json);
+            var key = jObject["overlayKey"].ToString();
+            var iv = jObject["overlayIv"].ToString();
+            return new string[] { key, iv };
+        }
+
+        public static string DecodeKey(string url, byte[] data)
+        {
+            var info = GetOverlayInfo(url);
+            var overlayKey = info[0];
+            var overlayIv = info[1];
+            var l = new List<byte>();
+            var c = new List<byte>();
+            for (int h = 0; h < 16; h++)
+            {
+                var f = overlayKey.Substring(2 * h, 2);
+                var g = overlayIv.Substring(2 * h, 2);
+                l.Add(Convert.ToByte(f, 16));
+                c.Add(Convert.ToByte(g, 16));
+            }
+
+            var _lastCipherblock = c.ToArray();
+
+            var t = new byte[data.Length];
+            var r = data;
+            r = Decrypter.AES128Decrypt(data, l.ToArray(), Decrypter.HexStringToBytes("00000000000000000000000000000000"), CipherMode.CBC, PaddingMode.Zeros);
+
+            for (var o = 0; o < 16; o++)
+                t[o] = (byte)(r[o] ^ _lastCipherblock[o]);
+
+            var key = Convert.ToBase64String(t);
+
+            return key;
+        }
+    }
+}

N_m3u8DL-CLI/Decrypter.cs

@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace N_m3u8DL_CLI
 {
     class Decrypter
     {
-        public static byte[] AES128Decrypt(string filePath, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC)
+        public static byte[] AES128Decrypt(string filePath, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC, PaddingMode padding = PaddingMode.PKCS7)
         {
             FileStream fs = new FileStream(filePath, FileMode.Open);
             //获取文件大小
@@ -25,14 +21,14 @@ namespace N_m3u8DL_CLI
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
             dcpt.Mode = mode;
-            dcpt.Padding = PaddingMode.PKCS7;
+            dcpt.Padding = padding;
 
             ICryptoTransform cTransform = dcpt.CreateDecryptor();
             Byte[] resultArray = cTransform.TransformFinalBlock(inBuff, 0, inBuff.Length);
             return resultArray;
         }
 
-        public static byte[] AES128Decrypt(byte[] encryptedBuff, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC)
+        public static byte[] AES128Decrypt(byte[] encryptedBuff, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC, PaddingMode padding = PaddingMode.PKCS7)
         {
             byte[] inBuff = encryptedBuff;
 
@@ -42,7 +38,7 @@ namespace N_m3u8DL_CLI
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
             dcpt.Mode = mode;
-            dcpt.Padding = PaddingMode.PKCS7;
+            dcpt.Padding = padding;
 
             ICryptoTransform cTransform = dcpt.CreateDecryptor();
             Byte[] resultArray = cTransform.TransformFinalBlock(inBuff, 0, inBuff.Length);
@@ -56,7 +52,7 @@ namespace N_m3u8DL_CLI
                 return new byte[0];
             }
 
-            if (hexStr.StartsWith("0x") || hexStr.StartsWith("0X")) 
+            if (hexStr.StartsWith("0x") || hexStr.StartsWith("0X"))
             {
                 hexStr = hexStr.Remove(0, 2);
             }

N_m3u8DL-CLI/Global.cs

@@ -24,14 +24,17 @@ namespace N_m3u8DL_CLI
         public static string AUDIO_TYPE = "";
         public static bool HadReadInfo = false;
         private static bool noProxy = false;
+        private static string useProxyAddress = "";
 
         public static bool ShouldStop { get => shouldStop; set => shouldStop = value; }
         public static bool NoProxy { get => noProxy; set => noProxy = value; }
+        public static string UseProxyAddress { get => useProxyAddress; set => useProxyAddress = value; }
 
 
         /*===============================================================================*/
-        static string nowVer = "2.8.1";
-        static string nowDate = "20201121";
+        static Version ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+        static string nowVer = $"{ver.Major}.{ver.Minor}.{ver.Build}";
+        static string nowDate = "20210201";
         public static void WriteInit()
         {
             Console.Clear();
@@ -101,23 +104,34 @@ 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/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");
+                    if (NoProxy)
+                    {
+                        webRequest.Proxy = null;
+                    }
+                    else if (UseProxyAddress != "")
+                    {
+                        WebProxy proxy = new WebProxy(UseProxyAddress);
+                        //proxy.Credentials = new NetworkCredential(username, password);
+                        webRequest.Proxy = proxy;
+                    }
+                    webRequest.UserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36";
+                    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 = "";
                         if (!url.Contains("/internettv/"))
-                            webRequest.Referer = "https://player.mgtv.com/mgtv_v6_player/PlayerCore.swf";
+                            webRequest.Referer = "https://www.mgtv.com";
                         webRequest.Headers.Add("Cookie", "MQGUID");
                     }
                     //添加headers
@@ -146,8 +160,16 @@ 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.ContentLength != -1 && webResponse.ContentLength > 50 * 1024 * 1024) return "";
 
                     if (webResponse.ContentEncoding != null
                         && webResponse.ContentEncoding.ToLower() == "gzip") //如果使用了GZip则先解压
@@ -359,7 +381,16 @@ namespace N_m3u8DL_CLI
                 string redirectUrl;
                 WebRequest myRequest = WebRequest.Create(url);
                 myRequest.Timeout = timeout;
-                if (NoProxy) myRequest.Proxy = null;
+                if (NoProxy)
+                {
+                    myRequest.Proxy = null;
+                }
+                else if (UseProxyAddress != "")
+                {
+                    WebProxy proxy = new WebProxy(UseProxyAddress);
+                    //proxy.Credentials = new NetworkCredential(username, password);
+                    myRequest.Proxy = proxy;
+                }
                 //添加headers
                 if (headers != "")
                 {
@@ -406,14 +437,26 @@ namespace N_m3u8DL_CLI
                 }
             }
 
+        reProcess:
             byte[] arraryByte;
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
             req.Method = "GET";
             req.Timeout = timeOut;
             req.ReadWriteTimeout = timeOut; //重要
-            if (NoProxy) req.Proxy = null;
+            req.AllowAutoRedirect = false; //手动处理重定向，否则会丢失Referer
+            if (NoProxy)
+            {
+                req.Proxy = null;
+            }
+            else if (UseProxyAddress != "")
+            {
+                WebProxy proxy = new WebProxy(UseProxyAddress);
+                //proxy.Credentials = new NetworkCredential(username, password);
+                req.Proxy = proxy;
+            }
             req.Headers.Add("Accept-Encoding", "gzip, deflate");
             req.Accept = "*/*";
+            req.UserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36";
             //添加headers
             if (headers != "")
             {
@@ -441,6 +484,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())
@@ -501,24 +551,38 @@ 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;
+                if (NoProxy)
+                {
+                    request.Proxy = null;
+                }
+                else if (UseProxyAddress != "")
+                {
+                    WebProxy proxy = new WebProxy(UseProxyAddress);
+                    //proxy.Credentials = new NetworkCredential(username, password);
+                    request.Proxy = proxy;
+                }
                 if (url.Contains("data.video.iqiyi.com"))
                     request.UserAgent = "QYPlayer/Android/4.4.5;NetType/3G;QTP/1.1.4.3";
                 else if (url.Contains("pcvideo") && url.Contains(".titan.mgtv.com"))
                 {
                     request.UserAgent = "";
                     if (!url.Contains("/internettv/"))
-                        request.Referer = "https://player.mgtv.com/mgtv_v6_player/PlayerCore.swf";
+                        request.Referer = "https://www.mgtv.com";
                     request.Headers.Add("Cookie", "MQGUID");
                 }
+                else if (url.Contains(".xboku.com/")) //独播库
+                {
+                    request.Referer = "https://my.duboku.vip/static/player/videojs.html";
+                }
                 else
-                    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";
+                    request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36";
                 //下载部分字节
                 if (expectByte != -1)
                     request.AddRange("bytes", startByte, startByte + expectByte - 1);
@@ -552,6 +616,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))
@@ -560,7 +631,7 @@ 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;
                             }
@@ -593,10 +664,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)
             {
@@ -634,13 +706,13 @@ namespace N_m3u8DL_CLI
             }
             else if (137 == u[0] && 80 == u[1] && 78 == u[2] && 71 == u[3])
             {
-                //确定是PNG但是需要手动查询结尾标记(0x60 0x82 0x47)
+                //确定是PNG但是需要手动查询结尾标记 0x47 出现两次
                 int skip = 0;
-                for (int i = 4; i < u.Length - 3; i++)
+                for (int i = 4; i < u.Length - 188 * 2; i++)
                 {
-                    if (u[i] == 0x60 && u[i + 1] == 0x82 && u[i + 2] == 0x47)
+                    if (u[i] == 0x47 && u[i + 188] == 0x47 && u[i + 188 + 188] == 0x47)
                     {
-                        skip = i + 2;
+                        skip = i;
                         break;
                     }
                 }
@@ -1076,7 +1148,16 @@ namespace N_m3u8DL_CLI
             protected override WebRequest GetWebRequest(Uri address)
             {
                 var wr = (HttpWebRequest)base.GetWebRequest(address);
-                if (NoProxy) wr.Proxy = null;
+                if (NoProxy)
+                {
+                    wr.Proxy = null;
+                }
+                else if (UseProxyAddress != "")
+                {
+                    WebProxy proxy = new WebProxy(UseProxyAddress);
+                    //proxy.Credentials = new NetworkCredential(username, password);
+                    wr.Proxy = proxy;
+                }
                 if (setRange)
                     wr.AddRange(this.from, this.to);
                 if (setTimeout)

N_m3u8DL-CLI/N_m3u8DL-CLI.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -38,6 +41,9 @@
     <ApplicationIcon>logo_3Iv_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.JScript" />
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -64,6 +70,7 @@
     <Compile Include="CommandLineArgumentParser.cs" />
     <Compile Include="Decode51CtoKey.cs" />
     <Compile Include="DecodeDdyun.cs" />
+    <Compile Include="DecodeHuke88Key.cs" />
     <Compile Include="DecodeImooc.cs" />
     <Compile Include="DecodeNfmovies.cs" />
     <Compile Include="Decrypter.cs" />
@@ -130,4 +137,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.6.0.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
+  </Target>
 </Project>

N_m3u8DL-CLI/changelog.txt

@@ -284,4 +284,50 @@
 2020年11月20日
   - 识别大部分mpd地址，自动转换为m3u8并下载
   - GIF HEADER检测
-  - 修复BUG
+  - 修复BUG
+2020年11月22日
+  - 解决HTTPS协议自动重定向后，Referer丢失问题
+  - 新的任务速度监控逻辑
+2020年11月23日
+  - 将默认UA修改为 Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36
+  - 修改芒果TV请求头
+2020年11月25日
+  - 修正MPD判断最高清晰度的逻辑
+  - 在MPD输入下支持选择音轨
+  - 修复BUG
+2020年11月26日
+  - 优化MPD识别方案
+  - 修复MPD情况下时间戳溢出问题
+2020年12月2日
+  - FIX Language Bug
+2020年12月6日
+  - 使用手机UA请求气球云密钥服务器
+2020年12月12日
+  - 修复MPD下同一个ID分散在不同Period导致下载不完全问题
+2020年12月20日
+  - 支持解密虎课网
+2021年1月18日
+  - 完善MPD下载相关
+  - 重新打包多语言资源
+2021年1月24日
+  - 适配Disney+资源
+  - MPD选择流行为优化
+  - 修复二进制合并时vtt字幕被合并为ts后缀问题
+2021年2月1日
+  - 修正自定义KEY且存在IV时的隐患
+  - 优化跳过PNG Header的算法
+2021年2月2日
+  - 独播库自动加入referer
+  - 修复气球云
+2021年2月10日
+  - 修正MPD拼接BaseUrl逻辑
+2021年2月11日
+  - 将CNTV视频修改为未加密链接
+2021年2月21日
+  - MPD检测最后一个分片是否有效
+2021年2月22日
+  - 添加用户网络代理支持，使用--proxyAddress指定代理地址。（@evanlabs）
+2021年3月3日
+  - 修复M3U8选择音轨/字幕不生效问题
+  - 外挂音轨时enableAudioOnly可仅下载音频
+  - 移除气球云支持

N_m3u8DL-CLI/packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fody" version="6.0.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Costura.Fody" version="4.1.0" targetFramework="net46" />
   <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.Designer.cs

@@ -47,8 +47,8 @@ namespace N_m3u8DL_CLI {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -69,6 +69,15 @@ namespace N_m3u8DL_CLI {
             }
         }
         
+        /// <summary>
+        ///   查找类似 正在判断尾分片是否有效... 的本地化字符串。
+        /// </summary>
+        internal static string checkingLast {
+            get {
+                return ResourceManager.GetString("checkingLast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 已关闭完整性检查 的本地化字符串。
         /// </summary>
@@ -493,6 +502,15 @@ namespace N_m3u8DL_CLI {
             }
         }
         
+        /// <summary>
+        ///   查找类似 开始解析MPD内容... 的本地化字符串。
+        /// </summary>
+        internal static string startParsingMpd {
+            get {
+                return ResourceManager.GetString("startParsingMpd", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 重新解析m3u8... 的本地化字符串。
         /// </summary>

N_m3u8DL-CLI/strings.en-US.resx

@@ -201,6 +201,7 @@
     --downloadRange Range       Set range for a video
     --stopSpeed  Number         Speed below this, retry(KB/s)
     --maxSpeed   Number         Set max download speed(KB/s)
+    --proxyAddress http://xx    Set HTTP Proxy, like http://127.0.0.1:8080
     --enableDelAfterDone        Enable delete clips after download completed
     --enableMuxFastStart        Enable fast start for mp4
     --enableBinaryMerge         Enable use binary merge instead ffmpeg
@@ -298,4 +299,10 @@
   <data name="wrtingMeta" xml:space="preserve">
     <value>Writing Json: [meta.json]</value>
   </data>
+  <data name="startParsingMpd" xml:space="preserve">
+    <value>Start Parsing MPD Content...</value>
+  </data>
+  <data name="checkingLast" xml:space="preserve">
+    <value>Checking Whether The Last Fragment Is Valid...</value>
+  </data>
 </root>

N_m3u8DL-CLI/strings.resx

@@ -202,6 +202,7 @@
     --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)
     --maxSpeed   Number         设置下载速度上限(单位为KB/s)
+    --proxyAddress http://xx    设置HTTP代理, 如 http://127.0.0.1:8080
     --enableDelAfterDone        开启下载后删除临时文件夹的功能
     --enableMuxFastStart        开启混流mp4的FastStart特性
     --enableBinaryMerge         开启二进制合并分片
@@ -299,4 +300,10 @@
   <data name="wrtingMeta" xml:space="preserve">
     <value>写出meta.json</value>
   </data>
+  <data name="startParsingMpd" xml:space="preserve">
+    <value>开始解析MPD内容...</value>
+  </data>
+  <data name="checkingLast" xml:space="preserve">
+    <value>正在判断尾分片是否有效...</value>
+  </data>
 </root>

N_m3u8DL-CLI/strings.zh-TW.resx

@@ -202,6 +202,7 @@
     --liveRecDur HH:MM:SS       直播錄制時，達到此長度自動退出軟件
     --stopSpeed  Number         當速度低於此值時，重試(單位為KB/s)
     --maxSpeed   Number         設置下載速度上限(單位為KB/s)
+    --proxyAddress http://xx    設置HTTP代理, 如 http://127.0.0.1:8080
     --enableDelAfterDone        開啟下載後刪除臨時文件夾的功能
     --enableMuxFastStart        開啟混流mp4的FastStart特性
     --enableBinaryMerge         開啟二進制合並分片
@@ -299,4 +300,10 @@
   <data name="wrtingMeta" xml:space="preserve">
     <value>寫出meta.json</value>
   </data>
+  <data name="startParsingMpd" xml:space="preserve">
+    <value>開始解析MPD內容...</value>
+  </data>
+  <data name="checkingLast" xml:space="preserve">
+    <value>正在判斷尾分片是否有效...</value>
+  </data>
 </root>

README.md

@@ -18,9 +18,7 @@
 本项目已与2019年10月9日开源，采用MIT许可证，各取所需。
 
 # 关于跨平台
-~~本项目已通过`.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  
@@ -48,7 +46,7 @@
 
 # 命令行选项
 ```
-N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]  
+N_m3u8DL-CLI.exe <URL|File|JSON> [OPTIONS]  
 
     --workDir    Directory      设定程序工作目录
     --saveName   Filename       设定存储文件名(不包括后缀)
@@ -66,6 +64,7 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
     --liveRecDur HH:MM:SS       直播录制时，达到此长度自动退出软件
     --stopSpeed  Number         当速度低于此值时，重试(单位为KB/s)
     --maxSpeed   Number         设置下载速度上限(单位为KB/s)
+    --proxyAddress http://xx    设置HTTP代理, 如 http://127.0.0.1:8080
     --enableDelAfterDone        开启下载后删除临时文件夹的功能
     --enableMuxFastStart        开启混流mp4的FastStart特性
     --enableBinaryMerge         开启二进制合并分片
@@ -81,4 +80,4 @@ 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
+![Wow](https://nilaoda.github.io/N_m3u8DL-CLI/source/images/alipay.png)

README_ENG.md

@@ -47,6 +47,7 @@ N_m3u8DL-CLI.exe <URL|JSON|FILE> [OPTIONS]
     --downloadRange Range       Set range for a video
     --stopSpeed  Number         Speed below this, retry(KB/s)
     --maxSpeed   Number         Set max download speed(KB/s)
+    --proxyAddress http://xx    Set HTTP Proxy, like http://127.0.0.1:8080
     --enableDelAfterDone        Enable delete clips after download completed
     --enableMuxFastStart        Enable fast start for mp4
     --enableBinaryMerge         Enable use binary merge instead ffmpeg