Fix #785

修复 录制间隔负数导致错误

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://nilaoda.github.io/N_m3u8DL-CLI/source/images/alipay.png','https://www.buymeacoffee.com/nilaoda']

.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.exe

N_m3u8DL-CLI.sln

@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29215.179
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N_m3u8DL-CLI", "N_m3u8DL-CLI\N_m3u8DL-CLI.csproj", "{4FB61439-B738-46AC-B3AF-2BF72150D057}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI-MainWindow", "GUI-MainWindow\GUI-MainWindow.csproj", "{FE91DB43-1F1F-4119-B808-A7F4795BB4D0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{4FB61439-B738-46AC-B3AF-2BF72150D057}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FB61439-B738-46AC-B3AF-2BF72150D057}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FB61439-B738-46AC-B3AF-2BF72150D057}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE91DB43-1F1F-4119-B808-A7F4795BB4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE91DB43-1F1F-4119-B808-A7F4795BB4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE91DB43-1F1F-4119-B808-A7F4795BB4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE91DB43-1F1F-4119-B808-A7F4795BB4D0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

N_m3u8DL-CLI/CommandLineArgument.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-
-namespace N_m3u8DL_CLI
-{
-    public class CommandLineArgument
-    {
-        List<CommandLineArgument> _arguments;
-
-        int _index;
-
-        string _argumentText;
-
-        public CommandLineArgument Next
-        {
-            get
-            {
-                if (_index < _arguments.Count - 1)
-                {
-                    return _arguments[_index + 1];
-                }
-
-                return null;
-            }
-        }
-        public CommandLineArgument Previous
-        {
-            get
-            {
-                if (_index > 0)
-                {
-                    return _arguments[_index - 1];
-                }
-
-                return null;
-            }
-        }
-        internal CommandLineArgument(List<CommandLineArgument> args, int index, string argument)
-        {
-            _arguments = args;
-            _index = index;
-            _argumentText = argument;
-        }
-
-        public CommandLineArgument Take()
-        {
-            return Next;
-        }
-
-        public IEnumerable<CommandLineArgument> Take(int count)
-        {
-            var list = new List<CommandLineArgument>();
-            var parent = this;
-            for (int i = 0; i < count; i++)
-            {
-                var next = parent.Next;
-                if (next == null)
-                    break;
-
-                list.Add(next);
-
-                parent = next;
-            }
-
-            return list;
-        }
-
-        public static implicit operator string(CommandLineArgument argument)
-        {
-            return argument._argumentText;
-        }
-
-        public override string ToString()
-        {
-            return _argumentText;
-        }
-    }
-}

N_m3u8DL-CLI/CommandLineArgumentParser.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace N_m3u8DL_CLI
-{
-    public class CommandLineArgumentParser
-    {
-
-        List<CommandLineArgument> _arguments;
-        public static CommandLineArgumentParser Parse(string[] args)
-        {
-            return new CommandLineArgumentParser(args);
-        }
-
-        public CommandLineArgumentParser(string[] args)
-        {
-            _arguments = new List<CommandLineArgument>();
-
-            for (int i = 0; i < args.Length; i++)
-            {
-                _arguments.Add(new CommandLineArgument(_arguments, i, args[i]));
-            }
-
-        }
-
-        public CommandLineArgument Get(string argumentName)
-        {
-            return _arguments.FirstOrDefault(p => p == argumentName);
-        }
-
-        public bool Has(string argumentName)
-        {
-            return _arguments.Count(p => p == argumentName) > 0;
-        }
-    }
-}

N_m3u8DL-CLI/DecodeCdeledu.cs

@@ -0,0 +1,83 @@
+using NiL.JS.BaseLibrary;
+using NiL.JS.Core;
+using NiL.JS.Extensions;
+using System;
+using Array = System.Array;
+
+namespace N_m3u8DL_CLI
+{
+    internal class DecodeCdeledu
+    {
+        private static string JS = @"
+var _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+var removePaddingChars = function(input) {
+    var lkey = _keyStr.indexOf(input.charAt(input.length - 1));
+    if (lkey == 64) {
+        return input.substring(0, input.length - 1);
+    }
+    return input;
+}
+
+var base64Decode = function(input, arrayBuffer) {
+    input = removePaddingChars(input);
+    input = removePaddingChars(input);
+    var bytes = parseInt((input.length / 4) * 3, 10);
+    var uarray;
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    var j = 0;
+    if (arrayBuffer) {
+        uarray = new Uint8Array(arrayBuffer);
+    } else {
+        uarray = new Uint8Array(bytes);
+    }
+    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+    for (i = 0; i < bytes; i += 3) {
+        enc1 = _keyStr.indexOf(input.charAt(j++));
+        enc2 = _keyStr.indexOf(input.charAt(j++));
+        enc3 = _keyStr.indexOf(input.charAt(j++));
+        enc4 = _keyStr.indexOf(input.charAt(j++));
+        chr1 = (enc1 << 2) | (enc2 >> 4);
+        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+        chr3 = ((enc3 & 3) << 6) | enc4;
+        uarray[i] = chr1;
+        if (enc3 != 64)
+            uarray[i + 1] = chr2;
+        if (enc4 != 64)
+            uarray[i + 2] = chr3;
+    }
+    return uarray;
+}
+
+var uint8ArrayToString = function(uDataArr) {
+    var arrStr = '';
+    for (var i = 0; i < uDataArr.length; i++) {
+        arrStr += String.fromCharCode(uDataArr[i]);
+    }
+    return arrStr;
+}
+
+var decodeKey = function(dataKeyString) {
+    var decodeArr = base64Decode(dataKeyString);
+    var decodeArrString = uint8ArrayToString(decodeArr);
+    return decodeArrString;
+    if (decodeArrString.indexOf('|&|') > 0) {
+        return decodeArrString;
+    }
+    return '';
+}
+";
+        //https://video.cdeledu.com/js/lib/cdel.hls.min-1.0.js?v=1.3
+        public static string DecodeKey(string txt)
+        {
+            var context = new Context();
+            context.Eval(JS);
+            var concatFunction = context.GetVariable("decodeKey").As<Function>();
+            string key = concatFunction.Call(new Arguments { txt }).ToString();
+            string realKey = key.Split(new string[] { "|&|" }, StringSplitOptions.None)[1];
+            return realKey;
+        }
+    }
+}

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/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/DecodeImooc.cs

