Improve Jobs package:

[flac-archive] / fa-flacd

diff --git a/fa-flacd b/fa-flacd
index 3c3637241b12b2ea8cac3b8227cf8572a4e18ead..20641358e068227c450e8cb94f7bbc500f6af7cc 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -13,6 +13,107 @@ B<fa-flacd> [B<-j> I<jobs>] [B<-v>]
 
 =cut
 
 
 =cut
 

+package Jobs;
+
+use strict;
+use warnings;
+
+use Errno;
+use POSIX ':sys_wait_h';
+
+sub newjob {
+    my $f = shift;
+    my $jobs = shift;
+    my $debug = shift;
+    my $pid;
+
+    if (not $debug) {
+        $pid = fork();
+        if (not defined($pid)) {
+            die("fork: $!");
+        }
+    }
+
+    if ($debug or $pid == 0) {
+        exit($f->());
+    }
+
+    if ($pid == 0) {
+        exit($f->());
+    }
+
+    push(@$jobs, $pid);
+
+    return $pid;
+}
+
+sub deljob {
+    my $pid = shift;
+    my $status = shift;
+    my $jobs = shift;
+
+    for (my $i = 0; $i <= $#$jobs; $i++) {
+        if ($pid == $jobs->[$i]) {
+            splice(@$jobs, $i, 1);
+            last;
+        }
+    }
+
+    return ($pid, $status);
+}
+
+sub run {
+    my %o = @_;
+    my $maxjobs = $o{'max-jobs'};
+    my $get_job = $o{'get-job'};
+    my $notify_start = $o{'notify-start'};
+    my $notify_finish = $o{'notify-finish'};
+    my @jobs;
+    my $pid;
+
+    # Call notifier function if given.
+    sub call {
+        my $f = shift or return;
+        ref($f) eq 'CODE' or return;
+        $f->(@_);
+    }
+
+    while (1) {
+        if (@jobs <= $maxjobs) {
+            my $job;
+            while (defined($job = $get_job->())) {
+                $pid = newjob($job, \@jobs, $o{'debug'});
+                call($notify_start, $pid, @jobs);
+                @jobs < $maxjobs or last;
+            }
+
+            # No jobs running and get-job returned undef; we're finished.
+            if (@jobs == 0 and not defined($job)) {
+                return;
+            }
+        }
+
+        # Now running as many jobs as we can, block waiting for one to die.
+        do {
+            $pid = waitpid(-1, 0);
+        } while ($pid == 0
+                 or ($pid == -1 and ($!{ECHILD} or $!{EINTR})));
+        $pid == -1 and die("waitpid(-1): $!");
+
+        # Before starting more, see if any others have finished.
+        do {
+            call($notify_finish, deljob($pid, $?, \@jobs), @jobs);
+        } while (($pid = waitpid(-1, WNOHANG)) > 0);
+        if ($pid == -1) {
+            $!{ECHILD} or $!{EINTR} or die("waitpid(-1): $!");
+        }
+    }
+}
+
+\f
+################################################################################
+package main;
+

 use strict;
 use warnings;
 
 use strict;
 use warnings;
 


@@ -23,8 +124,6 @@ use Pod::Usage;
 
 my $debug;
 my $verbose;
 
 my $debug;
 my $verbose;

