-irrelevant changes

2 files changed, 14 insertions, 9 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 14c9607..a6ca3ce 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -625,7 +625,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|X|C|F|S|R)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|X|C|F|L|W|S|R)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         print BOLD, RED, ">> command $1$r not defined\n", RESET;
@@ -641,11 +641,14 @@ X
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'C' ? 'CRITICIZE' :
                         $1 eq 'F' ? 'FAVES' :
+                        $1 eq 'W' ? 'WRONG' :
+                        $1 eq 'L' ? 'L8R' :
                         $1 eq 'S' ? 'SECONDARY' : 'REPERTOIRE';
                 my $f = $CurrentFile;
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
                 my $f2 = $f;
-                unless ($f =~ s:\b(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|SECONDARY|REPERTOIRE|NEW|SEEK|TODO|USE|DEEJAY|REMASTER|CRITICIZE|INCOMING|EXPORT|VOLATILE|BOMB|FLOW|SPARE|BAR|LISTEN|byArtist|byGenre)\d?\b:$t:i)
+                # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones
+                unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|SEEK|TODO|USE|DEEJAY|REMASTER|CRITICIZE|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
                 {
                         print BOLD, RED, ">> not applicable for $f\n", RESET;
                         next;
@@ -657,7 +660,7 @@ X
                 }
                 if ($r) {
                         $moveLater = $f;
-                        print BOLD, BLUE, ">> scheduled to move to $t\n", RESET;
+                        print BOLD, BLUE, ">> scheduled to move to $t: $f\n", RESET;
                 } else {
                         &moveFile($f);
                         &next(0);
@@ -750,7 +753,7 @@ sub moveFile {
                 return;
         }
         my $asd = $CurrentFile .".asd";
-        if (-s $asd and not rename ($CurrentFile, $f .".asd")) {
+        if (-s $asd and not rename ($asd, $f .".asd")) {
                 print BOLD, RED, ">> could not move asd file to $d\n", RESET;
                 return;
         }
@@ -1077,7 +1080,7 @@ sub ginparse {
 #%                  $TC eq $1   #? X
                     $tc == $1   #? !X
                 ) {
-                        &seek(91) if $opt_j and $tc == 8;
+                        &seek(87) if $opt_j and $tc == 8;
 #%                      $TC = $1;                       #? X
                         $tc = $1;                       #? !X
                         $TC = time2str('[%T]', $tc, 0); #? !X
@@ -1414,13 +1417,15 @@ Whenever media is in a directory like INCOMING, NEW or TODO, it can be
 moved into a different subdirectory on the same hierarchy level by using
 the following uppercase commands:
 
+        F = send to FAVES folder
         J = send to DEEJAY folder
-        F = send to FAVES
+        L = send to L8R
         K = send to KEEP
-        X = send to EXPORT
-        S = send to SECONDARY
         R = send to REPERTOIRE
+        S = send to SECONDARY
         V = send to VOLATILE
+        W = send to WRONG
+        X = send to EXPORT
 
 If you prefer to execute the command *after* having finished playing it,
 you can schedule the move for later by doubling the command letter. So
diff --git a/bin/psyccat b/bin/psyccat
index 8e1a766..c26343f 100755
--- a/bin/psyccat
+++ b/bin/psyccat
@@ -29,7 +29,7 @@ X
 
 my $d = '';
 # i know there are better ways to do this..
-$d .= $_ while <>;
+$d .= $_ while <<>>;
 
 go($d);
 sleep 4;