Don't report size in --progress unless it changes

[dupemerge] / faster-dupemerge

diff --git a/faster-dupemerge b/faster-dupemerge
index 683ed32917c6a72d8e15b52fc1e5aadc518b2b95..232c6bd3474958f8bd097187b23ec87457104a29 100755 (executable)
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -355,6 +355,7 @@ hash_file:
                foreach my $filename (sort keys(%{$inode_to_file_name{$candidate}})) {
                        print STDERR "\t\tDigesting file $filename\n" if $debug;
                        if ((-l $filename) || ! -f _) {
+                               print STDERR "\n" if $progress;
                                warn "Bogon file " . tick_quote($filename);
                                $input_bogons++;
                                delete $inode_to_file_name{$candidate}->{$filename};
@@ -540,7 +541,7 @@ candidate_file:
 
                                                                        if ($link_done) {
                                                                                delete $inode_to_file_name{$to_inode}->{$to_file};
-                                                                               $inode_to_file_name{$from_inode}->{$to_file} = undef;
+                                                                               $inode_to_file_name{$from_inode}->{$to_file} = undef unless ($dry_run);
                                                                                $hash_to_inode{$digest} = [ $from_inode ];
 
                                                                                $hard_links++;
@@ -588,6 +589,7 @@ end_merge:
 }
 
 my $last_time = 0;
+my $last_size = 0;
 
 while (<FIND>) {
        my ($weak_key, $size, $dev, $ino, $name) = m/^((\d+) \d+ \d+ \d+ -?[\d.]+) (\d+) (\d+) (.+)\0$/so;
@@ -607,8 +609,9 @@ while (<FIND>) {
 
        if ($progress) {
                my $this_time = time();
-               if ($this_time != $last_time) {
+               if ($this_time != $last_time && $size != $last_size) {
                        $last_time = $this_time;
+                       $last_size = $size;
                        print STDERR "($size)";
                }
        }