-my @jobs;
-my @finished;

 
 sub verbose {
     $verbose and print(STDERR $_) for @_;
 
 sub verbose {
     $verbose and print(STDERR $_) for @_;


@@ -65,6 +164,51 @@ sub get_tags {
     return ($artist, $album, $discnum, @tags);
 }
 
     return ($artist, $album, $discnum, @tags);
 }
 

+sub track_tags {
+    my $h = shift;
+    my @result;
+
+    while (my ($key, $vall) = each(%$h)) {
+        for my $val (@$vall) {
+            push(@result, "$key=$val")
+        }
+    }
+
+    return @result;
+}
+
+sub run_flac {
+    my $infile = shift;
+    my $cue = shift;
+    my $outfile = shift;
+
+    my @cue;
+    if (defined($cue)) {
+        @cue = ('--cuesheet', $cue);
+    }
+
+    verbose("Running flac\n");
+    my $status = system('flac', '-o', "$outfile.flac-tmp",
+                     '--delete-input-file', '-V', '--no-padding', '--best',
+                     @cue,
+                     map({ ('-T', $_) } @_),
+                     $infile);
+    if (WIFEXITED($status)) {
+        if (($status = WEXITSTATUS($status)) != 0) {
+            die("flac exited with status $status");
+        }
+    } elsif (WIFSIGNALED($status)) {
+        die("flac killed with signal ", WTERMSIG($status));
+    } elsif (WIFSTOPPED($status)) {
+        die("flac stopped with signal ", WSTOPSIG($status));
+    } else {
+        die("Major horkage on system(flac): \$? = $? \$! = $!");
+    }
+
+    rename("$outfile.flac-tmp", "$outfile.flac")
+      or die("rename($outfile.flac-tmp, $outfile.flac): $!");
+}
+

 # Process the fa-rip output in the directory DIR.
 sub flac {
     my $dir = shift;
 # Process the fa-rip output in the directory DIR.
 sub flac {
     my $dir = shift;


@@ -72,56 +216,100 @@ sub flac {
     my $album;
     my $discnum;
     my @tags;
     my $album;
     my $discnum;
     my @tags;

+    my $single_file = -e "$dir/wav";
+    my $outdir;

     my $outfile;
     my $outfile;

-    my $status;
+    my $outlog;
+    my @files;

 
     verbose("Renaming $dir/tags\n");
     rename("$dir/tags", "$dir/using-tags")
       or die("rename($dir/tags, $dir/using-tags): $!");
 
     ($artist, $album, $discnum, @tags) = get_tags("$dir/using-tags");
 
     verbose("Renaming $dir/tags\n");
     rename("$dir/tags", "$dir/using-tags")
       or die("rename($dir/tags, $dir/using-tags): $!");
 
     ($artist, $album, $discnum, @tags) = get_tags("$dir/using-tags");

+    for ($artist, $album) {
+        s|/|_|g;
+    }

 
     verbose("mkdir($artist)\n");
     -d $artist or mkdir($artist) or die("mkdir($artist): $!");
 
 
     verbose("mkdir($artist)\n");
     -d $artist or mkdir($artist) or die("mkdir($artist): $!");
 

+    if (not $single_file) {
+        $outdir = "$artist/$album";
+        verbose("mkdir($outdir)\n");
+        -d "$outdir" or mkdir("$outdir") or die("mkdir($outdir): $!");
+    }
+

     verbose("chdir($dir)\n");
     chdir($dir) or die("chdir($dir): $!");
 
     verbose("chdir($dir)\n");
     chdir($dir) or die("chdir($dir): $!");
 

-    $outfile = "$album";
-    defined($discnum) and $outfile .= " (disc $discnum)";
-    $outfile =~ s/\//_/g;
+    if ($single_file) {
+        $outfile = $album;
+        defined($discnum) and $outfile .= " (disc $discnum)";
+        run_flac('wav', 'cue', "../$artist/$outfile", @tags);
+        $outlog = "../$artist/$outfile.log";
+        @files = ("$artist/$outfile.flac");
+    } else {
+        # Go over @tags, store all [n] tags in a list keyed by n in
+        # %tracks_to_tags, store all ARTIST (not ARTIST[n]) tags in
+        # @disc_artist, and leave the rest in @tags.
+        my %tracks_to_tags;
+        my @disc_artist;
+        my @tmp;
+        for my $tag (@tags) {
+            if ($tag =~ /^([^[]+)\[(\d+)]=(.*)/) {
+                push(@{$tracks_to_tags{$2}->{$1}}, $3);
+            } elsif ($tag =~ /^ARTIST=/) {
+                push(@disc_artist, $tag);
+            } else {
+                push(@tmp, $tag);
+            }
+        }
+        @tags = @tmp;
+
+        for my $tracknum (sort(map(int, keys(%tracks_to_tags)))) {
+            my $title = join(' ', map(split, @{$tracks_to_tags{$tracknum}->{'TITLE'}}));
+            $title =~ s|/|_|g;
+            $outfile = join('/',
+                            $outdir,
+                            join(' ',
+                                 (defined($discnum)
+                                  ? sprintf('%02d', $discnum)
+                                  : ()),
+                                 sprintf('%02d', $tracknum),
+                                 $title));
+
+            # If we have ARTIST[n] tags for this track, set
+            # @track_artist to the empty list; they will go in along
+            # with the other [n] tags.
+            my @track_artist;
+            if (exists($tracks_to_tags{$tracknum}->{'ARTIST'})) {
+                @track_artist = ();
+            } else {
+                @track_artist = @disc_artist;
+            }

 
 

-    verbose("Running flac\n");
-    $status = system('flac', '-o', "../$artist/$outfile.flac-tmp",
-                     '--delete-input-file', '-V', '--cuesheet',
-                     'cue', '--no-padding', '--best',
-                     map({ ('-T', $_) } @tags),
-                     'wav');
-    if (WIFEXITED($status)) {
-        if (($status = WEXITSTATUS($status)) != 0) {
-            die("flac exited with status $status");
+            run_flac(sprintf('track%02d.cdda.wav', $tracknum), undef,
+                     "../$outfile",
+                     @track_artist,
+                     @tags,
+                     "TRACKNUMBER=$tracknum",
+                     track_tags($tracks_to_tags{$tracknum}));
+            push(@files, "$outfile.flac");

         }
         }

-    } elsif (WIFSIGNALED($status)) {
-        die("flac killed with signal ", WTERMSIG($status));
-    } elsif (WIFSTOPPED($status)) {
-        die("flac stopped with signal ", WSTOPSIG($status));
-    } else {
-        die("Major horkage on system(flac): \$? = $? \$! = $!");
+        $outlog = "../$outdir/log";

     }
 
     verbose("Cleaning up $dir\n");
     unlink('using-tags') or die("unlink(using-tags): $!");
     unlink('cue') or die("unlink(cue): $!");
     }
 
     verbose("Cleaning up $dir\n");
     unlink('using-tags') or die("unlink(using-tags): $!");
     unlink('cue') or die("unlink(cue): $!");

-    rename('log', "../$artist/$outfile.log")
-      or die("rename(log, ../$artist/$outfile.log): $!");
+    rename('log', $outlog)
+      or die("rename(log, $outlog): $!");

     chdir('..') or die("chdir(..): $!");
 
     chdir('..') or die("chdir(..): $!");
 

-    rename("$artist/$outfile.flac-tmp", "$artist/$outfile.flac")
-      or die("rename($artist/$outfile.flac-tmp, $artist/$outfile.flac): $!");
-

     if (-x "$dir/post-processor") {
     if (-x "$dir/post-processor") {

-        verbose("Running './$dir/post-processor $artist/$outfile.flac'\n");
-        system("./$dir/post-processor", "$artist/$outfile.flac");
+        verbose(join(' ', "Running ./$dir/post-processor", @files), "\n");
+        system("./$dir/post-processor", @files);

         unlink("$dir/post-processor") or die("unlink($dir/post-processor): $!");
     }
 
         unlink("$dir/post-processor") or die("unlink($dir/post-processor): $!");
     }
 


@@ -130,83 +318,48 @@ sub flac {
     return 0;
 }
 
     return 0;
 }
 

-sub reaper {
-    my $pid;
-
-    while (($pid = waitpid(-1, WNOHANG)) > 0) {
-        push(@finished, [$pid, $?]);
-    }
-
-    $SIG{CHLD} = \&reaper;
-}
-
-sub newjob {
-    my $dir = shift;
-    my $pid;
-
-    if (not $debug) {
-        $pid = fork();
-        if (not defined($pid)) {
-            die("fork: $!");
-        }
-    }
-
-    if ($debug or $pid == 0) {
-        $SIG{CHLD} = 'IGNORE';
-        open(STDERR, ">$dir/log") or die("open(STDERR, >$dir/log): $!");
-        exit(flac($dir));
-    }
-
-    verbose("new job $pid for $dir\n");
-    return $pid;
-}
-
-sub deljob {
-    my $i = shift;
-    my $j;
-    my $pid;
-    my $status;
-
-    $pid = $finished[$i][0];
-    $status = $finished[$i][1];
-
-    verbose("$pid finished (");
-    if (WIFEXITED($status)) {
-        verbose('exited with status ', WEXITSTATUS($status));
-    } elsif (WIFSIGNALED($status)) {
-        verbose('killed with signal ', WTERMSIG($status));
-    } elsif (WIFSTOPPED($status)) {
-        verbose('stopped with signal ', WSTOPSIG($status));
-    }
-    verbose(")\n");
-
-    for ($j = 0; $j <= $#jobs; $j++) {
-        $pid == $jobs[$j] and splice(@jobs, $j, 1) and last;
-    }
-
-    splice(@finished, $i, 1);
-}
-

 sub flacloop {
     my $MAXJOBS = shift;
 sub flacloop {
     my $MAXJOBS = shift;

-    my $i;
-    my $j;
+    my @jobs;
+    my $dir;

 
 

-
-    $SIG{CHLD} = \&reaper;

     while (1) {
     while (1) {

-        if (scalar(@jobs) <= $MAXJOBS) {
-            foreach $i (glob('*/tags')) {
-                push(@jobs, newjob(dirname($i))) <= $MAXJOBS or last;
-            }
-        }
-
-        for ($i = 0; $i <= $#finished; $i++) {
-            deljob($i);
+        if (scalar(@jobs = glob('*/tags')) == 0) {
+            sleep(5);
+            next;

         }
 
         }
 

-        verbose(scalar(@jobs), " jobs\n");
-        sleep(5);
+        Jobs::run('max-jobs'=>$MAXJOBS,
+                  'debug'=>$debug,
+                  'get-job'=>sub {
+                      my $bork = shift(@jobs) or return;
+                      $dir = dirname($bork);
+                      return sub {
+                          open(STDERR, ">$dir/log")
+                            or die("open(STDERR, >$dir/log): $!");
+                          return flac($dir);
+                      }
+                  },
+
+                  'notify-start'=>sub {
+                      my $pid = shift;
+                      verbose("new job $pid for $dir\n");
+                      verbose(scalar(@_), " jobs\n");
+                  },
+
+                  'notify-finish'=>sub {
+                      my $pid = shift;
+                      my $status = shift;
+                      verbose("$pid finished (");
+                      if (WIFEXITED($status)) {
+                          verbose('exited with status ', WEXITSTATUS($status));
+                      } elsif (WIFSIGNALED($status)) {
+                          verbose('killed with signal ', WTERMSIG($status));
+                      } elsif (WIFSTOPPED($status)) {
+                          verbose('stopped with signal ', WSTOPSIG($status));
+                      }
+                      verbose(")\n");
+                  });

     }
 }
 
     }
 }