@@ -0,0 +1,203 @@
+using NiL.JS.BaseLibrary;
+using NiL.JS.Core;
+using NiL.JS.Extensions;
+using System;
+using Array = System.Array;
+
+namespace N_m3u8DL_CLI
+{
+    /*
+     * js代码来自：https://www.imooc.com/static/moco/player/3.0.6.3/mocoplayer.js?v=202006122046
+     * 
+     */
+    class DecodeImooc
+    {
+        private static string JS = @"
+function n(t, e) {
+                function r(t, e) {
+                    var r = '';
+                    if ('object' == typeof t)
+                        for (var n = 0; n < t.length; n++)
+                            r += String.fromCharCode(t[n]);
+                    t = r || t;
+                    for (var i, o, a = new Uint8Array(t.length), s = e.length, n = 0; n < t.length; n++)
+                        o = n % s,
+                        i = t[n],
+                        i = i.toString().charCodeAt(0),
+                        a[n] = i ^ e.charCodeAt(o);
+                    return a
+                }
+                function n(t) {
+                    var e = '';
+                    if ('object' == typeof t)
+                        for (var r = 0; r < t.length; r++)
+                            e += String.fromCharCode(t[r]);
+                    t = e || t;
+                    var n = new Uint8Array(t.length);
+                    for (r = 0; r < t.length; r++)
+                        n[r] = t[r].toString().charCodeAt(0);
+                    var i, o, r = 0;
+                    for (r = 0; r < n.length; r++)
+                        0 != (i = n[r] % 3) && r + i < n.length && (o = n[r + 1],
+                        n[r + 1] = n[r + i],
+                        n[r + i] = o,
+                        r = r + i + 1);
+                    return n
+                }
+                function i(t) {
+                    var e = '';
+                    if ('object' == typeof t)
+                        for (var r = 0; r < t.length; r++)
+                            e += String.fromCharCode(t[r]);
+                    t = e || t;
+                    var n = new Uint8Array(t.length);
+                    for (r = 0; r < t.length; r++)
+                        n[r] = t[r].toString().charCodeAt(0);
+                    var r = 0
+                      , i = 0
+                      , o = 0
+                      , a = 0;
+                    for (r = 0; r < n.length; r++)
+                        o = n[r] % 2,
+                        o && r++,
+                        a++;
+                    var s = new Uint8Array(a);
+                    for (r = 0; r < n.length; r++)
+                        o = n[r] % 2,
+                        s[i++] = o ? n[r++] : n[r];
+                    return s
+                }
+                function o(t, e) {
+                    var r = 0
+                      , n = 0
+                      , i = 0
+                      , o = 0
+                      , a = '';
+                    if ('object' == typeof t)
+                        for (var r = 0; r < t.length; r++)
+                            a += String.fromCharCode(t[r]);
+                    t = a || t;
+                    var s = new Uint8Array(t.length);
+                    for (r = 0; r < t.length; r++)
+                        s[r] = t[r].toString().charCodeAt(0);
+                    for (r = 0; r < t.length; r++)
+                        if (0 != (o = s[r] % 5) && 1 != o && r + o < s.length && (i = s[r + 1],
+                        n = r + 2,
+                        s[r + 1] = s[r + o],
+                        s[o + r] = i,
+                        (r = r + o + 1) - 2 > n))
+                            for (; n < r - 2; n++)
+                                s[n] = s[n] ^ e.charCodeAt(n % e.length);
+                    for (r = 0; r < t.length; r++)
+                        s[r] = s[r] ^ e.charCodeAt(r % e.length);
+                    return s
+                }
+                for (var a = {
+                    data: {
+                        info: t
+                    }
+                }, s = {
+                    q: r,
+                    h: n,
+                    m: i,
+                    k: o
+                }, l = a.data.info, u = l.substring(l.length - 4).split(''), c = 0; c < u.length; c++)
+                    u[c] = u[c].toString().charCodeAt(0) % 4;
+                u.reverse();
+                for (var d = [], c = 0; c < u.length; c++)
+                    d.push(l.substring(u[c] + 1, u[c] + 2)),
+                    l = l.substring(0, u[c] + 1) + l.substring(u[c] + 2);
+                a.data.encrypt_table = d,
+                a.data.key_table = [];
+                for (var c in a.data.encrypt_table)
+                    'q' != a.data.encrypt_table[c] && 'k' != a.data.encrypt_table[c] || (a.data.key_table.push(l.substring(l.length - 12)),
+                    l = l.substring(0, l.length - 12));
+                a.data.key_table.reverse(),
+                a.data.info = l;
+                var f = new Array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1);
+                a.data.info = function(t) {
+                    var e, r, n, i, o, a, s;
+                    for (a = t.length,
+                    o = 0,
+                    s = ''; o < a; ) {
+                        do {
+                            e = f[255 & t.charCodeAt(o++)]
+                        } while (o < a && -1 == e);if (-1 == e)
+                            break;
+                        do {
+                            r = f[255 & t.charCodeAt(o++)]
+                        } while (o < a && -1 == r);if (-1 == r)
+                            break;
+                        s += String.fromCharCode(e << 2 | (48 & r) >> 4);
+                        do {
+                            if (61 == (n = 255 & t.charCodeAt(o++)))
+                                return s;
+                            n = f[n]
+                        } while (o < a && -1 == n);if (-1 == n)
+                            break;
+                        s += String.fromCharCode((15 & r) << 4 | (60 & n) >> 2);
+                        do {
+                            if (61 == (i = 255 & t.charCodeAt(o++)))
+                                return s;
+                            i = f[i]
+                        } while (o < a && -1 == i);if (-1 == i)
+                            break;
+                        s += String.fromCharCode((3 & n) << 6 | i)
+                    }
+                    return s
+                }(a.data.info);
+                for (var c in a.data.encrypt_table) {
+                    var h = a.data.encrypt_table[c];
+                    if ('q' == h || 'k' == h) {
+                        var p = a.data.key_table.pop();
+                        a.data.info = s[a.data.encrypt_table[c]](a.data.info, p)
+                    } else
+                        a.data.info = s[a.data.encrypt_table[c]](a.data.info)
+                }
+                if (e)
+                    return a.data.info;
+                var g = '';
+                for (c = 0; c < a.data.info.length; c++)
+                    g += String.fromCharCode(a.data.info[c]);
+                return g
+            }
+            function Uint8ArrayToString(fileData){
+              var dataString = '';
+              for (var i = 0; i < fileData.length; i++) {
+                dataString += Number(fileData[i]) + ',';
+              }
+              return dataString;
+            }
+            function decodeKey(resp){
+                var string = eval('('+resp+')');
+                //return btoa(String.fromCharCode.apply(null, new Uint8Array(n(string.data.info, 1))));
+                return Uint8ArrayToString(new Uint8Array(n(string.data.info, 1)));
+            }
+            function decodeM3u8(resp){
+                var string = eval('('+resp+')');
+                return n(string.data.info);
+            }
+            ";
+
+
+        public static string DecodeM3u8(string resp)
+        {
+            var context = new Context();
+            context.Eval(JS);
+            var concatFunction = context.GetVariable("decodeM3u8").As<Function>();
+            string m3u8 = concatFunction.Call(new Arguments { resp }).ToString();
+            return m3u8;
+        }
+
+        public static string DecodeKey(string resp)
+        {
+            var context = new Context();
+            context.Eval(JS);
+            var concatFunction = context.GetVariable("decodeKey").As<Function>();
+            string key = concatFunction.Call(new Arguments { resp }).ToString();
+            byte[] v = Array.ConvertAll(key.Trim(',').Split(','), s => (byte)int.Parse(s));
+            string realKey = Convert.ToBase64String(v);
+            return realKey;
+        }
+    }
+}

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/Decrypter.cs

