merge versioning, fix bug todo

ecstore/src/utils/hasher.rs

@@ -0,0 +1,45 @@
+use sha2::{
+    digest::{Reset, Update},
+    Digest, Sha256 as sha_sha256,
+};
+trait Hasher {
+    fn write(&mut self, bytes: &[u8]);
+    fn reset(&mut self);
+    fn sum(&mut self) -> impl AsRef<[u8]>;
+    fn size(&self) -> usize;
+    fn block_size(&self) -> usize;
+}
+
+struct Sha256 {
+    hasher: sha_sha256,
+}
+
+impl Sha256 {
+    pub fn new() -> Self {
+        Self {
+            hasher: sha_sha256::new(),
+        }
+    }
+}
+
+impl Hasher for Sha256 {
+    fn write(&mut self, bytes: &[u8]) {
+        Update::update(&mut self.hasher, bytes);
+    }
+
+    fn reset(&mut self) {
+        Reset::reset(&mut self.hasher);
+    }
+
+    fn sum(&mut self) -> impl AsRef<[u8]> {
+        self.hasher.clone().finalize()
+    }
+
+    fn size(&self) -> usize {
+        32
+    }
+
+    fn block_size(&self) -> usize {
+        64
+    }
+}

ecstore/src/utils/mod.rs

@@ -2,7 +2,8 @@ pub mod crypto;
 pub mod ellipses;
 pub mod fs;
 pub mod hash;
+pub mod hasher;
 pub mod net;
-pub mod path;
 pub mod os;
+pub mod path;
 pub mod wildcard;

ecstore/src/utils/os/linux.rs

@@ -109,4 +109,4 @@ pub fn same_disk(disk1: &str, disk2: &str) -> Result<bool> {
     let stat2 = stat(disk2)?;
 
     Ok(stat1.st_dev == stat2.st_dev)
-}
+}

ecstore/src/utils/os/mod.rs

@@ -6,9 +6,10 @@ mod unix;
 mod windows;
 
 #[cfg(target_os = "linux")]
-pub use linux::get_info;
-pub use linux::same_disk;
+pub use linux::{get_info, same_disk};
+// pub use linux::same_disk;
+
 #[cfg(all(unix, not(target_os = "linux")))]
-pub use unix::get_info;
+pub use unix::{get_info, same_disk};
 #[cfg(target_os = "windows")]
-pub use windows::get_info;
+pub use windows::{get_info, same_disk};

ecstore/src/utils/os/unix.rs

@@ -1,5 +1,5 @@
-use crate::disk::Info;
-use nix::sys::{statfs::statfs, stat::stat};
+use crate::{disk::Info, error::Result};
+use nix::sys::{stat::stat, statfs::statfs};
 use std::io::{Error, ErrorKind};
 use std::path::Path;
 
@@ -74,4 +74,4 @@ pub fn same_disk(disk1: &str, disk2: &str) -> Result<bool> {
     let stat2 = stat(disk2)?;
 
     Ok(stat1.st_dev == stat2.st_dev)
-}
+}

ecstore/src/utils/os/windows.rs

@@ -1,4 +1,4 @@
-use crate::disk::Info;
+use crate::{disk::Info, error::Result};
 use std::io::{Error, ErrorKind, Result};
 use std::mem;
 use std::os::windows::ffi::OsStrExt;
@@ -133,4 +133,4 @@ fn get_fs_type(p: &[WCHAR]) -> Result<String> {
 
 pub fn same_disk(disk1: &str, disk2: &str) -> Result<bool> {
     Ok(false)
-}
+}

ecstore/src/utils/path.rs

@@ -4,6 +4,8 @@ const GLOBAL_DIR_SUFFIX: &str = "__XLDIR__";
 
 pub const SLASH_SEPARATOR: &str = "/";
 
