get_all_models must collect vvm extension files

VOICEVOX · Aug 10, 2023 · cb211f0 · cb211f0
1 parent af59568
commit cb211f0
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/crates/voicevox_core/src/voice_model.rs b/crates/voicevox_core/src/voice_model.rs
@@ -111,17 +111,16 @@ impl VoiceModel {
         };
 
         let mut vvm_paths = Vec::new();
-        for entry in root_dir.read_dir().map_err(|e| Error::LoadModel {
-            path: root_dir.clone(),
-            source: e.into(),
-        })? {
-            match entry {
-                Ok(entry) => vvm_paths.push(Self::from_path(entry.path())),
-                Err(e) => Err(Error::LoadModel {
-                    path: root_dir.clone(),
-                    source: e.into(),
-                })?,
-            }
+        for entry in root_dir
+            .read_dir()
+            .map_err(|e| Error::LoadModel {
+                path: root_dir.clone(),
+                source: e.into(),
+            })?
+            .filter_map(|v| v.ok())
+            .filter(|entry| entry.path().extension().map_or(false, |ext| ext == "vvm"))
+        {
+            vvm_paths.push(Self::from_path(entry.path()));
         }
 
         join_all(vvm_paths).await.into_iter().collect()