new -j scanning option for psycamp, mpv doesn't work yet

1 files changed, 45 insertions, 22 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 9c39a1c..1474ac5 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -143,7 +143,6 @@ my $screen = 0;
         ($TWIDTH, $THEIGHT) = GetTerminalSize();
 
         *name   = *File::Find::name;    # ugly style works
-        $scan = 0;
         my %I;
         my $CDUR = 0;
 
@@ -196,6 +195,7 @@ MAIN: {
 #%      $wrapper = &which('aoss') || &which('padsp') || "";
 #%      print "Using wrapper: $wrapper\n" if $opt_v;
  #: X
+#       $has_mpv = &which('mpv');
         print STDERR <<X unless $has_mplayer = &which('mplayer');
 Cannot find mplayer. Cannot play media without it.
 
@@ -334,12 +334,12 @@ sub timeout {
 #%      #y $trick = 'seek 1 1';
 #%#                 print " (kicking rxaudio with '$trick')\n" if DEBUG & 32;
 #%#                 &gin( $trick );
-#%      print RED, "\n\t\t(kick) ", RESET if DEBUG & 32;
+#%      print MAGENTA, "\n\t\t(kick) ", RESET if DEBUG & 32;
 #%      &gin('seek 1 1'); #? X
 #%      &gin('seek 0 1'); #? !X
 #%      &gin('pause'); #? !X
  #: X
-        print RED, "\n*** Playback problem. ", RESET, "Skipping $OpenedFile\n";
+        print MAGENTA, "\n*** Playback problem. ", RESET, "Skipping $OpenedFile\n";
         # so far timeout only happens when the input file is b0rked, so we skip it
         &next(0);
  #} X
@@ -475,7 +475,7 @@ sub open {
                 &next(0);               # hmmmm?
         } elsif (! -r $file) {
                 my $f = &stringtail($file, $TWIDTH-4);
-                print RED, "*** $f\n", RESET unless $opt_q;
+                print MAGENTA, "*** $f\n", RESET unless $opt_q;
                 &next(0);               # hmmmm?
         } else {
                 # xaudio does this for us now
@@ -500,7 +500,6 @@ sub open {
                 $OpenedFile = $file;
                 $DUR = 0;
                 &sleep(0.3);    # have to wait for file to load?
-                $scan=0, &seek(5) if $scan;
 #               &seek(@_) if @_;
 #               &vol(100);
         }
@@ -563,7 +562,6 @@ X
                 &printinfo;
                 next;
         }
-        next unless /^\w/;
         print "> $_\n" if $opt_v and $SCRIPT;
 
         # techniques to seek in media file
@@ -575,7 +573,6 @@ X
         /^skip\s(\w+)$/ and $SKIP=$1, next;
         # /^open\s+(\S*)\s*\b(\S*)\s*\b(\S*)\s*$/ and &open($1,$2,$3), next;
         /^o\s+(.*)\s*$/ and &open($1), next;
-        /^scan\s+(.*)\s*$/ and $scan=1, &open($1), next;
         /^(n|next)\b\s*(\S*)$/ and &next($2 || .05), next;
  #{ O
         if ( $ALLOW_DELETE_KEY ) {
@@ -607,7 +604,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|X|C|S|R)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|X|C|F|S|R)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         print BOLD, RED, ">> command $1$r not defined\n", RESET;
@@ -622,14 +619,21 @@ X
                         $1 eq 'V' ? 'VOLATILE' :
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'C' ? 'CRITICIZE' :
+                        $1 eq 'F' ? 'FAVES' :
                         $1 eq 'S' ? 'SECONDARY' : 'REPERTOIRE';
                 my $f = $CurrentFile;
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
-                unless ($f =~ s:\b(SHARE|T|COMPLETE|KEEP|EDITABLE|SECONDARY|REPERTOIRE|NEW|SEEK|TODO|USE|DEEJAY|REMASTER|CRITICIZE|INCOMING|EXPORT|VOLATILE)\b:$t:i)
+                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|RADIO|BAR|LISTEN|byArtist|byGenre)\d?\b:$t:i)
                 {
                         print BOLD, RED, ">> not applicable for $f\n", RESET;
                         next;
                 }
+                if ($f eq $f2) {
+                        print BOLD, BLUE, ">> no longer scheduled to go to $moveLater\n", RESET if $moveLater;
+                        $moveLater = undef;
+                        next;
+                }
                 if ($r) {
                         $moveLater = $f;
                         print BOLD, BLUE, ">> scheduled to move to $t\n", RESET;
@@ -639,7 +643,14 @@ X
                 }
                 next;
         }
+        if ( /^\.\s*$/ ) {
+                print BOLD, BLUE, ">> no longer scheduled to go to $moveLater\n", RESET if $moveLater;
+                print BOLD, BLUE, ">> no longer scheduled for removal\n", RESET if $deleteLater;
+                $moveLater = $deleteLater = undef;
+                next;
+        }
  #} O
+        next unless /^\w/;
         # NEW: relative volume changes, only with mplayer
         # FIXME: why does it only work with leading v?
         /^v\+\s*$/ and &gin('volume 9'), next;  #? !X
