async_zip::base::read::memを使う

VOICEVOX · Feb 14, 2024 · 7b6d1b8 · 7b6d1b8
1 parent ef5a344
commit 7b6d1b8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/test_util/Cargo.toml b/crates/test_util/Cargo.toml
@@ -3,7 +3,7 @@ name = "test_util"
 edition.workspace = true
 
 [dependencies]
-async_zip = { workspace = true, features = ["full"] }
+async_zip = { workspace = true, features = ["deflate"] }
 futures-lite.workspace = true
 once_cell.workspace = true
 serde = { workspace = true, features = ["derive"] }

diff --git a/crates/test_util/src/lib.rs b/crates/test_util/src/lib.rs
@@ -51,8 +51,7 @@ pub async fn convert_zip_vvm(dir: impl AsRef<Path>) -> PathBuf {
         fs::create_dir_all(out_file_path.parent().unwrap())
             .await
             .unwrap();
-        let out_file = File::create(&out_file_path).await.unwrap();
-        let mut writer = ZipFileWriter::with_tokio(out_file);
+        let mut writer = ZipFileWriter::new(vec![]);
 
         for entry in dir.read_dir().unwrap().flatten() {
             let entry_builder = ZipEntryBuilder::new(
@@ -66,7 +65,8 @@ pub async fn convert_zip_vvm(dir: impl AsRef<Path>) -> PathBuf {
             entry_writer.write_all(&buf).await.unwrap();
             entry_writer.close().await.unwrap();
         }
-        writer.close().await.unwrap();
+        let zip = writer.close().await.unwrap();
+        fs::write(&out_file_path, zip).await.unwrap();
     }
     out_file_path
 }
diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
@@ -10,7 +10,7 @@ directml = ["onnxruntime/directml"]
 
 [dependencies]
 anyhow.workspace = true
-async_zip = { workspace = true, features = ["full"] }
+async_zip = { workspace = true, features = ["deflate"] }
 camino.workspace = true
 derive-getters.workspace = true
 derive-new.workspace = true

diff --git a/crates/voicevox_core/src/voice_model.rs b/crates/voicevox_core/src/voice_model.rs
@@ -287,20 +287,24 @@ pub(crate) mod tokio {
     }
 
     #[derive(new)]
-    struct AsyncVvmEntryReader {
-        reader: async_zip::tokio::read::fs::ZipFileReader,
+    struct AsyncVvmEntryReader<'a> {
+        path: &'a Path,
+        reader: async_zip::base::read::mem::ZipFileReader,
         entry_map: HashMap<String, AsyncVvmEntry>,
     }
 
-    impl AsyncVvmEntryReader {
-        async fn open(path: &Path) -> LoadModelResult<Self> {
-            let reader = async_zip::tokio::read::fs::ZipFileReader::new(path)
-                .await
-                .map_err(|source| LoadModelError {
-                    path: path.to_owned(),
-                    context: LoadModelErrorKind::OpenZipFile,
-                    source: Some(source.into()),
-                })?;
+    impl<'a> AsyncVvmEntryReader<'a> {
+        async fn open(path: &'a Path) -> LoadModelResult<Self> {
+            let reader = async {
+                let file = fs_err::tokio::read(path).await?;
+                async_zip::base::read::mem::ZipFileReader::new(file).await
+            }
+            .await
+            .map_err(|source| LoadModelError {
+                path: path.to_owned(),
+                context: LoadModelErrorKind::OpenZipFile,
+                source: Some(source.into()),
+            })?;
             let entry_map: HashMap<_, _> = reader
                 .file()
                 .entries()
@@ -314,12 +318,12 @@ pub(crate) mod tokio {
                 .enumerate()
                 .map(|(i, (filename, entry))| (filename, AsyncVvmEntry { index: i, entry }))
                 .collect();
-            Ok(AsyncVvmEntryReader::new(reader, entry_map))
+            Ok(AsyncVvmEntryReader::new(path, reader, entry_map))
         }
         async fn read_vvm_json<T: DeserializeOwned>(&self, filename: &str) -> LoadModelResult<T> {
             let bytes = self.read_vvm_entry(filename).await?;
             serde_json::from_slice(&bytes).map_err(|source| LoadModelError {
-                path: self.reader.path().to_owned(),
+                path: self.path.to_owned(),
                 context: LoadModelErrorKind::ReadZipEntry {
                     filename: filename.to_owned(),
                 },
@@ -340,7 +344,7 @@ pub(crate) mod tokio {
             }
             .await
             .map_err(|source| LoadModelError {
-                path: self.reader.path().to_owned(),
+                path: self.path.to_owned(),
                 context: LoadModelErrorKind::ReadZipEntry {
                     filename: filename.to_owned(),
                 },