@@ -1,16 +1,14 @@
-using System;
-using System.Collections.Generic;
+using CSChaCha20;
+using System;
 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)
+        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);
             //获取文件大小
@@ -19,36 +17,70 @@ namespace N_m3u8DL_CLI
             fs.Read(inBuff, 0, inBuff.Length);
             fs.Close();
 
-            Aes dcpt = Aes.Create("AES");
+            Aes dcpt = Aes.Create();
             dcpt.BlockSize = 128;
             dcpt.KeySize = 128;
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
-            dcpt.Mode = CipherMode.CBC;
-            dcpt.Padding = PaddingMode.PKCS7;
+            dcpt.Mode = mode;
+            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)
+        public static byte[] AES128Decrypt(byte[] encryptedBuff, byte[] keyByte, byte[] ivByte, CipherMode mode = CipherMode.CBC, PaddingMode padding = PaddingMode.PKCS7)
         {
             byte[] inBuff = encryptedBuff;
 
-            Aes dcpt = Aes.Create("AES");
+            Aes dcpt = Aes.Create();
             dcpt.BlockSize = 128;
             dcpt.KeySize = 128;
             dcpt.Key = keyByte;
             dcpt.IV = ivByte;
-            dcpt.Mode = CipherMode.CBC;
-            dcpt.Padding = PaddingMode.PKCS7;
+            dcpt.Mode = mode;
+            dcpt.Padding = padding;
 
             ICryptoTransform cTransform = dcpt.CreateDecryptor();
             Byte[] resultArray = cTransform.TransformFinalBlock(inBuff, 0, inBuff.Length);
             return resultArray;
         }
 
