修BUG: 若skip-merge和save-dir同时使用,则save-dir不能生效

caiqingzhi2020 · caiqingzhi2020 · commit 97c17ddc72b4 · 2025-12-14T02:30:18.000Z
diff --git a/src/N_m3u8DL-RE/Program.cs b/src/N_m3u8DL-RE/Program.cs
@@ -1,4 +1,4 @@
-﻿using System.Globalization;
+using System.Globalization;
 using N_m3u8DL_RE.Parser.Config;
 using N_m3u8DL_RE.Common.Entity;
 using N_m3u8DL_RE.Common.Enum;
@@ -267,7 +267,8 @@ await RetryUtil.WebRequestRetryAsync(async () =>
         }
 
         // 生成文件夹
-        var tmpDir = Path.Combine(option.TmpDir ?? Environment.CurrentDirectory, $"{option.SaveName ?? DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}");
+        var baseDir = option.SaveDir ?? option.TmpDir ?? Environment.CurrentDirectory;
+        var tmpDir = Path.Combine(baseDir, $"{option.SaveName ?? DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}");
         // 记录文件
         if (option.WriteMetaJson)
         {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Globalization;`
	`1`	`+using System.Globalization;`
`2`	`2`	`using N_m3u8DL_RE.Parser.Config;`
`3`	`3`	`using N_m3u8DL_RE.Common.Entity;`
`4`	`4`	`using N_m3u8DL_RE.Common.Enum;`
`@@ -267,7 +267,8 @@ await RetryUtil.WebRequestRetryAsync(async () =>`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`// 生成文件夹`
`270`		`- var tmpDir = Path.Combine(option.TmpDir ?? Environment.CurrentDirectory, $"{option.SaveName ?? DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}");`
	`270`	`+ var baseDir = option.SaveDir ?? option.TmpDir ?? Environment.CurrentDirectory;`
	`271`	`+ var tmpDir = Path.Combine(baseDir, $"{option.SaveName ?? DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}");`
`271`	`272`	`// 记录文件`
`272`	`273`	`if (option.WriteMetaJson)`
`273`	`274`	`{`