Mirrors/rip
2
0
Fork 0
mirror of https://github.com/nivekuil/rip synced 2024-11-26 13:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename histfile to record

Browse source
This commit is contained in:
Kevin Liu 2016-10-17 18:04:58 -07:00
parent a02bcf0edf
commit 953c6e0d97
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.org
View file

@ -11,7 +11,7 @@ If you want to put the graveyard somewhere else (like =~/.local/share/Trash=), y
2. Set the environment variable =$GRAVEYARD= to =~/.local/share/Trash=
This can be a good idea because if the graveyard is mounted on an in-memory filesystem, (as /tmp is in Arch Linux), deleting large files can quickly fill up your RAM. It's also much slower to move files across filesystems, although the delay should be minimal with an SSD.
A deletion log is kept in =.rip_history=, found in the top level of the graveyard.
A deletion log is kept in the =.record=, found in the top level of the graveyard.
** Installation
Get a binary [[https://github.com/nivekuil/rip/releases][release]] (x86_64) or build it with =cargo install rm-improved= (requires a nightly version of rustc).

36
src/main.rs
View file

@ -21,7 +21,7 @@ use std::os::unix::fs::DirBuilderExt;
use std::os::unix::fs::PermissionsExt;
static GRAVEYARD: &'static str = "/tmp/.graveyard";
static HISTFILE: &'static str = ".rip_history";
static RECORD: &'static str = ".record";
fn main() {
let matches = App::new("rip")
@ -73,18 +73,18 @@ Send files to the graveyard (/tmp/.graveyard) instead of unlinking them.")
return;
}
let histfile: &Path = &graveyard.join(HISTFILE);
let record: &Path = &graveyard.join(RECORD);
// Disable umask so rip can create a globally writable graveyard
unsafe {
libc::umask(0);
}
if matches.is_present("resurrect") {
if let Ok(s) = get_last_bury(histfile, graveyard) {
if let Ok(s) = get_last_bury(record, graveyard) {
let mut tokens = s.split("\t");
tokens.next().expect("Bad histfile format: column A");
let orig = tokens.next().expect("Bad histfile format: column B");
let grave = tokens.next().expect("Bad histfile format: column C");
tokens.next().expect("Bad record format: column A");
let orig = tokens.next().expect("Bad record format: column B");
let grave = tokens.next().expect("Bad record format: column C");
let dest: &Path = &{
if symlink_exists(orig) {
rename_grave(orig)
@ -94,8 +94,8 @@ Send files to the graveyard (/tmp/.graveyard) instead of unlinking them.")
};
if let Err(e) = bury(grave, dest) {
println!("ERROR: {}: {}", e, grave);
} else if let Err(e) = write_log(grave, dest, histfile) {
println!("Error adding {} to histfile: {}", grave, e);
} else if let Err(e) = write_log(grave, dest, record) {
println!("Error adding {} to record: {}", grave, e);
} else {
println!("Returned {} to {}", grave, dest.display());
}
@ -170,8 +170,8 @@ Send files to the graveyard (/tmp/.graveyard) instead of unlinking them.")
if let Err(e) = bury(path, dest) {
println!("ERROR: {}: {}", e, target);
} else if let Err(e) = write_log(path, dest, histfile) {
println!("Error adding {} to histfile: {}", target, e);
} else if let Err(e) = write_log(path, dest, record) {
println!("Error adding {} to record: {}", target, e);
}
}
} else {
@ -179,16 +179,16 @@ Send files to the graveyard (/tmp/.graveyard) instead of unlinking them.")
}
}
/// Write deletion history to histfile
fn write_log<S, D, H>(source: S, dest: D, histfile: H) -> io::Result<()>
where S: AsRef<Path>, D: AsRef<Path>, H: AsRef<Path> {
/// Write deletion history to record
fn write_log<S, D, R>(source: S, dest: D, record: R) -> io::Result<()>
where S: AsRef<Path>, D: AsRef<Path>, R: AsRef<Path> {
let (source, dest) = (source.as_ref(), dest.as_ref());
{
let mut f = try!(fs::OpenOptions::new()
.mode(0o666)
.create(true)
.append(true)
.open(histfile));
.open(record));
try!(f.write_all(
format!("{}\t{}\t{}\n",
get_user(),
@ -324,11 +324,11 @@ fn prompt_yes(prompt: &str) -> bool {
false
}
/// Return the line in histfile corresponding to the last buried file still in
/// Return the line in record corresponding to the last buried file still in
/// the graveyard
fn get_last_bury<H, G>(histfile: H, graveyard: G) -> io::Result<String>
where H: AsRef<Path>, G: AsRef<Path> {
match fs::File::open(histfile) {
fn get_last_bury<R, G>(record: R, graveyard: G) -> io::Result<String>
where R: AsRef<Path>, G: AsRef<Path> {
match fs::File::open(record) {
Ok(f) => {
let lines: Vec<String> = BufReader::new(f)
.lines()