@@ -706,11 +717,16 @@ sub moveFile {
         mkpath $d;
 #       unless (mkpath($d)) {
 #               print ">> could not mkdirhier $d\n";
-#               next;
+#               return;
 #       }
         unless (rename ($CurrentFile, $f)) {
                 print BOLD, RED, ">> could not move file to $d\n", RESET;
-                next;
+                return;
+        }
+        my $asd = $CurrentFile .".asd";
+        if (-s $asd and not rename ($CurrentFile, $f .".asd")) {
+                print BOLD, RED, ">> could not move asd file to $d\n", RESET;
+                return;
         }
         print BOLD, BLUE, ">> moved to $d\n", RESET;
 }
@@ -834,9 +850,10 @@ sub jump {
 }
 
 # if your system doesn't have "which" we're in trouble
+# even BSD has which in that place, so it is ok to use full path
 sub which {
         my $cmd = shift;
-        $_ = `which $cmd 2>&1`;
+        $_ = `/usr/bin/which $cmd 2>&1`;
         print STDERR "which $cmd: $_" if DEBUG & 1;
         /^(\S+)\s*$/;
         return $1;
@@ -973,9 +990,12 @@ sub enqueue {
         }
 }
 sub wanted {
+        # 2018: I changed 'lstat' to 'stat' here so that symlinks
+        # are processed properly. Does it have any side effects?
+        #
         ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-           $atime,$mtime,$ctime,$blksize,$blocks) = lstat($_);
-        my $neat = &stringtail($name, $TWIDTH-7);
+           $atime,$mtime,$ctime,$blksize,$blocks) = stat($_);
+        my $neat = &stringtail($name, $TWIDTH-7) unless $opt_q;
         if (-f _ && -r _ && -s _ > 9999 && /\.$FILETYPES$/io) {
                 $file[++$NS] = $name;
                 $size[$NS] = $size || -s _;
@@ -986,10 +1006,6 @@ sub wanted {
                 $prune = 1;
                 &progress('pruned: ', $name);
                 print "\n";
-#       } elsif ( $decode && -f _ && /\bindex\.etx$/i ) {
-#               open(I, "$decode <$_ |")
-#                 and @index = (@index, <I>) and close I;
-#               &progress('inf: ', $neat);
         } else {
                 &progress('no : ', $neat) if -f _;
         }
@@ -1031,10 +1047,12 @@ sub ginparse {
 #%                  $TC eq $1   #? X
                     $tc == $1   #? !X
                 ) {
+                        &seek(84) if $opt_j and $tc == 8;
 #%                      $TC = $1;                       #? X
                         $tc = $1;                       #? !X
                         $TC = time2str('[%T]', $tc, 0); #? !X
                         print BOLD, GREEN, "\r$TC ", RESET unless $opt_q;
+                        # $TC then gets used all over the place...
                 }
                 return 0;
         }
@@ -1160,7 +1178,7 @@ sub ginparse {
                             # from the track, not producing a median
                             # value for VBR tracks. amazing how people
                             # still don't dig VBR after 20 years.
-                            print RED, "\rInconsistent bitrate info: ", RESET,
+                            print MAGENTA, "\rInconsistent bitrate info: ", RESET,
                               "$I{bitrate} vs $br\n" if $opt_v and $br
                               and $I{bitrate} and abs($br-$I{bitrate}) > 1;
                             $I{bitrate} = $br if $br;
@@ -1221,6 +1239,10 @@ sub ginstart {
         # to allow for fading we want to have the PCM channel,
         # this works for ALSA - does it fail otherwise?
         $GINPID = open3( \*W, \*R, \*R, $has_mplayer, '-slave', '-idle', '-v', '-fs', '-zoom', '-screen', $opt_S || $screen, '-mixer-channel', 'PCM' );
+#       my $mpvsock = '/tmp/.mpvsock';
+#       $GINPID = open3( \*WW, \*R, \*R, $has_mpv, "--input-ipc-server=$mpvsock", '--idle=yes', '-v', '--fs=yes', '--no-audio-display', "--screen=".($opt_S || $screen), '--alsa-mixer-name=PCM' );
+#       #open( \*R, '<', $mpvsock );
+#       open( \*W, '>', $mpvsock );
         R->blocking(0);
         $GINPID || die "$has_mplayer: $!";
         &ginxpect('^MPlayer');
@@ -1351,7 +1373,7 @@ moved into a different subdirectory on the same hierarchy level by using
 the following uppercase commands:
 
         J = send to DEEJAY folder
-        U = send to USE
+        F = send to FAVES
         K = send to KEEP
         X = send to EXPORT
         S = send to SECONDARY
@@ -1362,8 +1384,8 @@ 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
 you type 'KK' if you want to keep the file after having listened to it.
 You can change your mind while the track is playing - the last command
-you schedule is the one that counts.
-The commands for deleting items are similar:
+you schedule is the one that counts. You can cancel a scheduled operation
+using '.' (as in 'leave it here'). The commands for deletion are similar:
 
         D = delete the file now
         DD = delete the file after having played it
@@ -1408,6 +1430,7 @@ __END__
         [-c]alculate cumulative duration of selections
         [-L]oad the tracks in the playlist only if they really exist
         [-x] will terminate perl and exec mplayer, use when short on memory
+        [-j]ump to end of track: a way to scan through a playlist
         [-d]elete files after playing if the path contains the word '$VOLATILE'.
         [-D]elete files after playing unless the path contains the word '$KEEP'.