refactor

ato-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ato-cli"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

ato/src/lib.rs

@@ -1,5 +1,29 @@
 use walkdir::WalkDir;
 use std::fs;
+use std::path;
+
+pub fn _hash(r: &str, p: &path::Path, e: &str) -> Result<(), Box<dyn std::error::Error>>{
+ let _dir = p.with_file_name("");
+ let _num = _dir.file_name().unwrap().to_str().unwrap();
+ let _in = p.with_file_name(format!("{}_{}_{}", _num, "total", e));
+ let _up = p.with_file_name(format!("{}_{}_{}", _num, "up", e));
+ let _low = p.with_file_name(format!("{}_{}_{}", _num, "low", e));
+ if _in.is_file() && _up.is_file() && _low.is_file() {
+ let contents = fs::read(&_in).expect("Unable to read the file");
+ let digest = md5::compute(&contents);
+ let md5_dir = format!("{}/{:x}", r, digest);
+
+ let _ = fs::create_dir_all(&md5_dir)?;
+ let _ = fs::copy(_in, format!("{}/in.stl", &md5_dir))?;
+ let _ = fs::copy(_up, format!("{}/up.stl", &md5_dir))?;
+ let _ = fs::copy(_low, format!("{}/low.stl", &md5_dir))?;
+ let _ = fs::copy(p, format!("{}/gt.stl", &md5_dir))?;
+ }
+ else {
+ println!("{:#?}", p);
+ }
+ Ok(())
+}
 
 pub fn process(_pth: &str, _e:&str) -> Result<(), Box<dyn std::error::Error>> {
  let _root = format!("{}_sha", _pth.to_owned());
@@ -8,25 +32,7 @@ pub fn process(_pth: &str, _e:&str) -> Result<(), Box<dyn std::error::Error>> {
  for entry in WalkDir::new(_pth).into_iter().filter_map(|e| e.ok()) {
  let pth = entry.path();
  if pth.display().to_string().contains("gt") {
- let _dir = pth.with_file_name("");
- let _num = _dir.file_name().unwrap().to_str().unwrap();
- let _in = pth.with_file_name(format!("{}_{}_{}", _num, "total", _e));
- let _up = pth.with_file_name(format!("{}_{}_{}", _num, "up", _e));
- let _low = pth.with_file_name(format!("{}_{}_{}", _num, "low", _e));
- if _in.is_file() && _up.is_file() && _low.is_file() {
- let contents = fs::read(&_in).expect("Unable to read the file");
- let digest = md5::compute(&contents);
- let md5_dir = format!("{}/{:x}", _root, digest);
- let _ = fs::create_dir_all(&md5_dir)?;
- let _ = fs::copy(_in, format!("{}/in.stl", &md5_dir))?;
- let _ = fs::copy(_up, format!("{}/up.stl", &md5_dir))?;
- let _ = fs::copy(_low, format!("{}/low.stl", &md5_dir))?;
- let _ = fs::copy(pth, format!("{}/gt.stl", &md5_dir))?;
- }
- else {
- println!("{:#?}", pth);
- }
-
+ let _ = _hash(&_root, pth, _e);
  }
  }
  Ok(())