Apply new generator.

karaoke-dev · Sep 27, 2023 · 825847a · 825847a
1 parent 4af67c9
commit 825847a
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 1 deletion.
diff --git a/....Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs b/....Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs
@@ -197,7 +197,7 @@ public void TestAutoGenerateRomajiTagsWithNonSupportedLyric()
 
     #endregion
 
-    #region TimeTag
+    #region Time-tag
 
     [Test]
     public void TestAutoGenerateTimeTags()
@@ -241,6 +241,44 @@ public void TestAutoGenerateTimeTagsWithNonSupportedLyric()
 
     #endregion
 
+    #region Time-tag romaji
+
+    [Test]
+    public void TestAutoGenerateTimeTagRomaji()
+    {
+        PrepareHitObject(() => new Lyric
+        {
+            Text = "カラオケ",
+            Language = new CultureInfo(17),
+            TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { "[0,start]", "[3,end]" }),
+        });
+
+        TriggerHandlerChanged(c => c.AutoGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji));
+
+        AssertSelectedHitObject(h =>
+        {
+            Assert.AreEqual("karaoke", h.TimeTags[0].RomajiText);
+        });
+    }
+
+    [Test]
+    public void TestAutoGenerateTimeTagRomajiWithNonSupportedLyric()
+    {
+        PrepareHitObjects(() => new[]
+        {
+            new Lyric
+            {
+                Text = "カラオケ",
+                Language = new CultureInfo(17),
+                // with no time-tag.
+            },
+        });
+
+        TriggerHandlerChangedWithException<GeneratorNotSupportedException>(c => c.AutoGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji));
+    }
+
+    #endregion
+
     #region Note
 
     [Test]

diff --git a/...me.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs b/...me.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs
@@ -24,5 +24,7 @@ public enum AutoGenerateType
 
     AutoGenerateTimeTags,
 
+    AutoGenerateTimeTagRomaji,
+
     AutoGenerateNotes,
 }
diff --git a/...ame.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs b/...ame.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs
@@ -13,6 +13,7 @@
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.Language;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.Notes;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.ReferenceLyric;
+using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.Romajies;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.RomajiTags;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.RubyTags;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.Lyrics.TimeTags;
@@ -58,6 +59,10 @@ public bool CanGenerate(AutoGenerateType type)
                 var timeTagGenerator = getSelector<TimeTag[], TimeTagGeneratorConfig>();
                 return canGenerate(timeTagGenerator);
 
+            case AutoGenerateType.AutoGenerateTimeTagRomaji:
+                var timeTagRomajiGenerator = getSelector<IReadOnlyDictionary<TimeTag, RomajiGenerateResult>, RomajiGeneratorConfig>();
+                return canGenerate(timeTagRomajiGenerator);
+
             case AutoGenerateType.AutoGenerateNotes:
                 var noteGenerator = getGenerator<Note[], NoteGeneratorConfig>();
                 return canGenerate(noteGenerator);
@@ -99,6 +104,10 @@ public IDictionary<Lyric, LocalisableString> GetGeneratorNotSupportedLyrics(Auto
                 var timeTagGenerator = getSelector<TimeTag[], TimeTagGeneratorConfig>();
                 return getInvalidMessageFromGenerator(timeTagGenerator);
 
+            case AutoGenerateType.AutoGenerateTimeTagRomaji:
+                var timeTagRomajiGenerator = getSelector<IReadOnlyDictionary<TimeTag, RomajiGenerateResult>, RomajiGeneratorConfig>();
+                return getInvalidMessageFromGenerator(timeTagRomajiGenerator);
+
             case AutoGenerateType.AutoGenerateNotes:
                 var noteGenerator = getGenerator<Note[], NoteGeneratorConfig>();
                 return getInvalidMessageFromGenerator(noteGenerator);
@@ -178,6 +187,21 @@ public void AutoGenerate(AutoGenerateType type)
                 });
                 break;
 
+            case AutoGenerateType.AutoGenerateTimeTagRomaji:
+                var timeTagRomajiGenerator = getSelector<IReadOnlyDictionary<TimeTag, RomajiGenerateResult>, RomajiGeneratorConfig>();
+                PerformOnSelection(lyric =>
+                {
+                    var results = timeTagRomajiGenerator.Generate(lyric);
+
+                    foreach (var (key, value) in results)
+                    {
+                        var matchedTimeTag = lyric.TimeTags.Single(x => x == key);
+                        matchedTimeTag.InitialRomaji = value.InitialRomaji;
+                        matchedTimeTag.RomajiText = value.RomajiText;
+                    }
+                });
+                break;
+
             case AutoGenerateType.AutoGenerateNotes:
                 var noteGenerator = getGenerator<Note[], NoteGeneratorConfig>();
                 PerformOnSelection(lyric =>
@@ -207,6 +231,7 @@ protected override bool IsWritePropertyLocked(Lyric lyric) =>
             AutoGenerateType.AutoGenerateRubyTags => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.RubyTags)),
             AutoGenerateType.AutoGenerateRomajiTags => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.RomajiTags)),
             AutoGenerateType.AutoGenerateTimeTags => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)),
+            AutoGenerateType.AutoGenerateTimeTagRomaji => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)),
             AutoGenerateType.AutoGenerateNotes => HitObjectWritableUtils.IsCreateOrRemoveNoteLocked(lyric),
             _ => throw new ArgumentOutOfRangeException(),
         };