スタイルもソートする

VOICEVOX · Jan 21, 2024 · 2b41763 · 2b41763
1 parent 7d0aa00
commit 2b41763
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/crates/voicevox_core/src/metas.rs b/crates/voicevox_core/src/metas.rs
@@ -19,8 +19,14 @@ pub fn merge<'a>(metas: impl IntoIterator<Item = &'a SpeakerMeta>) -> Vec<Speake
             )
         })
         .into_values()
-        .sorted_by_key(|SpeakerMeta { styles, .. }| {
-            styles.iter().map(|&StyleMeta { id, .. }| id).min()
+        .map(|mut speaker| {
+            speaker
+                .styles
+                .sort_unstable_by_key(|&StyleMeta { id, .. }| id);
+            speaker
+        })
+        .sorted_unstable_by_key(|SpeakerMeta { styles, .. }| {
+            styles.first().map(|&StyleMeta { id, .. }| id)
         })
         .collect()
 }