diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 0a4da2f..e88ebba 100644 --- 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 index b6680e7..d6eb787 100644 --- 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 index df9794d..38e9326 100644 --- 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 index ef62fbc..59ad610 100644 --- a/M3u8Downloader_H.Core/DownloadClient.cs +++ b/M3u8Downloader_H.Core/DownloadClient.cs @@ -30,6 +30,7 @@ public class DownloadClient(HttpClient httpClient, Uri url, IEnumerablenet9.0-windows7.0 M3u8Downloader_H AnyCPU;x64 - 3.14.6.0 - 3.14.6.0 + 3.14.7.0 + 3.14.7.0 m3u8视频下载器 m3u8视频下载器 icon.ico diff --git a/M3u8Downloader_H/Views/MainWindowView.xaml b/M3u8Downloader_H/Views/MainWindowView.xaml index 0b3fe33..4285fa3 100644 --- a/M3u8Downloader_H/Views/MainWindowView.xaml +++ b/M3u8Downloader_H/Views/MainWindowView.xaml @@ -257,7 +257,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/M3u8Downloader_h.RestServer/HttpListenService.cs b/M3u8Downloader_h.RestServer/HttpListenService.cs index 6c7666d..d72b407 100644 --- 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());