introducing a sleeping timer into psycamp

1 files changed, 48 insertions, 30 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 6508d1d..5e64423 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -155,7 +155,7 @@ my $screen = 0;
 
 MAIN: {
         if ($#ARGV >= 0) {
-                getopt('AbMnsS');
+                getopt('AbMnsSt');
         }
         $nick = $opt_n
              || $ENV{'PSYCNICK'}
@@ -278,6 +278,12 @@ X
         add( \*STDIN, 'r', \&stdread );
         &ginstart;
 
+        if ($opt_t = 60 * int($opt_t)) {
+                print BOLD, BLUE, <<X, RESET;
+Scheduling termination after $opt_t seconds.
+X
+                add($opt_t, 't', \&scheduledQuit);
+        }
         print STDERR $ENV{PWD} . " = PWD\n" if DEBUG & 1;
         if ($opt_d) {
                 print STDERR BOLD, RED, ($Volatile = $ENV{PWD}
@@ -313,7 +319,7 @@ X
         $|=1;
 
         # Net::PSYC::Event doesn't support idle events yet.. TODO
-        add(3, 'i', \&timeout, 1);
+        add(7, 'i', \&timeout, 1);
         # higher frequency necessary to detect timeouts this way..
         # then again, if it's too high timer is sometimes faster
         # than rxaudio and produces an erroneous kick..
@@ -350,9 +356,9 @@ sub timeout {
 #       # so far timeout only happens when the input file is b0rked, so we skip it
 #       &next(0);
         # it also happens when the file is being delivered via network
-#       print MAGENTA, "\n*** Track not ready for playback. Retrying from start.\n";
-#       &gin( "seek 0 1" );
-        print MAGENTA, "\n*** Track not ready for playback. Waiting... \r";
+        print MAGENTA, "\n*** Track not ready for playback. Retrying from start.", RESET;
+        &gin( "seek 0 1" );
+#       print MAGENTA, "\n*** Track not ready for playback. Waiting...", RESET, "\r";
  #} X
     }
     return 3;
@@ -423,7 +429,7 @@ sub ginread {
                         print BOLD, GREEN, "\r   [\n", RESET unless $opt_q;
                 }
                 &ginstop if $opt_I;
-                if ($quitLater) { &save($CS-1), &exit(0); }
+                if ($quitLater) { &save($CS), &exit(0); }
                 &next(0);
         }
     }
@@ -433,7 +439,7 @@ sub stdread {
     $_ = scalar <STDIN>;
     # should be in timeout instead
     if (waitpid(-1, WNOHANG)) {
-            print BOLD, RED, "\r>>> Media engine has terminated.", RESET, "\n";
+            &say(BOLD, RED, ">>> Media engine has terminated", RESET);
             exit;
     }
     &parse( $_ );
@@ -477,13 +483,13 @@ sub open {
         if ($file =~ /\.sdj$/i and -T $file) {
                 # calling a script from a script is like a "skip"..
                 $SCRIPT = $file;
-                print "[executing script $SCRIPT]\n" unless $opt_q;
+                &say("[executing script $SCRIPT]") unless $opt_q;
                 open(F, $file) || die "$file: $!";
                 while(<F>) {
                         &parse($_);
                 }
                 close F;
-                print "[script terminated]\n" unless $opt_q;
+                &say("[script terminated]") unless $opt_q;
                 undef $SCRIPT;
                 &next(0);               # hmmmm?
         } elsif (! -r $file) {
@@ -607,14 +613,14 @@ X
             if ( /^(_|DD)\s*$/ ) {
                 $moveLater = undef;
                 $deleteLater = $CurrentFile;
-                print BOLD, BLUE, ">> scheduled for removal\n", RESET;
+                &say(BOLD, BLUE, ">> scheduled for removal", RESET);
                 next;
             }
             if ( /^D\s*$/ ) {
                 my $f = $CurrentFile;
                 &ginclose;
                 &trash;
-                print BOLD, RED, ">> deleted: $f\n", RESET if unlink $f;
+                &say(BOLD, RED, ">> deleted: $f", RESET) if unlink $f;
                 &ginopen;
                 &next(0);
                 next;
@@ -623,7 +629,7 @@ X
         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;
+                        &say(BOLD, RED, ">> command $1$r not defined", RESET);
                         next;
                 }
                 $trashLater = $deleteLater = undef;
@@ -646,17 +652,18 @@ X
                 # 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|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;
+                        &say(BOLD, RED, ">> not applicable for $f", RESET);
                         next;
                 }
                 if ($f eq $f2) {
-                        print BOLD, BLUE, ">> no longer scheduled to go to $moveLater\n", RESET if $moveLater;
+                        &say(BOLD, BLUE, ">> no longer scheduled to go to $moveLater", RESET)
+                            if $moveLater;
                         $moveLater = undef;
                         next;
                 }
                 if ($r) {
                         $moveLater = $f;
-                        print BOLD, BLUE, ">> scheduled to move to $t\n", RESET;
+                        &say(BOLD, BLUE, ">> scheduled to move to $t", RESET);
                 } else {
                         &moveFile($f);
                         &next(0);
@@ -664,9 +671,10 @@ 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;
-                $trashLater = $moveLater = $deleteLater = undef;
+                &say(BOLD, BLUE, ">> no longer scheduled to go to $moveLater", RESET) if $moveLater;
+                &say(BOLD, BLUE, ">> no longer scheduled for removal", RESET) if $deleteLater;
+                &say(BOLD, BLUE, ">> no longer scheduled to quit", RESET) if $quitLater;
+                $quitLater = $trashLater = $moveLater = $deleteLater = undef;
                 next;
         }
  #} O
@@ -710,10 +718,7 @@ X
 #               &gin("seek $1 $2");
 #       }
 
-        if (/^q(q|quit)\b/ or /QQ?/) {
-                print BOLD, GREEN, ">> scheduled to quit after this track\n", RESET;
-                $quitLater++, next;
-        }
+        &scheduledQuit, next if /^q(q|quit)\b/ or /QQ?/;
         /^(q|quit)\b/ and &save($CS-1), &exit(0);
         /^(x|exit)\b/ and &exit(0);
         /^(w|write)\b/ and &save($CS-1), next;
@@ -735,6 +740,11 @@ X
         &gin($_) if $_;
 }
 
+sub scheduledQuit {
+        &say(BOLD, BLUE, ">> scheduled to quit after this track", RESET);
+        $quitLater++;
+}
+
 sub moveFile {
         my $f = shift;
         my $d = $f;
@@ -745,15 +755,15 @@ sub moveFile {
 #               return;
 #       }
         unless (rename ($CurrentFile, $f)) {
-                print BOLD, RED, ">> could not move file to $d\n", RESET;
+                &say(BOLD, RED, ">> could not move file to $d", RESET);
                 return;
         }
         my $asd = $CurrentFile .".asd";
         if (-s $asd and not rename ($asd, $f .".asd")) {
-                print BOLD, RED, ">> could not move asd file to $d\n", RESET;
+                &say(BOLD, RED, ">> could not move asd file to $d", RESET);
                 return;
         }
-        print BOLD, BLUE, ">> moved to $f\n", RESET;
+        &say(BOLD, BLUE, ">> moved to $f", RESET);
 }
 
 sub sleep {
@@ -766,7 +776,7 @@ sub sleep {
         else {
                 $t = 0.1;
         }
-        print "[sleeping $t secs]\n" unless $opt_q or $t < 1;
+        &say("[sleeping $t secs]") unless $opt_q or $t < 1;
         select (undef,undef,undef,$t);
         return $t;
 }
@@ -857,14 +867,14 @@ sub duration {
                 $t = $1 ? $1*60+$3 : $3;
         }
         $DUR = $t;
-        print YELLOW, "[duration is $t secs]\n", RESET unless $opt_q;
+        &say(YELLOW, "[duration is $t secs]", RESET) unless $opt_q;
         return 1;
 }
 
 sub jump {
         my $t = shift;
         unless ($DUR) {
-                print STDERR "[you must specify the song duration first]\n";
+                &say("[you must specify the song duration first]");
                 return 1;
         }
         if ( $t =~ /(\d*)(:|')(\S*)/ ) {
@@ -1056,6 +1066,12 @@ sub stringtail {
         my $w = shift || $TWIDTH;
         return length($s)>=$w ? "...".substr($s,-$w+4) : $s;
 }
+sub say {
+        my $tx = join('', @_);
+        # this counts more space for color codes than visible on screen FIXME
+        my $len = length $tx;
+        print "\r", $tx, ' ' x ($TWIDTH-1-$len), "\n";
+}
 
 sub ginxpect {
         local($match) = @_; 
@@ -1321,7 +1337,7 @@ sub trash {
                         printf HATE "%10d %5s %3s\t%s\r\n",
                            $CurrentSize, $I{duration}, $I{bitrate}, $CurrentFile;
                         close HATE;
-                        print RED, ">> marked as trash\n", RESET;
+                        &say(RED, ">> marked as trash", RESET);
                 } else {
                         print BOLD, RED, "*** Failed to write to ", HATEINDEX, ":\n", RESET, $out;
                 }
@@ -1479,7 +1495,8 @@ __END__
 =head1 SYNOPSIS
 
  psycamp [<flags>] [-b <uniform>] [-n <nick>] [-s <sort-algorithm>]
-         [-M <UNI>] [-S <screen>] [-A <text>] [<media-files|directories>]
+         [-M <UNI>] [-S <screen>] [-A <text>] [-t <minutes>]
+         [<media-files|directories>]
 
         [-A]nnounce a message between each track using 'espeak'
         [-b]ind PSYC uniform and accept commands from both PSYC and stdin
@@ -1487,6 +1504,7 @@ __END__
         [-n]ickname to use for monitoring, otherwise a default will be used
         [-s]ort playlist according to one of the algorithms explained below
         [-S]creen number to display videos on (default: 0)
+        [-t]imer in minutes, when to schedule a quit after start
 
  Flags:
         [-H] shows an explanation what this tool is good for, try it!