Skip to content

Commit

Permalink
Do not use bold font for directory name
Browse files Browse the repository at this point in the history
  • Loading branch information
gblach committed Jan 13, 2023
1 parent 507aa0e commit 0ae6ad1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
17 changes: 13 additions & 4 deletions src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,23 @@ pub fn subindex_linkable(subindex: &mut SubIndex) -> SubIndex {
return linkindex;
}

pub fn make_links(linkindex: &SubIndex, args: &utils::Args) -> u64 {
pub fn make_links(linkindex: &SubIndex, directory: &Path, args: &utils::Args) -> u64 {
let mut saved_bytes = 0;

for i in 1 .. linkindex.len() {
if ! utils::already_linked(&linkindex[0].path, &linkindex[i].path) {
utils::make_link(&linkindex[0].path,
&linkindex[i].path, linkindex[0].size, args);
saved_bytes += linkindex[i].size;
utils::make_link(&linkindex[0].path, &linkindex[i].path, args);
saved_bytes += linkindex[0].size;

if ! args.quiet {
let src = linkindex[0].path.strip_prefix(directory).unwrap();
let dest = linkindex[1].path.strip_prefix(directory).unwrap();
println!("{}\x1b[0;1m{}\x1b[0m => \x1b[0;1m{}\x1b[0m [{}]",
directory.to_string_lossy(),
src.to_string_lossy(),
dest.to_string_lossy(),
utils::size_to_string(linkindex[0].size));
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ fn main() -> ExitCode {
while subindex.len() > 1 {
let linkindex = index::subindex_linkable(&mut subindex);
if linkindex.len() > 1 {
saved_bytes += index::make_links(&linkindex, &args);
saved_bytes +=
index::make_links(&linkindex, &directory, &args);
}
}
}
Expand Down
10 changes: 1 addition & 9 deletions src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@ pub fn size_to_string(size: u64) -> String {
}
}

fn print_feedback(src: &Path, dest: &Path, size: u64) {
println!("\x1b[0;1m{}\x1b[0m => \x1b[0;1m{}\x1b[0m [{}]",
src.to_string_lossy(), dest.to_string_lossy(), size_to_string(size));
}

pub fn already_linked(src: &Path, dest: &Path) -> bool {
let srcfile = fs::File::open(&src).unwrap();
let destfile = fs::File::open(&dest).unwrap();
Expand Down Expand Up @@ -115,15 +110,12 @@ fn make_hardlink(src: &Path, dest: &Path) {
fs::hard_link(src, dest).unwrap();
}

pub fn make_link(src: &Path, dest: &Path, size: u64, args: &Args) {
pub fn make_link(src: &Path, dest: &Path, args: &Args) {
if ! args.dryrun {
if ! args.hardlinks {
make_reflink(src, dest);
} else {
make_hardlink(src, dest)
}
}
if ! args.quiet {
print_feedback(src, dest, size);
}
}

0 comments on commit 0ae6ad1

Please sign in to comment.