+        public static byte[] CHACHA20Decrypt(byte[] encryptedBuff, byte[] keyBytes, byte[] nonceBytes)
+        {
+            if (keyBytes.Length != 32)
+                throw new Exception("Key must be 32 bytes!");
+            if (nonceBytes.Length != 12 && nonceBytes.Length != 8)
+                throw new Exception("Key must be 12 or 8 bytes!");
+            if (nonceBytes.Length == 8)
+                nonceBytes = (new byte[4] { 0, 0, 0, 0 }).Concat(nonceBytes).ToArray();
+
+            var decStream = new MemoryStream();
+            using (BinaryReader reader = new BinaryReader(new MemoryStream(encryptedBuff)))
+            {
+                using (BinaryWriter writer = new BinaryWriter(decStream))
+                {
+                    while (true)
+                    {
+                        var buffer = reader.ReadBytes(1024);
+                        byte[] dec = new byte[buffer.Length];
+                        if (buffer.Length > 0)
+                        {
+                            ChaCha20 forDecrypting = new ChaCha20(keyBytes, nonceBytes, 0);
+                            forDecrypting.DecryptBytes(dec, buffer);
+                            writer.Write(dec, 0, dec.Length);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            return decStream.ToArray();
+        }
+
         public static byte[] HexStringToBytes(string hexStr)
         {
             if (string.IsNullOrEmpty(hexStr))
@@ -56,7 +88,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/Downloader.cs

@@ -47,6 +47,10 @@ namespace N_m3u8DL_CLI
         public long ExpectByte { get => expectByte; set => expectByte = value; }
         public long StartByte { get => startByte; set => startByte = value; }
         public double SegDur { get => segDur; set => segDur = value; }
+        
+        public static bool EnableChaCha20 { get; set; } = false;
+        public static string ChaCha20KeyBase64 { get; set; }
+        public static string ChaCha20NonceBase64 { get; set; }
 
         //重写WebClinet
         //private class WebClient : System.Net.WebClient
@@ -72,43 +76,55 @@ 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(
+                        byte[] decryptBuff = null;
+                        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(strings.recordLimitReached, LOGGER.Warning);
+                        LOGGER.WriteLine(strings.recordLimitReached);
+                        Environment.Exit(0); //正常退出
                     }
                     return;
                 }
@@ -167,9 +183,18 @@ namespace N_m3u8DL_CLI
                 if (File.Exists(savePath) && Global.ShouldStop == false) 
                 {
                     FileInfo fi = new FileInfo(savePath);
-                    if (Method == "NONE")
+                    if (File.Exists(fi.FullName) && EnableChaCha20)
                     {
-                        fi.MoveTo(Path.GetDirectoryName(savePath) + "\\" + Path.GetFileNameWithoutExtension(savePath) + ".ts");
+                        byte[] decryptBuff = Decrypter.CHACHA20Decrypt(File.ReadAllBytes(fi.FullName), Convert.FromBase64String(ChaCha20KeyBase64), Convert.FromBase64String(ChaCha20NonceBase64));
+                        FileStream fs = new FileStream(Path.GetDirectoryName(SavePath) + "\\" + Path.GetFileNameWithoutExtension(SavePath) + ".ts", FileMode.Create);
+                        fs.Write(decryptBuff, 0, decryptBuff.Length);
+                        fs.Close();
+                        DownloadManager.DownloadedSize += fi.Length;
+                        fi.Delete();
+                    }
+                    else if (Method == "NONE" || Method.Contains("NOTSUPPORTED"))
+                    {
+                        fi.MoveTo(Path.GetDirectoryName(SavePath) + "\\" + Path.GetFileNameWithoutExtension(SavePath) + ".ts");
                         DownloadManager.DownloadedSize += fi.Length;
                         //Console.WriteLine(Path.GetFileNameWithoutExtension(savePath) + " Completed.");
                     }
@@ -179,11 +204,24 @@ namespace N_m3u8DL_CLI
                         //解密
                         try
                         {
-                            byte[] decryptBuff = Decrypter.AES128Decrypt(
-                                fi.FullName,
-                                Convert.FromBase64String(Key),
-                                Decrypter.HexStringToBytes(Iv)
-                                );
+                            byte[] decryptBuff = null;
+                            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,20 +231,16 @@ namespace N_m3u8DL_CLI
                         }
                         catch (Exception ex)
                         {
+                            LOGGER.PrintLine(ex.Message, LOGGER.Error);
                             LOGGER.WriteLineError(ex.Message);
+                            Thread.Sleep(3000);
+                            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!");
-                        LOGGER.PrintLine("遇到了某些错误!", LOGGER.Error);
+                        LOGGER.WriteLineError(strings.SomethingWasWrong);
+                        LOGGER.PrintLine(strings.SomethingWasWrong, LOGGER.Error);
                         return;
                     }
                     return;
@@ -215,17 +249,17 @@ 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

@@ -10,19 +10,27 @@ 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()}")) 
+            {
+                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;
@@ -43,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 + "\" ";
@@ -76,8 +84,8 @@ namespace N_m3u8DL_CLI
 
             }
 
-            Run("ffmpeg", command, Path.GetDirectoryName(files[0]));
-            LOGGER.WriteLine("Result in [ffreport.log]");
+            Run(FFMPEG_PATH, command, Path.GetDirectoryName(files[0]));
+            LOGGER.WriteLine(strings.ffmpegDone);
             //Console.WriteLine(command);
         }
 
@@ -85,8 +93,8 @@ 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 \""
+                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));
                 if (File.Exists(Path.GetDirectoryName(file) + "\\" + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts"))
@@ -97,8 +105,8 @@ 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 \""
+                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));
                 if (File.Exists(Path.GetDirectoryName(file) + "\\" + Path.GetFileNameWithoutExtension(file) + "[MPEGTS].ts"))

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,10 @@ 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 = Math.Abs(TotalDuration - targetduration) * 1000;//设置定时器运行间隔
+            if (timer.Interval <= 1000) timer.Interval = 10000;
             JArray lastSegments = JArray.Parse(initJson["m3u8Info"]["segments"][0].ToString().Trim());  //上次的分段，用于比对新分段
             ArrayList tempList = new ArrayList();  //所有待下载的列表
             tempList.Clear();
@@ -74,8 +79,10 @@ namespace N_m3u8DL_CLI
             }
 
             Parser parser = new Parser();
+            parser.Headers = Headers;
             parser.DownDir = Path.GetDirectoryName(jsonFile);
             parser.M3u8Url = m3u8Url;
+            parser.LiveStream = true;
             parser.Parse();  //产生新的json文件
 
             jsonContent = File.ReadAllText(jsonFile);
@@ -89,6 +96,8 @@ namespace N_m3u8DL_CLI
                     //Console.WriteLine(seg.ToString());
                 }
             }
+            if (toDownList.Count > 0)
+                Record();
         }
 
         //public void TryDownload()
@@ -108,10 +117,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 +128,21 @@ 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;//超时时间不超过下次执行时间
+                if (sd.TimeOut <= 0) sd.TimeOut = (int)timer.Interval;
                 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/IqJsonParser.cs

