fixed canonical paths

Cargo.lock

@@ -555,7 +555,7 @@ dependencies = [
 
 [[package]]
 name = "rmdupe"
-version = "1.1.1"
+version = "1.2.1"
 dependencies = [
  "chrono",
  "futures",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rmdupe"
-version = "1.1.1"
+version = "1.2.1"
 authors = ["Avril <flanchan@cumallover.me>"]
 edition = "2018"
 

src/arg.rs

@@ -20,6 +20,7 @@ pub fn program() -> &'static str
 pub fn usage() -> !
 {
     println!("Usage: {} [OPTIONS] [--] <dirs...>", program());
+    println!("Usage: {} --rebase [<files>]", program());
     println!("Usage: {} --help", program());
     println!("OPTIONS:");
     println!("  --load -l:\t\tLoad the hashes from `load-file` if possible.");
@@ -39,6 +40,7 @@ pub fn usage() -> !
     println!("  --\t\t\tStop reading args");
     println!("Other:");
     println!("  --help -h:\t\tPrint this message");
+    println!("  --rebase:\t\tRebuild hash stores created by `--save`. If no files are provided, use default.");
     #[cfg(feature="threads")]
     println!("Compiled with threading support");
     std::process::exit(1)
@@ -97,6 +99,28 @@ pub enum Output
 {
     Normal(config::Config),
     Help,
+    Rebase(config::Rebase),
+}
+
+/// Arg parse for rebase
+fn parse_rebase<I>(args: I) -> Result<config::Rebase, Error>
+where I: IntoIterator<Item=String>
+{
+    let mut files = Vec::new();
+
+    for file in args.into_iter().map(|path| validate_path(path, Ensure::File, true))
+    {
+	files.push(file?);
+    }
+
+    if files.len() < 1 {
+	files.push(validate_path(config::DEFAULT_HASHNAME.to_string(), Ensure::File, false)?.to_owned());
+    }
+
+    Ok(config::Rebase{
+	save: files.clone(), //TODO: Seperate save+loads
+	load: files,
+    })
 }
 
 /// Try to parse args
@@ -139,6 +163,7 @@ where I: IntoIterator<Item=String>
 	if reading && arg.chars().next().unwrap_or('\0') == '-' {
 	    match &arg[..] {
 		"--help" => return Ok(Output::Help),
+		"--rebase" => return Ok(Output::Rebase(parse_rebase(args)?)),
 		
 		"--" => reading = false,
 		

src/config.rs

@@ -65,3 +65,12 @@ pub struct Config
     /// Load hashes from
     pub load: Vec<String>,
 }
+
+#[derive(Debug)]
+pub struct Rebase
+{
+    /// Load from here
+    pub load: Vec<String>,
+    /// Rebase to here
+    pub save: Vec<String>,
+}

src/container.rs

@@ -62,6 +62,41 @@ impl DupeMap
 	self.iteration.iter()
     }
 
+    /// Forcefully update the cache
+    pub fn cache_force(&mut self, id: impl AsRef<Path>, hash: hash::Sha256Hash, trans: bool)
+    {
+	if let Some((h,t)) = self.table.get_mut(id.as_ref()) {
+	    *h = hash;
+	    *t = trans;
+	} else {
+	    self.table.insert(id.as_ref().to_owned(), (hash,true));
+	}
+    }
+
+    /// Remove from the cache if it exists
+    pub fn uncache(&mut self, id: impl AsRef<Path>) -> Option<(hash::Sha256Hash, bool)>
+    {
+	self.table.remove(id.as_ref())
+    }
+
+    /// The amount of cached items (inc. transient ones)
+    pub fn cache_len(&self) -> usize
+    {
+	self.table.len()
+    }
+
+    /// Iterate through the cache
+    pub fn cache_iter(&self) -> std::collections::hash_map::Iter<PathBuf, (hash::Sha256Hash, bool)>
+    {
+	self.table.iter()
+    }
+
+    /// Iterate through the cache
+    pub fn cache_iter_mut(&mut self) -> std::collections::hash_map::IterMut<PathBuf, (hash::Sha256Hash, bool)>
+    {
+	self.table.iter_mut()
+    }
+    
     /// Cache this path's hash
     ///
     /// # Returns

src/main.rs

@@ -72,11 +72,143 @@ mod test {
     }
 }
 
-fn parse_args() -> Result<config::Config, error::Error>
+
+#[inline]
+fn absolute(path: impl AsRef<std::path::Path>) -> std::path::PathBuf
+{
+    std::fs::canonicalize(path).expect("Invalid path internal")
+}
+
+#[cfg(feature="threads")]
+async fn rebase_one_async(path: impl AsRef<std::path::Path>, hash: hash::Sha256Hash) -> Result<Option<(std::path::PathBuf, hash::Sha256Hash)>, error::Error>
+{
+    use std::{
+	convert::TryInto,
+    };
+    use tokio::{
+	fs::{
+	    OpenOptions,
+	},
+    };
+    let path = path.as_ref();
+    let mut file = OpenOptions::new()
+	.read(true)
+	.open(path).await?;
+    let sz: usize = file.metadata().await?.len().try_into().or(Err(error::Error::Arch(Some("Filesize is too large to be known. you have likely compiled the binary for 32-bit architecture or less. This shouldn't happen on 64-bit systems."))))?;
+    let mut result = hash::Sha256Hash::default();
+    error::check_size(sz, hash::compute_async(&mut file, &mut result).await?)?;
+
+    println!("Computed {:?}", path);
+    if hash != result {
+	Ok(Some((path.to_owned(), result)))
+    } else {
+	Ok(None)
+    }
+}
+
+#[cfg(feature="threads")]
+async fn rebase(config: config::Rebase) -> Result<(), Box<dyn std::error::Error>>
+{
+    use std::{
+	path::{
+	    Path,
+	},
+    };
+    use tokio::{
+	fs::{
+	    OpenOptions,
+	},
+    };
+    let mut hashes = container::DupeMap::new();
+    for (transient, load) in config.load.iter().map(|x| (false, x)).chain(config.save.iter().map(|x| (true, x)))
+    {
+	let load = Path::new(load);
+	if load.exists() {
+	    if load.is_file() {
+		if let Ok(mut file) = OpenOptions::new()
+		    .read(true)
+		    .open(load).await
+		{
+		    match hashes.load_async(&mut file, transient).await {
+			Err(e) if !transient=> return Err(format!("Failed to load required {:?}: {}", file, e))?,
+			_ => (),
+		    };
+		}
+	    }
+	}
+    }
+
+    let mut remove = Vec::new();
+    let mut children = Vec::with_capacity(hashes.cache_len());
+    for (path, (hash, trans)) in hashes.cache_iter()
+    {
+	if !trans { //Don't rebuild transient ones, this is desired I think? Maybe not... Dunno.
+	    if path.exists() && path.is_file() {
+		//Getting hash
+		let path = path.clone();
+		let hash = *hash;
+		children.push(tokio::task::spawn(async move {
+		    rebase_one_async(path, hash).await
+		}));
+	    } else {
+		remove.push(path.clone());
+	    }
+	}
+    }
+
+    let (mut changed, mut removed) = (0usize, 0usize);
+    for child in children.into_iter()
+    {
+	if let Some((path, hash)) = child.await.expect("Child panic")?
+	{
+	    println!("Updating {:?} -> {}", path, hash);
+	    hashes.cache_force(path, hash, false);
+	    changed +=1;
+	}
+    }
+    for remove in remove.into_iter()
+    {
+	println!("Removing {:?}", remove);
+	hashes.uncache(remove);
+	removed +=1;
+    }
+
+    println!("Updated. {} changed, {} removed.", changed, removed);
+    
+    for save in config.save.iter()
+    {
+	let save = Path::new(save);
+	let mut file = match OpenOptions::new()
+	    .create(true)
+	    .truncate(true)
+	    .write(true)
+	    .open(&save).await {
+		Ok(v) => v,
+		Err(e) => {println!("Warning: Failed to open output {:?}, ignoring: {}", save, e); continue;},
+	    };
+	
+	match hashes.save_async(&mut file).await {
+	    Err(e) => println!("Warning: Failed to write to output {:?}: ignoring: {}", file, e),
+	    _ => (),
+	};
+	
+    }
+
+    Ok(())
+}
+
+#[cfg(not(feature="threads"))]
+fn rebase(config: config::Rebase) -> Result<(), Box<dyn std::error::Error>>
+{
+    todo!()
+}
+
+
+fn parse_args() -> Result<arg::Output, error::Error>
 {
     match arg::parse_args()? {
-	arg::Output::Normal(conf) => Ok(conf),
+	arg::Output::Help => arg::usage(),
-	_ => arg::usage(),
+	conf => Ok(conf),
     }
 }
 
@@ -96,7 +228,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>>
 	path::Path,
 	sync::Arc,
     };
-    let args = parse_args().into_string()?;
+    
+    match parse_args().into_string()? {
+	arg::Output::Rebase(r) => {
+	    return rebase(r).await;
+	},
+	arg::Output::Normal(args) => {
 	    let lmode = &args.mode.logging_mode;
 
 	    log!(Debug, lmode => "Args parsed: {:?}", args);
@@ -135,7 +272,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>>
 		if path.is_dir() {
 		    log!(Debug, lmode => "Spawning for {:?}", path);
 		    let mode = args.mode.clone();
-	    let path = path.to_owned();
+		    let path = absolute(&path);
 		    let hashes= Arc::clone(&hashes);
 		    children.push(tokio::task::spawn(async move {
 			log!(Debug, mode.logging_mode => " + {:?}", path);
@@ -170,6 +307,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>>
 		    args.mode.error_mode.handle(hashes.save_async(&mut file).await).log_and_forget(lmode, log::Level::Warning)?;
 		}
 	    }
+	},
+	_ => unreachable!(),
+    };
     
     Ok(())
 }