psycamp -F finds duplicate media that wasn't hardlinked

1 files changed, 39 insertions, 9 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 927ed6b..ecdd32e 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -120,7 +120,6 @@ sub HATEINDEX () { "$ENV{HOME}/.media/TRASH-$ENV{HOST}.ix" }
 # a second monitor, it makes sense to run psycamp over there
 my $screen = 0;
 
-
 ### BEGINNING OF REGULAR CODE
 
         require 5.000;
@@ -626,7 +625,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|Q|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         &say(BOLD, RED, ">> command $1$r not defined", RESET);
@@ -639,6 +638,7 @@ X
                         $1 eq 'E' ? 'EDITABLE' :
                         $1 eq 'M' ? 'REMASTER' :
                         $1 eq 'V' ? 'VOLATILE' :
+                        $1 eq 'Q' ? 'COOL' :
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'Y' ? 'EASY' :
                         $1 eq 'C' ? 'CRITICIZE' :
@@ -718,7 +718,7 @@ X
 #               &gin("seek $1 $2");
 #       }
 
-        &scheduledQuit, next if /^q(q|quit)\b/ or /QQ?/;
+        &scheduledQuit, next if /^q(q|quit)\b/;
         /^(q|quit)\b/ and &save($CS-1), &exit(0);
         /^(x|exit)\b/ and &exit(0);
         /^(w|write)\b/ and &save($CS-1), next;
@@ -900,6 +900,10 @@ sub sys {
 
 sub sorttracks {
         my $style = shift;
+        if ($opt_F) {
+                @dupes = ();
+                $style = 'd';
+        }
         return (1 .. $NS) unless $style;
         my @order;
         print STDERR "sorting by_$style 1 .. $NS\n" if DEBUG & 8;
@@ -909,7 +913,8 @@ sub sorttracks {
 Invalid sort option '$style'. Look up '$0 -h' again.
 
 X
-        return @order;
+        exit if $opt_F;
+        return $style eq 'd' ? @dupes : @order;
 }
         # r(andom)      # bad randomizer algorithm (use -r instead)
 # this actually produces VERY pseudo random results, says randal
@@ -935,8 +940,8 @@ sub by_s {
         if (DEBUG & 128) {
                 my $B = $size[$b]; my $A = $size[$a];
                 if ($A == $B) {
-                        my ($ad, $ai) = stat $a;
-                        my ($bd, $bi) = stat $b;
+                        my ($ad, $ai) = stat $file[$a];
+                        my ($bd, $bi) = stat $file[$b];
                         # inform of duplicate files in file system
                         # unless they are hard- or softlinked
                         print MAGENTA, <<X, RESET unless $ai == $bi and $ad == $bd;
@@ -953,19 +958,42 @@ X
         }
 }
 sub by_S {
-        # one side of this if/else clause gets optimized away at compilation
         if (DEBUG & 128) {
                 my $B = $size[$b]; my $A = $size[$a];
-                print MAGENTA, <<X, RESET if $A == $B;
+                if ($A == $B) {
+                        my ($ad, $ai) = stat $file[$a];
+                        my ($bd, $bi) = stat $file[$b];
+                        print MAGENTA, <<X, RESET unless $ai == $bi and $ad == $bd;
 Same file size $B:
         $file[$a] and
         $file[$b]
 X
+                }
                 return $B <=> $A;
         } else {
                 return $size[$b] <=> $size[$a];
         }
 }
+sub by_d {
+        my $B = $size[$b]; my $A = $size[$a];
+        if ($A == $B) {
+                my ($ad, $ai) = stat $file[$a];
+                my ($bd, $bi) = stat $file[$b];
+                unless ($ai == $bi and $ad == $bd) {
+                        # now we are intentionally doing that job
+                        my $rc = system('/usr/bin/cmp', '-s', $file[$a], $file[$b]);
+                        unless ($rc) {
+                                print <<X;
+$file[$a]
+$file[$b]
+
+X
+                                push @dupes, $a, $b;
+                        }
+                }
+        }
+        return $B <=> $A;
+}
 
 # FIXME: maybe update to use List::Util 'shuffle';
 # or maybe this is fine because it does NOT use sort+rand
@@ -1049,7 +1077,7 @@ sub wanted {
         }
 }
 sub progress {
-        return if $opt_q;
+        return if $opt_q or $opt_F;
         my $tx = join('', @_);
         my $len = length $tx;
         print "\r", GREEN, $tx, RESET, ' ';
@@ -1452,6 +1480,7 @@ the following uppercase commands:
         K = send to KEEP
         L = send to L8R
         M = send to REMASTER
+        Q = send to COOL
         R = send to REPERTOIRE
         S = send to SECONDARY
         S = send to USE
@@ -1518,6 +1547,7 @@ __END__
         [-d]elete files after playing if the path contains the word '$VOLATILE'
         [-D]elete files after playing unless the path contains the word '$KEEP'
         [-V]oice each file name after playing it
+        [-F]ind duplicates of files which aren't hardlinked, like fdupes
 
  Without arguments, psycamp resumes from last run's playlist.