@@ -0,0 +1,116 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace N_m3u8DL_CLI
+{
+    class IqJsonParser
+    {
+        public static string Parse(string downDir, string json)
+        {
+            JObject jObject = JObject.Parse(json);
+            var aClips = jObject["payload"]["wm_a"]["audio_track1"]["files"].Value<JArray>();
+            var vClips = jObject["payload"]["wm_a"]["video_track1"]["files"].Value<JArray>();
+
+            var codecsList = new List<string>();
+
+            var audioPath = "";
+            var videoPath = "";
+            var audioInitPath = "";
+            var videoInitPath = "";
+
+            if (aClips.Count > 0)
+            {
+                var init = jObject["payload"]["wm_a"]["audio_track1"]["codec_init"].Value<string>();
+                byte[] bytes = Convert.FromBase64String(init);
+                //输出init文件
+                audioInitPath = Path.Combine(downDir, "iqAudioInit.mp4");
+                File.WriteAllBytes(audioInitPath, bytes);
+                StringBuilder sb = new StringBuilder();
+                sb.AppendLine("#EXTM3U");
+                sb.AppendLine("#EXT-X-VERSION:3");
+                sb.AppendLine("#EXT-X-PLAYLIST-TYPE:VOD");
+                sb.AppendLine("#CREATED-BY:N_m3u8DL-CLI");
+                sb.AppendLine($"#EXT-CODEC:{jObject["payload"]["wm_a"]["audio_track1"]["codec"].Value<string>()}");
+                sb.AppendLine($"#EXT-KID:{jObject["payload"]["wm_a"]["audio_track1"]["key_id"].Value<string>()}");
+                sb.AppendLine($"#EXT-X-MAP:URI=\"{new Uri(Path.Combine(downDir + "(Audio)", "iqAudioInit.mp4")).ToString()}\"");
+                sb.AppendLine("#EXT-X-KEY:METHOD=PLZ-KEEP-RAW,URI=\"None\"");
+                foreach (var a in aClips)
+                {
+                    sb.AppendLine($"#EXTINF:{a["duration_second"].ToString()}");
+                    sb.AppendLine(a["file_name"].Value<string>());
+                }
+                sb.AppendLine("#EXT-X-ENDLIST");
+                //输出m3u8文件
+                var _path = Path.Combine(downDir, "iqAudio.m3u8");
+                File.WriteAllText(_path, sb.ToString());
+                audioPath = new Uri(_path).ToString();
+                codecsList.Add(jObject["payload"]["wm_a"]["audio_track1"]["codec"].Value<string>());
+            }
+
+            if (vClips.Count > 0)
+            {
+                var init = jObject["payload"]["wm_a"]["video_track1"]["codec_init"].Value<string>();
+                byte[] bytes = Convert.FromBase64String(init);
+                //输出init文件
+                videoInitPath = Path.Combine(downDir, "iqVideoInit.mp4");
+                File.WriteAllBytes(videoInitPath, bytes);
+                StringBuilder sb = new StringBuilder();
+                sb.AppendLine("#EXTM3U");
+                sb.AppendLine("#EXT-X-VERSION:3");
+                sb.AppendLine("#EXT-X-PLAYLIST-TYPE:VOD");
+                sb.AppendLine("#CREATED-BY:N_m3u8DL-CLI");
+                sb.AppendLine($"#EXT-CODEC:{jObject["payload"]["wm_a"]["video_track1"]["codec"].Value<string>()}");
+                sb.AppendLine($"#EXT-KID:{jObject["payload"]["wm_a"]["video_track1"]["key_id"].Value<string>()}");
+                sb.AppendLine($"#EXT-X-MAP:URI=\"{new Uri(videoInitPath).ToString()}\"");
+                sb.AppendLine("#EXT-X-KEY:METHOD=PLZ-KEEP-RAW,URI=\"None\"");
+                foreach (var a in vClips)
+                {
+                    var start = a["seekable"]["pos_start"].Value<long>();
+                    var size = a["size"].Value<long>();
+                    sb.AppendLine($"#EXTINF:{a["duration_second"].ToString()}");
+                    sb.AppendLine($"#EXT-X-BYTERANGE:{size}@{start}");
+                    sb.AppendLine(a["file_name"].Value<string>());
+                }
+                sb.AppendLine("#EXT-X-ENDLIST");
+                //输出m3u8文件
+                var _path = Path.Combine(downDir, "iqVideo.m3u8");
+                File.WriteAllText(_path, sb.ToString());
+                videoPath = new Uri(_path).ToString();
+                codecsList.Add(jObject["payload"]["wm_a"]["video_track1"]["codec"].Value<string>());
+            }
+
+            var content = "";
+            if ((videoPath == "" && audioPath != "") || Global.VIDEO_TYPE == "IGNORE")
+            {
+                return audioPath;
+            }
+            else if (audioPath == "" && videoPath != "")
+            {
+                return videoPath;
+            }
+            else
+            {
+                if (!Directory.Exists(downDir + "(Audio)"))
+                    Directory.CreateDirectory(downDir + "(Audio)");
+                var _path = Path.Combine(downDir + "(Audio)", "iqAudio.m3u8");
+                var _pathInit = Path.Combine(downDir + "(Audio)", "iqAudioInit.mp4");
+                File.Copy(new Uri(audioPath).LocalPath, _path, true);
+                File.Copy(new Uri(audioInitPath).LocalPath, _pathInit, true);
+                audioPath = new Uri(_path).ToString();
+                content = $"#EXTM3U\r\n" +
+                    $"#EXT-X-MEDIA:TYPE=AUDIO,URI=\"{audioPath}\",GROUP-ID=\"default-audio-group\",NAME=\"stream_0\",AUTOSELECT=YES,CHANNELS=\"0\"\r\n" +
+                    $"#EXT-X-STREAM-INF:BANDWIDTH=99999,CODECS=\"{string.Join(",", codecsList)}\",RESOLUTION=0x0,AUDIO=\"default-audio-group\"\r\n" +
+                    $"{videoPath}";
+            }
+
+            var _masterPath = Path.Combine(downDir, "master.m3u8");
+            File.WriteAllText(_masterPath, content);
+            return new Uri(_masterPath).ToString();
+        }
+    }
+}

N_m3u8DL-CLI/LOGGER.cs

