signals for remotor, improved trash and duration for psycamp

2 files changed, 62 insertions, 30 deletions

diff --git a/bin/psycamp b/bin/psycamp
index d48baf9..f8844f6 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -386,6 +386,7 @@ sub ginread {
                     print RED, unlink ($deleteLater) ?
                             "\r***" : "\r - ", BOLD, GREEN, "[\n", RESET;
                     $deleteLater = undef;
+                    &trash;
                 } elsif ($opt_d && ($Volatile ||
                     $CurrentFile =~ /\b$VOLATILE\b/oi)) {
                         print RED, unlink ($CurrentFile) ?
@@ -395,13 +396,13 @@ sub ginread {
                     $CurrentFile !~ /\b$KEEP\b/oi) {
                         print RED, unlink ($CurrentFile) ?
                             "\r***" : "\r - ", BOLD, GREEN, "[\n", RESET;
-                } elsif ($DUR/1000 - $tc > 4) {
+                } elsif ($DUR - $tc > 4) {
                         # Both ffmpeg and mplayer have a bug of
                         # dividing the sum of frame bitrates by
                         # the duration of the complete track, thus
                         # counting zero for the missing part. This
                         # formula compensates for that bug.
-                        my $estira = $I{bitrate} * $DUR/$tc/1000;
+                        my $estira = $I{bitrate} * $DUR/$tc;
                         printf "%s%sIncomplete file. Estimated actual bitrate: %.1f%s\n", BOLD, YELLOW, $estira, RESET if $estira < 1000 and $estira > 50;
                         # Then again, this approach sometimes
                         # fails if mplayer doesn't let us have
@@ -599,15 +600,7 @@ X
  #{ O
         if ( $ALLOW_DELETE_KEY ) {
             if ( /^T(T?)\s*$/ ) {
-                # 'T' deletes song and remembers it in the index of trash media
-                if (open(HATE, ">>", HATEINDEX)) {
-                        printf HATE "%10d %5s %3s\t%s\r\n",
-                           $CurrentSize, $I{duration}, $I{bitrate}, $CurrentFile;
-                        close HATE;
-                        print CYAN, ">> marked as trash\n", RESET;
-                } else {
-                        print BOLD, RED, "*** Failed to write to ", HATEINDEX, ":\n", RESET, $out;
-                }
+                $trashLater = $CurrentFile;
                 # dirty way to fall through into one of the following ifs
                 $_ = $1? 'DD': 'D';
             }
@@ -620,19 +613,20 @@ X
             if ( /^D\s*$/ ) {
                 my $f = $CurrentFile;
                 &ginclose;
+                &trash;
                 print BOLD, RED, ">> deleted: $f\n", RESET if unlink $f;
                 &ginopen;
                 &next(0);
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|X|C|F|L|W|S|R)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         print BOLD, RED, ">> command $1$r not defined\n", RESET;
                         next;
                 }
-                $deleteLater = undef;
+                $trashLater = $deleteLater = undef;
                 my $t = $1 eq 'J' ? 'DEEJAY' :
                         $1 eq 'U' ? 'USE' :
                         $1 eq 'K' ? 'KEEP' :
@@ -640,6 +634,7 @@ X
                         $1 eq 'M' ? 'REMASTER' :
                         $1 eq 'V' ? 'VOLATILE' :
                         $1 eq 'X' ? 'EXPORT' :
+                        $1 eq 'Y' ? 'EASY' :
                         $1 eq 'C' ? 'CRITICIZE' :
                         $1 eq 'F' ? 'FAVES' :
                         $1 eq 'W' ? 'WRONG' :
@@ -649,7 +644,7 @@ X
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
                 my $f2 = $f;
                 # 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|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
+                unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
                 {
                         print BOLD, RED, ">> not applicable for $f\n", RESET;
                         next;
@@ -661,7 +656,7 @@ X
                 }
                 if ($r) {
                         $moveLater = $f;
-                        print BOLD, BLUE, ">> scheduled to move to $t: $f\n", RESET;
+                        print BOLD, BLUE, ">> scheduled to move to $t\n", RESET;
                 } else {
                         &moveFile($f);
                         &next(0);
@@ -671,7 +666,7 @@ X
         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;
+                $trashLater = $moveLater = $deleteLater = undef;
                 next;
         }
  #} O
@@ -758,7 +753,7 @@ sub moveFile {
                 print BOLD, RED, ">> could not move asd file to $d\n", RESET;
                 return;
         }
-        print BOLD, BLUE, ">> moved to $d\n", RESET;
+        print BOLD, BLUE, ">> moved to $f\n", RESET;
 }
 
 sub sleep {
@@ -861,7 +856,7 @@ sub duration {
         if ( $t =~ /(\d*)(:|')(\S+)/ ) {
                 $t = $1 ? $1*60+$3 : $3;
         }
-        $DUR = $t * 1000;
+        $DUR = $t;
         print YELLOW, "[duration is $t secs]\n", RESET unless $opt_q;
         return 1;
 }
@@ -875,7 +870,7 @@ sub jump {
         if ( $t =~ /(\d*)(:|')(\S*)/ ) {
                 $t = $1 ? $1*60+$3 : $3;
         }
-        &gin( "seek ". $t*1000 .' '. $DUR );
+        &gin( "seek ". $t*1000 .' '. $DUR*1000 );
         return 1;
 }
 
@@ -1081,7 +1076,12 @@ sub ginparse {
 #%                  $TC eq $1   #? X
                     $tc == $1   #? !X
                 ) {
-                        &seek(87) if $opt_j and $tc == 8;
+                        if ($opt_j) {
+                                # skip to 2/5 of track when 8th sec is reached
+                                &seek(48) if $tc == 8;
+                                # skip to end of track when 66% of track is reached
+                                &seek(96) if $tc == int($DUR*2/3);
+                        }
 #%                      $TC = $1;                       #? X
                         $tc = $1;                       #? !X
                         $TC = time2str('[%T]', $tc, 0); #? !X
@@ -1102,14 +1102,13 @@ sub ginparse {
 #%              # kludge to get around a bug in xaudio (duration output twice)
 #%              if ($1 != $LDUR) {
 #%                      $LDUR = $DUR = $1;
-#%                      $DUR *= 1000 if $DUR < 1000;
 #%                      $CDUR += $DUR;  # cumulative duration
 #%              }
 #%              return 0;
 #%      } 
 #%      if (/ stream info \[(.+)\]/) {
 #%              %I = split /[=,\s]+/, $1;
-#%              my $d = $DUR / 1000;
+#%              my $d = $DUR;
 #%              $I{duration} = sprintf("%02d:%02d", $d / 60, $d % 60);
 #%#             if ($opt_l) {
 #%#                     my $f = $file[$order[$CS]];
@@ -1119,7 +1118,7 @@ sub ginparse {
 #%#             }
 #%              $I{mode} = lc $I{mode};
 #%              if ($opt_c) {
-#%                      my $d = $CDUR / 1000;
+#%                      my $d = $CDUR;
 #%                      $I{cumulative} = sprintf("%02d:%02d", $d / 60, $d % 60);
 #%                      &progress("$TC   -> [$I{duration}] {$I{cumulative}} $I{bitrate} mp$I{layer}.$I{level} $I{frequency} $I{mode} ");
 #%              } else {
@@ -1158,8 +1157,7 @@ sub ginparse {
                 $CurrentCodec = $codec;
                 $CurrentSize = $size || -s $nf;
                 if ($CurrentFile ne $nf) {
-                        $moveLater = undef;
-                        $deleteLater = undef;
+                        $trashLater = $deleteLater = $moveLater = undef;
                         $size = undef;
                         $codec = undef;
                 }
@@ -1218,7 +1216,7 @@ sub ginparse {
                               and $I{bitrate} and abs($br-$I{bitrate}) > 1;
                             $I{bitrate} = $br if $br;
                             $I{duration} = $hh eq '00' ? "$mm:$ss" : "$hh:$mm:$ss";
-                            $DUR = (60*60*$1 + 60*$2 + $3) * 1000;
+                            $DUR = 60*60*$1 + 60*$2 + $3;
                             $CDUR += $DUR;      # cumulative duration
                             break;
                         }
@@ -1316,10 +1314,24 @@ sub ginopen {
         $output_open = 1;
 }
 
+sub trash {
+        if ($trashLater eq $CurrentFile) {
+                # 'T' deletes song and remembers it in the index of trash media
+                if (open(HATE, ">>", HATEINDEX)) {
+                        printf HATE "%10d %5s %3s\t%s\r\n",
+                           $CurrentSize, $I{duration}, $I{bitrate}, $CurrentFile;
+                        close HATE;
+                        print RED, ">> marked as trash\n", RESET;
+                } else {
+                        print BOLD, RED, "*** Failed to write to ", HATEINDEX, ":\n", RESET, $out;
+                }
+        }
+        $trashLater = undef;
+}
+
 sub exit {
         &ginstop;
         if ($CDUR and not $opt_q) {
-                $CDUR /= 1000;
                 my $SS = int $CDUR % 60;
                 my $M2 = int $CDUR / 60;
                 my $HH = int $M2 / 60;
@@ -1382,7 +1394,7 @@ sub addtolist {
 
 sub help { print BOLD, BLACK, &head, RESET, <<X, &sep('='); }
 
-basics: (q)uit (h)elp
+basics: (h)elp, (q)uit, (qq)uit after this song is over
 
 motion: (p)lay (s)top pa(u)se
       [ (j)ump ] <mm:ss>                jump to an absolute point in the song
@@ -1418,15 +1430,20 @@ 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:
 
+        C = send to CRITICIZE folder
+        E = send to EDITABLE folder
         F = send to FAVES folder
         J = send to DEEJAY folder
-        L = send to L8R
         K = send to KEEP
+        L = send to L8R
+        M = send to REMASTER
         R = send to REPERTOIRE
         S = send to SECONDARY
+        S = send to USE
         V = send to VOLATILE
         W = send to WRONG
         X = send to EXPORT
+        Y = send to EASY
 
 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/remotor b/bin/remotor
index 50a75f0..a3e3d32 100755
--- a/bin/remotor
+++ b/bin/remotor
@@ -86,7 +86,9 @@ sub terror {
         my $msg = "Error on the Tor control socket. $_";
         say $msg;
         tellpsyc('_notice_warning_remotor', $msg);
-        return &quit;
+        &quit;
+        # when the auth is wrong, the elegant &quit fails... forcing exit for now:
+        exit;
 }
 
 sub torparse {
@@ -244,6 +246,19 @@ sub mkdirhier {
         register_uniform();
         say "Listening for PSYC controls on $bind";
 
+        local $SIG{HUP} = sub {
+                print STDERR "Received SIGHUP. Reloading configuration.\n";
+                goto RESTART;
+        };
+        local $SIG{USR1} = sub {
+                if ($torsock) {
+                        print STDERR "Received SIGUSR1. Sending NEWNYM.\n";
+                        print $torsock "SIGNAL NEWNYM";
+                } else {
+                        print STDERR "Received SIGUSR1, but we're not connected.\n";
+                } 
+        };
+RESTART:
         $|=1;
         &iniparse($ini);
         $host = $1 if $ENV{http_proxy} =~ m!^http://(\S+):\d+$!;