dupemerge: add --progress option

diff --git a/faster-dupemerge b/faster-dupemerge
index be6e29bc678bd78aec0d92fef00f030e8d829ef3..f1413b47e10a7d60364c14d532efdcdb049a76f0 100755 (executable)
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -87,6 +87,7 @@ my $collapse_timestamp = 0;
 my $collapse_zero = 0;
 my $skip_compares = 0;
 my $skip_hashes = 0;
+my $progress = 0;
 my $verbose = 0;
 my $debug = 0;
 my $dry_run = 0;
@@ -102,6 +103,7 @@ sub digest {
        if ($skip_hashes) {
                return "SKIPPING HASHES";
        } else {
+               print STDERR 'H' if $progress;
                my $digest = &really_digest($filename);
                $hash_bytes += -s $filename;
                $hash_files++;
@@ -172,6 +174,8 @@ while ($#ARGV >= 0) {
                $skip_compares = 1;
        } elsif ($arg eq '--skip-hash') {
                $skip_hashes = 1;
+       } elsif ($arg eq '--progress') {
+               $progress = 1;
        } elsif ($arg eq '--verbose') {
                $verbose = 1;
        } elsif ($arg eq '--lock-rm') {
@@ -269,6 +273,7 @@ sub link_files {
 
        my $quoted_from = tick_quote($from);
        my $quoted_to = tick_quote($to);
+       print STDERR "\n" if $progress;
        print STDERR "ln -f $quoted_from $quoted_to\n";
 
        return if $dry_run;
@@ -279,10 +284,13 @@ sub link_files {
        $inode_base =~ s:^.*/::os;
        my $tmp_to = File::Temp::tempnam($inode_dir, ".$inode_base.");
        print STDERR "\tlink: $from -> $tmp_to\n" if $debug;
+       print STDERR 'L' if $progress;
        link($from, $tmp_to) or die "link: $from -> $tmp_to: $!";
        print STDERR "\trename: $tmp_to -> $to\n" if $debug;
+       print STDERR 'R' if $progress;
        unless (rename($tmp_to, $to)) {
                my $saved_bang = $!;
+               print STDERR 'U' if $progress;
                unlink($tmp_to) or warn "unlink: $tmp_to: $!";  # Try, possibly in vain, to clean up
                die "rename: $tmp_to -> $from: $saved_bang";
        }
@@ -358,6 +366,7 @@ link_start:
 incumbent_file:
 
                                        foreach my $incumbent_file (@incumbent_names) {
+                                               print STDERR 'S' if $progress;
                                                my ($incumbent_dev,$incumbent_ino,$incumbent_mode,$incumbent_nlink,$incumbent_uid,$incumbent_gid,$incumbent_rdev,$incumbent_size,$incumbent_atime,$incumbent_mtime,$incumbent_ctime,$incumbent_blksize,$incumbent_blocks) = lstat($incumbent_file);
                                                print STDERR "\t\tINCUMBENT dev=$incumbent_dev ino=$incumbent_ino mode=$incumbent_mode nlink=$incumbent_nlink uid=$incumbent_uid gid=$incumbent_gid rdev=$incumbent_rdev size=$incumbent_size atime=$incumbent_atime mtime=$incumbent_mtime ctime=$incumbent_ctime blksize=$incumbent_blksize blocks=$incumbent_blocks _=$incumbent_file\n" if $debug;
 
@@ -378,6 +387,7 @@ incumbent_file:
 candidate_file:
 
                                                foreach my $candidate_file (@candidate_names) {
+                                                       print STDERR 's' if $progress;
                                                        my ($candidate_dev,$candidate_ino,$candidate_mode,$candidate_nlink,$candidate_uid,$candidate_gid,$candidate_rdev,$candidate_size,$candidate_atime,$candidate_mtime,$candidate_ctime,$candidate_blksize,$candidate_blocks) = lstat($candidate_file);
                                                        print STDERR "\t\t\tCANDIDATE dev=$candidate_dev ino=$candidate_ino mode=$candidate_mode nlink=$candidate_nlink uid=$candidate_uid gid=$candidate_gid rdev=$candidate_rdev size=$candidate_size atime=$candidate_atime mtime=$candidate_mtime ctime=$candidate_ctime blksize=$candidate_blksize blocks=$candidate_blocks _=$candidate_file\n" if $debug;
 
@@ -409,6 +419,7 @@ candidate_file:
                                                                        my $quoted_incumbent_file = tick_quote($incumbent_file);
                                                                        my $quoted_candidate_file = tick_quote($candidate_file);
                                                                        print STDERR "cmp $quoted_incumbent_file $quoted_candidate_file\n" if $debug;
+                                                                       print STDERR 'C' if $progress;
                                                                        if (compare($incumbent_file, $candidate_file)) {
                                                                                $compare_differences++;
                                                                                $identical = 0;
@@ -545,6 +556,7 @@ candidate_file:
 
 end_merge:
 
+       print STDERR '.' if $progress;
        print STDERR "Merge done.\n" if $debug;
        undef %inode_to_file_name;
 }