fix ResourceId imports in crates

Signed-off-by: Tarek <[email protected]>
ARK-Builders · May 12, 2024 · 36b4282 · 36b4282
1 parent 6135ff5
commit 36b4282
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/data-link/src/lib.rs b/data-link/src/lib.rs
@@ -1,5 +1,5 @@
 use data_error::Result;
-use data_resource::{Resource, ResourceId, ResourceIdTrait};
+use data_resource::{ResourceId, ResourceIdTrait};
 use fs_atomic_versions::atomic::AtomicFile;
 use fs_metadata::store_metadata;
 use fs_properties::load_raw_properties;
@@ -36,7 +36,7 @@ impl Link {
     }
 
     pub fn id(&self) -> Result<ResourceId> {
-        Resource::from_bytes(self.url.as_str().as_bytes())
+        ResourceId::from_bytes(self.url.as_str().as_bytes())
     }
 
     fn load_user_data<P: AsRef<Path>>(
@@ -60,7 +60,7 @@ impl Link {
     pub fn load<P: AsRef<Path>>(root: P, filename: P) -> Result<Self> {
         let p = root.as_ref().join(filename);
         let url = Self::load_url(p)?;
-        let id = Resource::from_bytes(url.as_str().as_bytes())?;
+        let id = ResourceId::from_bytes(url.as_str().as_bytes())?;
         // Load user properties first
         let user_prop = Self::load_user_data(&root, &id)?;
         let mut description = user_prop.desc;
@@ -319,7 +319,7 @@ async fn test_create_link_file() {
         assert_eq!(link.prop.desc.unwrap(), "test_desc");
         assert_eq!(link.prop.title, "test_title");
 
-        let id = Resource::from_bytes(current_bytes.as_bytes()).unwrap();
+        let id = ResourceId::from_bytes(current_bytes.as_bytes()).unwrap();
         let path = Path::new(&root)
             .join(ARK_FOLDER)
             .join(PREVIEWS_STORAGE_FOLDER)

diff --git a/fs-index/Cargo.toml b/fs-index/Cargo.toml
@@ -15,9 +15,7 @@ fs-storage = { path = "../fs-storage" }
 
 # For now, we are explicitly using the non-cryptographic CRC-32 hash
 # The developer is responsible for specifying consistent hash function in other crates
-data-resource = { path = "../data-resource", features = [
-    "hash_blake3",
-] }
+data-resource = { path = "../data-resource", features = ["hash_crc32"] }
 
 log = { version = "0.4.17", features = ["release_max_level_off"] }
 walkdir = "2.3.2"

diff --git a/fs-index/src/index.rs b/fs-index/src/index.rs
@@ -13,13 +13,7 @@ use walkdir::{DirEntry, WalkDir};
 use log;
 
 use crate::{ArklibError, Result, ARK_FOLDER, INDEX_PATH};
-use data_resource;
-
-//todo: this is not the way to go:
-#[cfg(feature = "hash_blake3")]
-use data_resource::blake3::ResourceId as ResourceId;
-#[cfg(not(feature = "hash_blake3"))]
-use data_resource::crc32::ResourceId as ResourceId;
+use data_resource::{ResourceId, ResourceIdTrait};
 
 #[derive(Eq, Ord, PartialEq, PartialOrd, Hash, Clone, Debug)]
 pub struct IndexEntry {
@@ -631,7 +625,7 @@ fn scan_entry(path: &CanonicalPath, metadata: Metadata) -> Result<IndexEntry> {
         ))?;
     }
 
-    let id = data_resource::ResourceId::from_path(path)?;
+    let id = ResourceId::from_path(path)?;
     let modified = metadata.modified()?;
 
     Ok(IndexEntry { id, modified })