+pub const GLOBAL_DIR_SUFFIX_WITH_SLASH: &str = "__XLDIR__/";
+
 pub fn has_suffix(s: &str, suffix: &str) -> bool {
     if cfg!(target_os = "windows") {
         s.to_lowercase().ends_with(&suffix.to_lowercase())
@@ -20,6 +22,11 @@ pub fn encode_dir_object(object: &str) -> String {
     }
 }
 
+pub fn is_dir_object(object: &str) -> bool {
+    let obj = encode_dir_object(object);
+    obj.ends_with(GLOBAL_DIR_SUFFIX)
+}
+
 #[allow(dead_code)]
 pub fn decode_dir_object(object: &str) -> String {
     if has_suffix(object, GLOBAL_DIR_SUFFIX) {
@@ -54,7 +61,7 @@ pub fn has_profix(s: &str, prefix: &str) -> bool {
 
 pub fn path_join(elem: &[PathBuf]) -> PathBuf {
     let mut joined_path = PathBuf::new();
-    
+
     for path in elem {
         joined_path.push(path);
     }

ecstore/src/utils/stat_linux.rs

@@ -0,0 +1,84 @@
+use nix::sys::{
+    stat::{major, minor, stat},
+    statfs::{statfs, FsType},
+};
+
+use crate::{
+    disk::Info,
+    error::{Error, Result},
+};
+
+use lazy_static::lazy_static;
+use std::collections::HashMap;
+
+lazy_static! {
+    static ref FS_TYPE_TO_STRING_MAP: HashMap<&'static str, &'static str> = {
+        let mut m = HashMap::new();
+        m.insert("1021994", "TMPFS");
+        m.insert("137d", "EXT");
+        m.insert("4244", "HFS");
+        m.insert("4d44", "MSDOS");
+        m.insert("52654973", "REISERFS");
+        m.insert("5346544e", "NTFS");
+        m.insert("58465342", "XFS");
+        m.insert("61756673", "AUFS");
+        m.insert("6969", "NFS");
+        m.insert("ef51", "EXT2OLD");
+        m.insert("ef53", "EXT4");
+        m.insert("f15f", "ecryptfs");
+        m.insert("794c7630", "overlayfs");
+        m.insert("2fc12fc1", "zfs");
+        m.insert("ff534d42", "cifs");
+        m.insert("53464846", "wslfs");
+        m
+    };
+}
+
+fn get_fs_type(ftype: FsType) -> String {
+    let binding = format!("{:?}", ftype);
+    let fs_type_hex = binding.as_str();
+    match FS_TYPE_TO_STRING_MAP.get(fs_type_hex) {
+        Some(fs_type_string) => fs_type_string.to_string(),
+        None => "UNKNOWN".to_string(),
+    }
+}
+
+pub fn get_info(path: &str, first_time: bool) -> Result<Info> {
+    let statfs = statfs(path)?;
+    let reserved_blocks = statfs.blocks_free() - statfs.blocks_available();
+    let mut info = Info {
+        total: statfs.block_size() as u64 * (statfs.blocks() - reserved_blocks),
+        free: statfs.blocks() as u64 * statfs.blocks_available(),
+        files: statfs.files(),
+        ffree: statfs.files_free(),
+        fstype: get_fs_type(statfs.filesystem_type()),
+        ..Default::default()
+    };
+
+    let stat = stat(path)?;
+    let dev_id = stat.st_dev as u64;
+    info.major = major(dev_id);
+    info.minor = minor(dev_id);
+
+    if info.free > info.total {
+        return Err(Error::from_string(format!(
+            "detected free space {} > total drive space {}, fs corruption at {}. please run 'fsck'",
+            info.free, info.total, path
+        )));
+    }
+
+    info.used = info.total - info.free;
+
+    if first_time {
+        // todo
+    }
+
+    Ok(info)
+}
+
+pub fn same_disk(disk1: &str, disk2: &str) -> Result<bool> {
+    let stat1 = stat(disk1)?;
+    let stat2 = stat(disk2)?;
+
+    Ok(stat1.st_dev == stat2.st_dev)
+}