@@ -11,8 +11,6 @@ namespace N_m3u8DL_CLI
 {
     class LOGGER
     {
-        public static int CursorIndex = 5;
-        public static int FFmpegCorsorIndex = 5;
         public const int Default = 1;
         public const int Error = 2;
         public const int Warning = 3;
@@ -36,8 +34,13 @@ namespace N_m3u8DL_CLI
         {
             if (!Directory.Exists(Path.GetDirectoryName(LOGFILE)))//若文件夹不存在则新建文件夹   
                 Directory.CreateDirectory(Path.GetDirectoryName(LOGFILE)); //新建文件夹
-            if (File.Exists(LOGFILE))//若文件存在则删除
-                File.Delete(LOGFILE);
+            //若文件存在则加序号
+            int index = 1;
+            var fileName = Path.GetFileNameWithoutExtension(LOGFILE);
+            while (File.Exists(LOGFILE))
+            {
+                LOGFILE = Path.Combine(Path.GetDirectoryName(LOGFILE), $"{fileName}-{index++}.log");
+            }
             string file = LOGFILE;
             string now = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
             string init = "LOG " + DateTime.Now.ToString("yyyy/MM/dd") + "\r\n"
@@ -57,35 +60,37 @@ namespace N_m3u8DL_CLI
         //读写锁机制，当资源被占用，其他线程等待
         static ReaderWriterLockSlim LogWriteLock = new ReaderWriterLockSlim();
 
-        public static void PrintLine(string text, int printLevel = 1, int cursorIndex = 0)
+        public static void PrintLine(string text, int printLevel = 1)
         {
+            int windowWith = 63;
             try
             {
-                if (cursorIndex == 0)
-                    Console.SetCursorPosition(0, CursorIndex++);
-                else
-                    Console.SetCursorPosition(0, cursorIndex);
+                windowWith = Console.WindowWidth;
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                ;
+               // empty
             }
             switch (printLevel)
             {
                 case 0:
+                    Console.Write("\r" + new string(' ', windowWith - 1) + "\r");
                     Console.WriteLine(" ".PadRight(12) + " " + text);
                     break;
                 case 1:
+                    Console.Write("\r" + new string(' ', windowWith - 1) + "\r");
                     Console.Write(DateTime.Now.ToString("HH:mm:ss.fff") + " ");
                     Console.WriteLine(text);
                     break;
                 case 2:
+                    Console.Write("\r" + new string(' ', windowWith - 1) + "\r");
                     Console.Write(DateTime.Now.ToString("HH:mm:ss.fff") + " ");
                     Console.ForegroundColor = ConsoleColor.Red;
                     Console.WriteLine(text);
                     Console.ResetColor();
                     break;
                 case 3:
+                    Console.Write("\r" + new string(' ', windowWith - 1) + "\r");
                     Console.Write(DateTime.Now.ToString("HH:mm:ss.fff") + " ");
                     Console.ForegroundColor = ConsoleColor.DarkYellow;
                     Console.WriteLine(text);
@@ -113,7 +118,7 @@ namespace N_m3u8DL_CLI
             }
             catch (Exception)
             {
-                
+
             }
             finally
             {
@@ -138,7 +143,7 @@ namespace N_m3u8DL_CLI
             }
             catch (Exception)
             {
-                
+
             }
             finally
             {
@@ -151,7 +156,7 @@ namespace N_m3u8DL_CLI
         {
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine(DateTime.Now.ToString("o") + "  " + text);
-            while (Console.ForegroundColor == ConsoleColor.Red) 
+            while (Console.ForegroundColor == ConsoleColor.Red)
                 Console.ResetColor();
         }
     }

N_m3u8DL-CLI/MyOptions.cs

@@ -0,0 +1,110 @@
+using CommandLine;
+using CommandLine.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace N_m3u8DL_CLI
+{
+    internal class MyOptions
+    {
+        [Value(0, Hidden = true, MetaName = "Input Source", HelpText = "Help_input", ResourceType = typeof(strings))]
+        public string Input { get; set; }
+
+        [Option("workDir", HelpText = "Help_workDir", ResourceType = typeof(strings))]
+        public string WorkDir { get; set; }
+
+        [Option("saveName", HelpText = "Help_saveName", ResourceType = typeof(strings))]
+        public string SaveName { get; set; } = "";
+
+        [Option("baseUrl", HelpText = "Help_baseUrl", ResourceType = typeof(strings))]
+        public string BaseUrl { get; set; }
+
+        [Option("headers", HelpText = "Help_headers", ResourceType = typeof(strings))]
+        public string Headers { get; set; } = "";
+
+        [Option("maxThreads", Default = 32U, HelpText = "Help_maxThreads", ResourceType = typeof(strings))]
+        public uint MaxThreads { get; set; }
+
+        [Option("minThreads", Default = 16U, HelpText = "Help_minThreads", ResourceType = typeof(strings))]
+        public uint MinThreads { get; set; }
+
+        [Option("retryCount", Default = 15U, HelpText = "Help_retryCount", ResourceType = typeof(strings))]
+        public uint RetryCount { get; set; }
+
+        [Option("timeOut", Default = 10U, HelpText = "Help_timeOut", ResourceType = typeof(strings))]
+        public uint TimeOut { get; set; }
+
+        [Option("muxSetJson", HelpText = "Help_muxSetJson", ResourceType = typeof(strings))]
+        public string MuxSetJson { get; set; }
+
+        [Option("useKeyFile", HelpText = "Help_useKeyFile", ResourceType = typeof(strings))]
+        public string UseKeyFile { get; set; }
+
+        [Option("useKeyBase64", HelpText = "Help_useKeyBase64", ResourceType = typeof(strings))]
+        public string UseKeyBase64 { get; set; }
+
+        [Option("useKeyIV", HelpText = "Help_useKeyIV", ResourceType = typeof(strings))]
+        public string UseKeyIV { get; set; }
+
+        [Option("downloadRange", HelpText = "Help_downloadRange", ResourceType = typeof(strings))]
+        public string DownloadRange { get; set; }
+
+        [Option("liveRecDur", HelpText = "Help_liveRecDur", ResourceType = typeof(strings))]
+        public string LiveRecDur { get; set; }
+
+        [Option("stopSpeed", HelpText = "Help_stopSpeed", ResourceType = typeof(strings))]
+        public long StopSpeed { get; set; } = 0L;
+
+        [Option("maxSpeed", HelpText = "Help_maxSpeed", ResourceType = typeof(strings))]
+        public long MaxSpeed { get; set; } = 0L;
+
+        [Option("proxyAddress", HelpText = "Help_proxyAddress", ResourceType = typeof(strings))]
+        public string ProxyAddress { get; set; }
+
+        [Option("enableDelAfterDone", HelpText = "Help_enableDelAfterDone", ResourceType = typeof(strings))]
+        public bool EnableDelAfterDone { get; set; }
+
+        [Option("enableMuxFastStart", HelpText = "Help_enableMuxFastStart", ResourceType = typeof(strings))]
+        public bool EnableMuxFastStart { get; set; }
+
+        [Option("enableBinaryMerge", HelpText = "Help_enableBinaryMerge", ResourceType = typeof(strings))]
+        public bool EnableBinaryMerge { get; set; }
+
+        [Option("enableParseOnly", HelpText = "Help_enableParseOnly", ResourceType = typeof(strings))]
+        public bool EnableParseOnly { get; set; }
+
+        [Option("enableAudioOnly", HelpText = "Help_enableAudioOnly", ResourceType = typeof(strings))]
+        public bool EnableAudioOnly { get; set; }
+
+        [Option("disableDateInfo", HelpText = "Help_disableDateInfo", ResourceType = typeof(strings))]
+        public bool DisableDateInfo { get; set; }
+
+        [Option("disableIntegrityCheck", HelpText = "Help_disableIntegrityCheck", ResourceType = typeof(strings))]
+        public bool DisableIntegrityCheck { get; set; }
+
+        [Option("noMerge", HelpText = "Help_noMerge", ResourceType = typeof(strings))]
+        public bool NoMerge { get; set; }
+
+        [Option("noProxy", HelpText = "Help_noProxy", ResourceType = typeof(strings))]
+        public bool NoProxy { get; set; }
+
+        [Option("registerUrlProtocol", HelpText = "Help_registerUrlProtocol", ResourceType = typeof(strings))]
+        public bool RegisterUrlProtocol { get; set; }
+
+        [Option("unregisterUrlProtocol", HelpText = "Help_unregisterUrlProtocol", ResourceType = typeof(strings))]
+        public bool UnregisterUrlProtocol { get; set; }
+
+        [Option("enableChaCha20", HelpText = "enableChaCha20")]
+        public bool EnableChaCha20 { get; set; }
+
+        [Option("chaCha20KeyBase64", HelpText = "ChaCha20KeyBase64")]
+        public string ChaCha20KeyBase64 { get; set; }
+
+        [Option("chaCha20NonceBase64", HelpText = "ChaCha20NonceBase64")]
+        public string ChaCha20NonceBase64 { get; set; }
+
+    }
+}

N_m3u8DL-CLI/N_m3u8DL-CLI.csproj

@@ -1,5 +1,7 @@
 <?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="..\packages\Resource.Embedder.2.1.1\build\Resource.Embedder.props" Condition="Exists('..\packages\Resource.Embedder.2.1.1\build\Resource.Embedder.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -38,46 +42,98 @@
     <ApplicationIcon>logo_3Iv_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BrotliSharpLib, Version=0.3.2.0, Culture=neutral, PublicKeyToken=3f4e2a1cd615fcb7, processorArchitecture=MSIL">
+      <HintPath>..\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll</HintPath>
+    </Reference>
+    <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll</HintPath>
+    </Reference>
+    <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.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.JScript" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\HDC上传助手\HDC上传助手\bin\Debug\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.7.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL">
+      <HintPath>..\packages\TaskScheduler.2.8.7\lib\net452\Microsoft.Win32.TaskScheduler.dll</HintPath>
+    </Reference>
+    <Reference Include="MihaZupan.HttpToSocks5Proxy, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HttpToSocks5Proxy.1.4.0\lib\net45\MihaZupan.HttpToSocks5Proxy.dll</HintPath>
+    </Reference>
+    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\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>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Collections" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.IO" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="UACHelper, Version=1.3.0.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UACHelper.1.3.0.5\lib\net40\UACHelper.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommandLineArgument.cs" />
-    <Compile Include="CommandLineArgumentParser.cs" />
+    <Compile Include="CSChaCha20.cs" />
+    <Compile Include="Decode51CtoKey.cs" />
+    <Compile Include="DecodeCdeledu.cs" />
+    <Compile Include="DecodeDdyun.cs" />
+    <Compile Include="DecodeHuke88Key.cs" />
+    <Compile Include="DecodeImooc.cs" />
     <Compile Include="Decrypter.cs" />
+    <Compile Include="DecodeNfmovies.cs" />
     <Compile Include="FFmpeg.cs" />
     <Compile Include="Global.cs" />
     <Compile Include="HLSLiveDownloader.cs" />
     <Compile Include="HLSTags.cs" />
+    <Compile Include="IqJsonParser.cs" />
     <Compile Include="LOGGER.cs" />
     <Compile Include="DownloadManager.cs" />
+    <Compile Include="MPDParser.cs" />
+    <Compile Include="MyOptions.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="ProgressReporter.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>
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bin\Debug\Newtonsoft.Json.dll" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="Scripting">
@@ -93,5 +149,31 @@
   <ItemGroup>
     <Content Include="logo_3Iv_icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="strings.en-US.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>strings.en-US.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="strings.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>strings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="strings.zh-TW.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>strings.zh-TW.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Resource.Embedder.2.1.1\build\Resource.Embedder.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.2.1.1\build\Resource.Embedder.props'))" />
+    <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>
+  <Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
 </Project>

N_m3u8DL-CLI/ProgressReporter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace N_m3u8DL_CLI
+{
+    class ProgressReporter
+    {
+        private static string speed = "";
+        private static string progress = "";
+
+        static object lockThis = new object();
+        public static void Report(string progress, string speed)
+        {
+            lock (lockThis)
+            {
+                int windowWith = 63;
+                try
+                {
+                    windowWith = Console.WindowWidth;
+                }
+                catch (Exception e)
+                {
+                    // empty
+                }
+                if (!string.IsNullOrEmpty(progress)) ProgressReporter.progress = progress;
+                if (!string.IsNullOrEmpty(speed)) ProgressReporter.speed = speed;
+                string now = DateTime.Now.ToString("HH:mm:ss.000");
+                var sub = windowWith - 4 - ProgressReporter.progress.Length - ProgressReporter.speed.Length - now.Length;
+                if (sub <= 0) sub = 0;
+                string print = now + " " + ProgressReporter.progress + " " + ProgressReporter.speed + new string(' ', sub);
+                Console.Write("\r" + print + "\r");
+                //Console.Write(print);
+            }
+        }
+    }
+}

N_m3u8DL-CLI/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("nilaoda")]
 [assembly: AssemblyProduct("N_m3u8DL-CLI")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.0.2.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]

N_m3u8DL-CLI/Watcher.cs

@@ -59,10 +59,12 @@ namespace N_m3u8DL_CLI
             //Console.Title = Now + "   /   " + Total;
             string downloadedSize = Global.FormatFileSize(DownloadManager.DownloadedSize);
             string estimatedSize = Global.FormatFileSize(DownloadManager.DownloadedSize * total / now);
+            int padding = downloadedSize.Length > estimatedSize.Length ? downloadedSize.Length : estimatedSize.Length;
+            DownloadManager.ToDoSize = (DownloadManager.DownloadedSize * total / now) - DownloadManager.DownloadedSize;
             string percent = (Convert.ToDouble(now) / Convert.ToDouble(total) * 100).ToString("0.00") + "%";
-            Console.SetCursorPosition(0, 2);
-            Console.Write(("Progress: " + Now + " of " + Total
-                + $" ({percent}/{downloadedSize}/{estimatedSize}/{Global.FormatTime(Convert.ToInt32(TotalDuration))})").PadRight(62));
+            var print = "Progress: " + Now + "/" + Total
+                + $" ({percent}) -- {downloadedSize.PadLeft(padding)}/{estimatedSize.PadRight(padding)}";
+            ProgressReporter.Report(print, "");
         }
 
         private void OnRenamed(object source, RenamedEventArgs e)
@@ -77,10 +79,12 @@ namespace N_m3u8DL_CLI
             //Console.Title = Now + "   /   " + Total;
             string downloadedSize = Global.FormatFileSize(DownloadManager.DownloadedSize);
             string estimatedSize = Global.FormatFileSize(DownloadManager.DownloadedSize * total / now);
+            int padding = downloadedSize.Length > estimatedSize.Length ? downloadedSize.Length : estimatedSize.Length;
+            DownloadManager.ToDoSize = (DownloadManager.DownloadedSize * total / now) - DownloadManager.DownloadedSize;
             string percent = (Convert.ToDouble(now) / Convert.ToDouble(total) * 100).ToString("0.00") + "%";
-            Console.SetCursorPosition(0, 2);
-            Console.Write(("Progress: " + Now + " of " + Total
-                + $" ({percent}/{downloadedSize}/{estimatedSize}/{Global.FormatTime(Convert.ToInt32(TotalDuration))})").PadRight(62));
+            var print = "Progress: " + Now + "/" + Total
+                + $" ({percent}) -- {downloadedSize.PadLeft(padding)}/{estimatedSize.PadRight(padding)}";
+            ProgressReporter.Report(print, "");
         }
 
         private void OnDeleted(object source, FileSystemEventArgs e)
@@ -95,10 +99,12 @@ namespace N_m3u8DL_CLI
             //Console.Title = Now + "   /   " + Total;
             string downloadedSize = Global.FormatFileSize(DownloadManager.DownloadedSize);
             string estimatedSize = Global.FormatFileSize(DownloadManager.DownloadedSize * total / now);
+            int padding = downloadedSize.Length > estimatedSize.Length ? downloadedSize.Length : estimatedSize.Length;
+            DownloadManager.ToDoSize = (DownloadManager.DownloadedSize * total / now) - DownloadManager.DownloadedSize;
             string percent = (Convert.ToDouble(now) / Convert.ToDouble(total) * 100).ToString("0.00") + "%";
-            Console.SetCursorPosition(0, 2);
-            Console.Write(("Progress: " + Now + " of " + Total
-                + $" ({percent}/{downloadedSize}/{estimatedSize}/{Global.FormatTime(Convert.ToInt32(TotalDuration))})").PadRight(62));
+            var print = "Progress: " + Now + "/" + Total
+                + $" ({percent}) -- {downloadedSize.PadLeft(padding)}/{estimatedSize.PadRight(padding)}";
+            ProgressReporter.Report(print, "");
         }
     }
 }

N_m3u8DL-CLI/packages.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BrotliSharpLib" version="0.3.3" targetFramework="net46" />
+  <package id="CommandLineParser" version="2.8.0" targetFramework="net46" />
+  <package id="Costura.Fody" version="4.1.0" targetFramework="net46" />
+  <package id="Fody" version="6.0.0" targetFramework="net46" developmentDependency="true" />
+  <package id="HttpToSocks5Proxy" version="1.4.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net46" />
+  <package id="NiL.JS" version="2.5.1428" targetFramework="net46" />
+  <package id="Resource.Embedder" version="2.1.1" targetFramework="net46" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
+  <package id="TaskScheduler" version="2.8.7" targetFramework="net46" />
+  <package id="UACHelper" version="1.3.0.5" targetFramework="net46" />
+</packages>