fix #665 #661

N_m3u8DL-CLI/Global.cs

@@ -35,7 +35,7 @@ namespace N_m3u8DL_CLI
         /*===============================================================================*/
         static Version ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
         static string nowVer = $"{ver.Major}.{ver.Minor}.{ver.Build}";
-        static string nowDate = "20220524";
+        static string nowDate = "20220526";
         public static void WriteInit()
         {
             Console.WriteLine($"N_m3u8DL-CLI version {nowVer} 2018-2022");

N_m3u8DL-CLI/Program.cs

@@ -77,8 +77,12 @@ namespace N_m3u8DL_CLI.NetCore
             {
                 if (args[0].ToLower().StartsWith("m3u8dl:"))
                 {
-                    var valueBytes = Convert.FromBase64String(args[0].Substring(7));
+                    var base64 = args[0].Replace("m3u8dl://", "").Replace("m3u8dl:", "");
-                    var cmd = Encoding.UTF8.GetString(valueBytes);
+                    var cmd = "";
+                    try { cmd = Encoding.UTF8.GetString(Convert.FromBase64String(base64)); }
+                    catch (FormatException) { cmd = Encoding.UTF8.GetString(Convert.FromBase64String(base64.TrimEnd('/'))); }
+                    //修正工作目录
+                    Environment.CurrentDirectory = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
                     args = Global.ParseArguments(cmd).ToArray();  //解析命令行
                 }
                 else if (args[0] == "--registerUrlProtocol")

N_m3u8DL-CLI/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]

README.md

@@ -102,17 +102,17 @@ OPTIONS:
 
 URI格式：
 ```
-m3u8dl:<base64编码的客户端命令行文本>
+m3u8dl://<base64编码的客户端命令行文本>
 ```
 
 URI示例：
 ```
-m3u8dl:Imh0dHBzOi8vZXhhbXBsZS5jb20vYWJjLm0zdTgiIC0td29ya0RpciAiJVVTRVJQUk9GSUxFJVxEb3dubG9hZHNcbTN1OGRsIiAtLXNhdmVOYW1lICJhYmMiIC0tZW5hYmxlRGVsQWZ0ZXJEb25lIC0tZGlzYWJsZURhdGVJbmZvIC0tbm9Qcm94eQ==
+m3u8dl://Imh0dHBzOi8vZXhhbXBsZS5jb20vYWJjLm0zdTgiIC0td29ya0RpciAiJVVTRVJQUk9GSUxFJVxEb3dubG9hZHNcbTN1OGRsIiAtLXNhdmVOYW1lICJhYmMiIC0tZW5hYmxlRGVsQWZ0ZXJEb25lIC0tZGlzYWJsZURhdGVJbmZvIC0tbm9Qcm94eQ==
 ```
 
 URI解码结果：
 ```
-m3u8dl:"https://example.com/abc.m3u8" --workDir "%USERPROFILE%\Downloads\m3u8dl" --saveName "abc" --enableDelAfterDone --disableDateInfo --noProxy
+"https://example.com/abc.m3u8" --workDir "%USERPROFILE%\Downloads\m3u8dl" --saveName "abc" --enableDelAfterDone --disableDateInfo --noProxy
 ```
 
 # 用户文档

README_ENG.md

@@ -81,17 +81,17 @@ New commandline options：
 
 URI Format：
 ```
-m3u8dl:<base64 encoded params>
+m3u8dl://<base64 encoded params>
 ```
 
 URI Example：
 ```
-m3u8dl:Imh0dHBzOi8vZXhhbXBsZS5jb20vYWJjLm0zdTgiIC0td29ya0RpciAiJVVTRVJQUk9GSUxFJVxEb3dubG9hZHNcbTN1OGRsIiAtLXNhdmVOYW1lICJhYmMiIC0tZW5hYmxlRGVsQWZ0ZXJEb25lIC0tZGlzYWJsZURhdGVJbmZvIC0tbm9Qcm94eQ==
+m3u8dl://Imh0dHBzOi8vZXhhbXBsZS5jb20vYWJjLm0zdTgiIC0td29ya0RpciAiJVVTRVJQUk9GSUxFJVxEb3dubG9hZHNcbTN1OGRsIiAtLXNhdmVOYW1lICJhYmMiIC0tZW5hYmxlRGVsQWZ0ZXJEb25lIC0tZGlzYWJsZURhdGVJbmZvIC0tbm9Qcm94eQ==
 ```
 
 URI Decode Result：
 ```
-m3u8dl:"https://example.com/abc.m3u8" --workDir "%USERPROFILE%\Downloads\m3u8dl" --saveName "abc" --enableDelAfterDone --disableDateInfo --noProxy
+"https://example.com/abc.m3u8" --workDir "%USERPROFILE%\Downloads\m3u8dl" --saveName "abc" --enableDelAfterDone --disableDateInfo --noProxy
 ```
 
 ## Document