Merge branch 'develop'

Harlan-H · Dec 21, 2024 · b7dff47 · b7dff47
2 parents 1e8f9de + d3dcd68
commit b7dff47
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -82,6 +82,7 @@ jobs:
       - name: Create release
         uses: softprops/action-gh-release@v1
         with:
+          tag_name: ${{ github.event.inputs.tags }}
           body: |
             ${{ steps.get_desc.outputs.release_body }}
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+# 3.14.7 (2024/12/21)
+ - 修复当使用接口下载时最终视频文件不在对应目录的bug
+ - 修复接口中路劲使用"/"导致最终程序打开文件错误的问题
+
 # 3.14.6 (2024/12/18)
  - .net6官方停止维护故升级.net9
  - 设置中增加关闭声音按钮

diff --git a/M3u8Downloader_H.Combiners/M3uCombinerClient.cs b/M3u8Downloader_H.Combiners/M3uCombinerClient.cs
@@ -90,6 +90,7 @@ protected async ValueTask ConverterToMp4(string m3u8FilePath, bool allowed_exten
                      .Add("-bsf:a").Add("aac_adtstoasc");
 
             var tmpOutputFile = Path.ChangeExtension(DownloadParams.VideoFullName, Settings.SelectedFormat);
+            Log?.Info("开始转码:%s", tmpOutputFile);
             DownloadParams.ChangeVideoNameDelegate(tmpOutputFile);
             arguments
                 .Add("-nostdin")

diff --git a/M3u8Downloader_H.Core/DownloadClient.cs b/M3u8Downloader_H.Core/DownloadClient.cs
@@ -30,6 +30,7 @@ public class DownloadClient(HttpClient httpClient, Uri url, IEnumerable<KeyValue
         private M3uDownloaderClient? m3UDownloaderClient;
         private M3uCombinerClient? m3UCombinerClient;
         private IM3u8UriManager? m3U8UriManager;
+        private bool _theFirstTime = true;
 
         public string M3uContent { get; set; } = default!;
         public M3UFileInfo M3u8FileInfo { get; set; } = default!;
@@ -100,9 +101,17 @@ public async Task GetM3u8Uri(CancellationToken cancellationToken)
 
         public async Task GetM3U8FileInfo(CancellationToken cancellationToken)
         {
-            if (M3u8FileInfo is not null)
+            if (!_theFirstTime) 
                 return;
 
+            if (M3u8FileInfo is not null )
+            {
+                _log.Info("获取视频流{0}个", M3u8FileInfo.MediaFiles.Count);
+                DownloadParams.VideoFullName = DownloadParams.VideoFullPath + (M3u8FileInfo.Map is not null ? Path.GetExtension(M3u8FileInfo.Map?.Title) : ".ts");
+                _theFirstTime = false;
+                return;
+            }
+
 
             if (_url.IsFile)
             {
@@ -118,6 +127,7 @@ public async Task GetM3U8FileInfo(CancellationToken cancellationToken)
                 M3u8FileInfo.Key = M3UKeyInfo;
 
             DownloadParams.VideoFullName = DownloadParams.VideoFullPath + (M3u8FileInfo.Map is not null ? Path.GetExtension(M3u8FileInfo.Map?.Title) : ".ts");
+            _theFirstTime = false;
         }
     }
 }
diff --git a/M3u8Downloader_H/M3u8Downloader_H.csproj b/M3u8Downloader_H/M3u8Downloader_H.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net9.0-windows7.0</TargetFramework>
     <RootNamespace>M3u8Downloader_H</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>3.14.6.0</AssemblyVersion>
-    <Version>3.14.6.0</Version>
+    <AssemblyVersion>3.14.7.0</AssemblyVersion>
+    <Version>3.14.7.0</Version>
     <PackageId>m3u8视频下载器</PackageId>
     <Product>m3u8视频下载器</Product>
     <ApplicationIcon>icon.ico</ApplicationIcon>

diff --git a/M3u8Downloader_H/Views/MainWindowView.xaml b/M3u8Downloader_H/Views/MainWindowView.xaml
@@ -257,7 +257,7 @@
                             <Run  FontWeight="Bold"  Text="以管理员身份运行" />
                             <Run Text="本程序" />
                             <LineBreak />
-                            <Run Text="RestApi仅限安装过.net6运行库的版本使用,SingleFile版本可能不支持" />
+                            <Run Text="RestApi仅限安装过.net9运行库的版本使用,SingleFile版本可能不支持" />
                             <LineBreak />
                             <Run Text="详细的RestApi使用方法，请看帮助文档" />
                             <Run FontWeight="SemiBold" Text="Rest Api" />
@@ -289,7 +289,7 @@
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <MenuItem Header="复制错误信息" cal:Message.Attach="CopyFailReason($DataContext)"/>
-                                <MenuItem Header="复制所有日志" cal:Message.Attach="CopyLogs($DataContext)"/>
+                                <MenuItem Header="复制日志" cal:Message.Attach="CopyLogs($DataContext)"/>
                                 <Separator />
                                 <MenuItem Header="停止下载所有选择项" cal:Message.Attach="StopDownloads" >
                                     <MenuItem.Icon>

diff --git a/M3u8Downloader_h.RestServer/HttpListenService.cs b/M3u8Downloader_h.RestServer/HttpListenService.cs
@@ -53,6 +53,8 @@ private void DownloadByUrl(HttpListenerRequest request, HttpListenerResponse res
                 }
 
                 requestWithURI.Validate();
+                if (!string.IsNullOrWhiteSpace(requestWithURI.SavePath))
+                    requestWithURI.SavePath = requestWithURI.SavePath.Replace('/', Path.DirectorySeparatorChar);
                 DownloadByUrlAction(requestWithURI.Url, requestWithURI.VideoName, requestWithURI.Method, requestWithURI.Key, requestWithURI.Iv, requestWithURI.SavePath, requestWithURI.PluginKey, requestWithURI.Headers);
 
                 response.Json(Response.Success());
@@ -89,6 +91,8 @@ private void DownloadByContent(HttpListenerRequest request, HttpListenerResponse
 
 
                 requestWithContent.Validate();
+                if(!string.IsNullOrWhiteSpace(requestWithContent.SavePath))
+                    requestWithContent.SavePath = requestWithContent.SavePath.Replace('/', Path.DirectorySeparatorChar);
                 DownloadByM3uFileInfoAction(m3UFileInfo,  requestWithContent.VideoName, requestWithContent.SavePath, requestWithContent.PluginKey, requestWithContent.Headers);
 
                 response.Json(Response.Success());
@@ -111,9 +115,11 @@ private void DownloadByJsonContent(HttpListenerRequest request, HttpListenerResp
                     response.Json(Response.Error("序列化失败"));
                     return;
                 }
-               
+
                 requestWithM3U8FileInfo.Validate();
                 requestWithM3U8FileInfo.M3u8FileInfo.PlaylistType = "VOD";
+                if (!string.IsNullOrWhiteSpace(requestWithM3U8FileInfo.SavePath))
+                    requestWithM3U8FileInfo.SavePath = requestWithM3U8FileInfo.SavePath.Replace('/', Path.DirectorySeparatorChar);
                 DownloadByM3uFileInfoAction(requestWithM3U8FileInfo.M3u8FileInfo, requestWithM3U8FileInfo.VideoName, requestWithM3U8FileInfo.SavePath, requestWithM3U8FileInfo.PluginKey, requestWithM3U8FileInfo.Headers);
 
                 response.Json(Response.Success());