handle invalid oto lines the right way

stakira · Dec 2, 2023 · ad0bc4f · ad0bc4f
1 parent d5eff8d
commit ad0bc4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/OpenUtau.Core/Classic/VoicebankLoader.cs b/OpenUtau.Core/Classic/VoicebankLoader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -341,10 +341,6 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
                 };
                 while (!reader.EndOfStream) {
                     var line = reader.ReadLine().Trim();
-                    if (string.IsNullOrWhiteSpace(line) ) {
-                        trace.lineNumber++;
-                        continue;
-                    }
                     trace.line = line;
                     try {
                         Oto oto = ParseOto(line, trace);
@@ -366,7 +362,7 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
 
         static void AddAliasForMissingFiles(OtoSet otoSet) {
             // Use filename as alias if not in oto.
-            var knownFiles = otoSet.Otos.Select(oto => oto.Wav).ToHashSet();
+            var knownFiles = otoSet.Otos.Where(oto => oto.IsValid).Select(oto => oto.Wav).ToHashSet();
             var dir = Path.GetDirectoryName(otoSet.File);
             foreach (var wav in Directory.EnumerateFiles(dir, "*.wav", SearchOption.TopDirectoryOnly)) {
                 var file = Path.GetFileName(wav);
@@ -383,7 +379,7 @@ static void AddAliasForMissingFiles(OtoSet otoSet) {
         }
 
         static void CheckWavExist(OtoSet otoSet) {
-            var wavGroups = otoSet.Otos.GroupBy(oto => oto.Wav);
+            var wavGroups = otoSet.Otos.Where(oto => oto.IsValid).GroupBy(oto => oto.Wav);
             foreach (var group in wavGroups) {
                 string path = Path.Combine(Path.GetDirectoryName(otoSet.File), group.Key);
                 if (!File.Exists(path)) {

diff --git a/OpenUtau.Test/Classic/VoicebankLoaderTest.cs b/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
@@ -30,6 +30,7 @@ public void OtoSetRoundTrip() {
 a.wav=a R,500,,,,
 !@#$!@#$
 aoieu.wav=- a,,,,,
+
 aoieu.wav=a o,,,,,
 aoieu.wav=o i,,,,,
 aoieu.wav=i e,,100,150,,