nicer playlist display.. and 'qq' quitLater function

1 files changed, 9 insertions, 4 deletions

diff --git a/bin/psycamp b/bin/psycamp
index d427e74..f7baefc 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -411,6 +411,7 @@ sub ginread {
                         print BOLD, GREEN, "\r   [\n", RESET unless $opt_q;
                 }
                 &ginstop if $opt_I;
+                if ($quitLater) { &save($CS-1), &exit(0); }
                 &next(0);
         }
     }
@@ -552,10 +553,10 @@ X
                         my $s = $size[$order[$i]] || -s $f;
 #                       my $a = $adate[$order[$i]];
                         $f =~ s/\.[^\.\s]+$//i;
-                        $f = '..'.substr($f,length($p)-$TWIDTH+16) if
-                                length($f) > $TWIDTH-14;
+                        $f = '..'.substr($f,length($p)-$TWIDTH+11) if
+                                length($f) > $TWIDTH-9;
                         $any++;
-                        printf "%2d.%9d %s\n", $i, $s, $f;
+                        printf "%9d %s\n", $s, $f;
                 }
                 print $any ? "\n" : "<no more tracks in playlist>\n\n";
                 print &sep('-');
@@ -689,6 +690,10 @@ X
 #               &gin("seek $1 $2");
 #       }
 
+        if (/^q(q|quit)\b/) {
+                print BOLD, GREEN, ">> scheduled to quit after this track\n", RESET;
+                $quitLater++, next;
+        }
         /^(q|quit)\b/ and &save($CS-1), &exit(0);
         /^(x|exit)\b/ and &exit(0);
         /^(w|write)\b/ and &save($CS-1), next;
@@ -1047,7 +1052,7 @@ sub ginparse {
 #%                  $TC eq $1   #? X
                     $tc == $1   #? !X
                 ) {
-                        &seek(84) if $opt_j and $tc == 8;
+                        &seek(91) if $opt_j and $tc == 8;
 #%                      $TC = $1;                       #? X
                         $tc = $1;                       #? !X
                         $TC = time2str('[%T]', $tc, 0); #? !X