Actually rename the crate folder

soulsmods · Mar 11, 2024 · 694b244 · 694b244
1 parent 7919e8c
commit 694b244
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ members = [
     "crates/formats",
     "crates/cli",
     "crates/viewer",
-    "crates/vfs",
+    "crates/dvdbnd",
 ]
 
 [workspace.package]
@@ -48,7 +48,7 @@ ptr_cast_constness = "warn"
 
 [workspace.dependencies]
 fstools_formats = { path = "crates/formats", version = "0.1.0" }
-fstools_dvdbnd = { path = "crates/vfs", version = "0.1.0" }
+fstools_dvdbnd = { path = "crates/dvdbnd", version = "0.1.0" }
 memmap2 = "0.7"
 rayon = "1"
 thiserror = "1"
diff --git a/benches/vfs.rs b/benches/vfs.rs
@@ -18,7 +18,7 @@ pub fn vfs_open_benchmark(c: &mut Criterion) {
                 er_path.join("sd/sd"),
             ];
 
-            let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create vfs");
+            let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create dvdbnd");
 
             black_box(vfs)
         })

diff --git a/crates/cli/src/bin/bdt-extract.rs b/crates/cli/src/bin/bdt-extract.rs
@@ -30,7 +30,7 @@ fn main() -> Result<(), std::io::Error> {
         er_path.join("sd/sd"),
     ];
 
-    let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create vfs");
+    let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create dvdbnd");
 
     let dictionary = std::fs::read_to_string(args.dictionary)?;
     let lines = dictionary
@@ -53,7 +53,7 @@ fn main() -> Result<(), std::io::Error> {
                     let mut buffer = Vec::new();
                     entry
                         .read_to_end(&mut buffer)
-                        .expect("Could not read from vfs to file buffer");
+                        .expect("Could not read from dvdbnd to file buffer");
 
                     let output_path = std::path::PathBuf::from(format!("./extract/{}", path));
                     let directory = output_path.parent().unwrap();

diff --git a/crates/cli/src/bin/matbin-test.rs b/crates/cli/src/bin/matbin-test.rs
@@ -25,7 +25,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         er_path.join("sd/sd"),
     ];
 
-    let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create vfs");
+    let vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create dvdbnd");
     let matbinbnd = vfs.open("/material/allmaterial.matbinbnd.dcx").unwrap();
 
     let (_, mut decoder) = DcxHeader::read(matbinbnd)?;

diff --git a/crates/vfs/.gitignore → crates/dvdbnd/.gitignore b/crates/vfs/.gitignore → crates/dvdbnd/.gitignore
diff --git a/crates/vfs/Cargo.toml → crates/dvdbnd/Cargo.toml b/crates/vfs/Cargo.toml → crates/dvdbnd/Cargo.toml
diff --git a/crates/vfs/src/bnd.rs → crates/dvdbnd/src/bnd.rs b/crates/vfs/src/bnd.rs → crates/dvdbnd/src/bnd.rs
@@ -20,10 +20,10 @@ pub struct BndMountHost {
 
 #[derive(Debug, Error)]
 pub enum BndMountError {
-    #[error("Could not get vfs file reader: {0}")]
+    #[error("Could not get dvdbnd file reader: {0}")]
     VfsOpen(#[from] DvdBndEntryError),
 
-    #[error("Could not get copy bnd4 bytes from vfs reader: {0}")]
+    #[error("Could not get copy bnd4 bytes from dvdbnd reader: {0}")]
     DataCopy(io::Error),
 
     #[error("Could not parse Dcx: {0}")]

diff --git a/crates/vfs/src/key_provider.rs → crates/dvdbnd/src/key_provider.rs b/crates/vfs/src/key_provider.rs → crates/dvdbnd/src/key_provider.rs
diff --git a/crates/vfs/src/lib.rs → crates/dvdbnd/src/lib.rs b/crates/vfs/src/lib.rs → crates/dvdbnd/src/lib.rs
diff --git a/crates/vfs/src/name.rs → crates/dvdbnd/src/name.rs b/crates/vfs/src/name.rs → crates/dvdbnd/src/name.rs
diff --git a/crates/vfs/src/reader.rs → crates/dvdbnd/src/reader.rs b/crates/vfs/src/reader.rs → crates/dvdbnd/src/reader.rs
diff --git a/crates/viewer/src/main.rs b/crates/viewer/src/main.rs
@@ -26,7 +26,7 @@ fn main() {
         er_path.join("sd/sd"),
     ];
 
-    let mut vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create vfs");
+    let mut vfs = DvdBnd::create(archives.clone(), &keys).expect("unable to create dvdbnd");
 
     vfs.mount("/parts/wp_a_0210.partsbnd.dcx")
         .expect("Could not mount bnd");

diff --git a/tests/dcx.rs b/tests/dcx.rs
@@ -18,7 +18,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         er_path.join("sd/sd"),
     ];
 
-    let vfs = Arc::new(DvdBnd::create(archives.clone(), &keys).expect("unable to create vfs"));
+    let vfs = Arc::new(DvdBnd::create(archives.clone(), &keys).expect("unable to create dvdbnd"));
 
     let dictionary = include_str!("data/EldenRingDictionary.txt");
     let lines = dictionary