Merge pull request #1171 from maiko3tattun/240609_FixWavtool

Fix wavtool not working when full path contains 2 byte characters
stakira · Jun 9, 2024 · fd8c501 · fd8c501
2 parents f9324c7 + 0c529c4
commit fd8c501
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/OpenUtau.Core/Classic/ExeWavtool.cs b/OpenUtau.Core/Classic/ExeWavtool.cs
@@ -16,10 +16,12 @@ class ExeWavtool : IWavtool {
         readonly StringBuilder sb = new StringBuilder();
         readonly string filePath;
         readonly string name;
+        private Encoding osEncoding;
 
         public ExeWavtool(string filePath, string basePath) {
             this.filePath = filePath;
             name = Path.GetRelativePath(basePath, filePath);
+            osEncoding = OS.IsWindows() ? Encoding.GetEncoding(0) : Encoding.UTF8;
         }
 
         public float[] Concatenate(List<ResamplerItem> resamplerItems, string tempPath, CancellationTokenSource cancellation) {
@@ -39,7 +41,7 @@ public float[] Concatenate(List<ResamplerItem> resamplerItems, string tempPath,
             string batPath = Path.Combine(PathManager.Inst.CachePath, "temp.bat");
             lock (tempBatLock) {
                 using (var stream = File.Open(batPath, FileMode.Create)) {
-                    using (var writer = new StreamWriter(stream, new UTF8Encoding(false))) {
+                    using (var writer = new StreamWriter(stream, osEncoding)) {
                         WriteSetUp(writer, resamplerItems, tempPath);
                         for (var i = 0; i < resamplerItems.Count; i++) {
                             WriteItem(writer, resamplerItems[i], i, resamplerItems.Count);
@@ -62,7 +64,7 @@ void PrepareHelper() {
             lock (Renderers.GetCacheLock(tempHelper)) {
                 if (!File.Exists(tempHelper)) {
                     using (var stream = File.Open(tempHelper, FileMode.Create)) {
-                        using (var writer = new StreamWriter(stream, new UTF8Encoding(false))) {
+                        using (var writer = new StreamWriter(stream, osEncoding)) {
                             WriteHelper(writer);
                         }
                     }