Here's my hacked up multi-file support. Needs a lot of cleanup,

[flac-archive] / fa-flacd

diff --git a/fa-flacd b/fa-flacd
index cbcc5c6511906ec0030fdbe3b8d1169406e0219f..69566ac0f68e7a6ff4b6ee24834f2808305faaa5 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -1,18 +1,15 @@
 #! /usr/bin/env perl
 
 # $Id$
 #! /usr/bin/env perl
 
 # $Id$

+# $URL$

 
 =head1 NAME
 
 
 =head1 NAME
 

-B<fa-flacd>, B<fa-rip>, B<fa-tags> - archive CDs to single FLAC files
+B<fa-flacd> - archive CDs to single FLAC files

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<fa-flacd> [B<-jv>]
-
-B<fa-rip>
-
-B<fa-tags> ID TRACKCOUNT OFFSET [OFFSET ...] LENGTH
+B<fa-flacd> [B<-j> I<jobs>] [B<-v>]

 
 =cut
 
 
 =cut
 


@@ -20,17 +17,17 @@ use strict;
 use warnings;
 
 use File::Basename;
 use warnings;
 
 use File::Basename;

-use Getopt::Std; $Getopt::Std::STANDARD_HELP_VERSION = 1;
+use Getopt::Long qw(:config gnu_getopt no_ignore_case);

 use POSIX ':sys_wait_h';
 use POSIX ':sys_wait_h';

+use Pod::Usage;

 
 

-our $VERSION = 1;
-
+my $debug;

 my $verbose;
 my @jobs;
 my @finished;
 
 sub verbose {
 my $verbose;
 my @jobs;
 my @finished;
 
 sub verbose {

-    $verbose and map({ print(STDERR $_) } @_);
+    $verbose and print(STDERR $_) for @_;

 }
 
 # Return the ARTIST, ALBUM, and DATE followed by a list of all the
 }
 
 # Return the ARTIST, ALBUM, and DATE followed by a list of all the


@@ -41,7 +38,7 @@ sub get_tags {
     my $value;
     my $artist;
     my $album;
     my $value;
     my $artist;
     my $album;

-    my $date;
+    my $discnum;

     my @tags;
 
     verbose("Opening tags file $fn\n");
     my @tags;
 
     verbose("Opening tags file $fn\n");


@@ -52,20 +49,43 @@ sub get_tags {
 
         ($tag, $value) = split(/=/, $_, 2);
 
 
         ($tag, $value) = split(/=/, $_, 2);
 

-        if (/^ARTIST=/) {
+        if (/^ARTIST=/i) {

             $artist = $value;
             verbose("ARTIST $artist from $fn\n");
             $artist = $value;
             verbose("ARTIST $artist from $fn\n");

-        } elsif (/^ALBUM=/) {
+        } elsif (/^ALBUM=/i) {

             $album = $value;
             $album = $value;

-            verbose("ALBUM $album from $fn\n");
-        } elsif (/^DATE=/) {
-            $date = $value;
-            verbose("DATE $date from $fn\n");
+            verbose("ALBUM $album from $fn\n"); # cperl-mode sucks "
+        } elsif (/^DISCNUMBER=/i) {
+            $discnum = int($value);
+            verbose("DISCNUMBER $discnum from $fn\n");
+        }
+    }
+    close(TAGS) or die("close($fn): $!");
+
+    return ($artist, $album, $discnum, @tags);
+}
+
+# Hash of Hashes of Lists Push
+sub hhlp {
+    my $hash = shift;
+    my $key1 = shift;
+    my $key2 = shift;
+    my $val = shift;
+
+    return push(@{$hash->{$key1}->{$key2}}, $val);
+}
+
+sub bork_tags {
+    my $h = shift;
+    my @result;
+
+    while (my ($key, $vall) = each(%$h)) {
+        for my $val (@$vall) {
+            push(@result, "$key=$val")

         }
     }
         }
     }

-    close(TAGS);

 
 

-    return ($artist, $album, $date, @tags);
+    return @result;

 }
 
 # Process the fa-rip output in the directory DIR.
 }
 
 # Process the fa-rip output in the directory DIR.


@@ -73,54 +93,110 @@ sub flac {
     my $dir = shift;
     my $artist;
     my $album;
     my $dir = shift;
     my $artist;
     my $album;

-    my $date;
+    my $discnum;

     my @tags;
     my @tags;

+    my $outfile;

     my $status;
 
     verbose("Renaming $dir/tags\n");
     rename("$dir/tags", "$dir/using-tags")
       or die("rename($dir/tags, $dir/using-tags): $!");
 
     my $status;
 
     verbose("Renaming $dir/tags\n");
     rename("$dir/tags", "$dir/using-tags")
       or die("rename($dir/tags, $dir/using-tags): $!");
 

-    ($artist, $album, $date, @tags) = get_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): $!");
 

+    my $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): $!");
 

-    verbose("Running flac\n");
-    $status = system('flac', '-o', "../$artist/$album.flac-tmp",
-                     '--delete-input-file', '-V', '--cuesheet',
-                     'cue', '--no-padding', '--best',
-                     map({ ('-T', $_) } @tags),
-                     'wav');
-    if (WIFEXITED($status) and ($status = WEXITSTATUS($status)) != 0) {
-        die("flac: $status");
-    } elsif (WIFSIGNALED($status)) {
-        die("flac killed with signal ", WTERMSIG($status));
-    } elsif (WIFSTOPPED($status)) {
-        die("flac stopped with signal ", WSTOPSIG($status));
+    my @artist;
+    my %things;
+    my (@bork, @titles);
+    for my $tag (@tags) {
+        if ($tag =~ /^([^[]+)\[(\d+)]=(.*)/) {
+            hhlp(\%things, $2, $1, $3);
+        } elsif ($tag =~ /^ARTIST=/) {
+            push(@artist, $tag);
+        } else {
+            push(@bork, $tag);
+        }
+    }
+    @tags = @bork;
+
+    my @files;
+    for my $tracknum (sort(map(int, keys(%things)))) {
+        my $title = join(' ', map(split, @{$things{$tracknum}->{'TITLE'}}));
+        $title =~ s|/|_|g;
+        $outfile = join(' ',
+                        (defined($discnum)
+                         ? sprintf('%02d', $discnum)
+                         : ()),
+                        sprintf('%02d', $tracknum),
+                        $title);
+        push(@files, "$outdir/$outfile.flac");
+        $outfile = "../$outdir/$outfile";
+
+        my @lartist;
+        if (exists($things{$tracknum}->{'ARTIST'})) {
+            @lartist = ();
+        } else {
+            @lartist = @artist;
+        }
+
+        verbose("Running flac\n");
+        $status = system('flac', '-o', "$outfile.flac-tmp",
+                         '--delete-input-file', '-V', '--no-padding', '--best',
+                         map({ ('-T', $_) }
+                             @lartist,
+                             grep({ $_ !~ /^ARTIST=/ } @tags),
+                             bork_tags($things{$tracknum})),
+                         sprintf('track%02d.cdda.wav', $tracknum));
+        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): $!");

     }
 
     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('toc', "../$artist/$album.toc")
-      or die("rename(toc, ../$artist/$album.toc): $!");
-    rename('log', "../$artist/$album.log")
-      or die("rename(log, ../$artist/$album.log): $!");
+    rename('log', "../$outdir/log")
+      or die("rename(log, ../$outdir/log): $!");

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

+
+    if (-x "$dir/post-processor") {
+        verbose("Running './$dir/post-processor'\n");
+        system("./$dir/post-processor", @files);
+        unlink("$dir/post-processor") or die("unlink($dir/post-processor): $!");
+    }
+

     rmdir($dir) or die("rmdir($dir): $!");
 
     rmdir($dir) or die("rmdir($dir): $!");
 

-    rename("$artist/$album.flac-tmp", "$artist/$album.flac")
-      or die("rename($artist/$album.flac-tmp, $artist/$album.flac): $!");
+    return 0;

 }
 
 sub reaper {
     my $pid;
 
 }
 
 sub reaper {
     my $pid;
 

-    while (($pid = waitpid(0, WNOHANG)) > 0) {
+    while (($pid = waitpid(-1, WNOHANG)) > 0) {

         push(@finished, [$pid, $?]);
     }
 
         push(@finished, [$pid, $?]);
     }
 


@@ -131,14 +207,17 @@ sub newjob {
     my $dir = shift;
     my $pid;
 
     my $dir = shift;
     my $pid;
 

-    $pid = fork();
-    if ($pid == -1) {
-        die("fork: $!");
-    } elsif ($pid == 0) {
-        $SIG{CHLD} = 'IGNORE';
+    if (not $debug) {
+        $pid = fork();
+        if (not defined($pid)) {
+            die("fork: $!");
+        }
+    }
+
+    if ($debug or $pid == 0) {
+        $SIG{CHLD} = 'DEFAULT';

         open(STDERR, ">$dir/log") or die("open(STDERR, >$dir/log): $!");
         open(STDERR, ">$dir/log") or die("open(STDERR, >$dir/log): $!");

-        flac($dir);
-        exit(0);
+        exit(flac($dir));

     }
 
     verbose("new job $pid for $dir\n");
     }
 
     verbose("new job $pid for $dir\n");


@@ -152,15 +231,15 @@ sub deljob {
     my $status;
 
     $pid = $finished[$i][0];
     my $status;
 
     $pid = $finished[$i][0];

-    $status = WEXITSTATUS($finished[$i][1]);
+    $status = $finished[$i][1];

 
     verbose("$pid finished (");
     if (WIFEXITED($status)) {
 
     verbose("$pid finished (");
     if (WIFEXITED($status)) {

-        verbose('exited ', WEXITSTATUS($status));
+        verbose('exited with status ', WEXITSTATUS($status));

     } elsif (WIFSIGNALED($status)) {
     } elsif (WIFSIGNALED($status)) {

-        verbose('signalled ', WTERMSIG($status));
+        verbose('killed with signal ', WTERMSIG($status));

     } elsif (WIFSTOPPED($status)) {
     } elsif (WIFSTOPPED($status)) {

-        verbose('stopped ', WSTOPSIG($status));
+        verbose('stopped with signal ', WSTOPSIG($status));

     }
     verbose(")\n");
 
     }
     verbose(")\n");
 


@@ -195,18 +274,19 @@ sub flacloop {
 }
 
 MAIN: {
 }
 
 MAIN: {

-    my %opts;
-
-    $opts{'j'} = 4;
-    $opts{'v'} = 0;
-    if (not getopts('j:v', \%opts)) {
-        print("usage: flacd [-jN -v]\n");
-        exit(2);
-    }
-
-    $verbose = $opts{'v'};
-
-    flacloop($opts{'j'});
+    my $jobs;
+    my $help;
+
+    $jobs = 4;
+    GetOptions(
+               'debug|X' => \$debug,
+               'jobs|j=i' => \$jobs,
+               'verbose|v' => \$verbose,
+               'help|h|?' => \$help,
+              ) or pod2usage();
+    $help and pod2usage(-exitstatus=>0, -verbose=>1);
+
+    flacloop($jobs);

 }
 
 \f
 }
 
 \f


@@ -214,29 +294,23 @@ __END__
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-B<fa-flacd>, B<fa-rip>, and B<fa-tags> together comprise
-B<flac-archive>, a system for archiving audio CDs to single FLAC
-files.  B<fa-flacd> is the guts of the system.  It runs in the
-directory where the audio archives are stored, scanning for new CDs to
-encode and rename; it never exits.  B<fa-rip> generates the inputs for
-B<fa-flacd>: the ripped WAV file, Vorbis tags, and a cuesheet.
-B<fa-tags> is not meant to be run directly; B<fa-rip> uses it to
-generate the candidate Vorbis tags.
-
-All three programs expect to be run from the same directory.  They use
-that directory to manage directories named by artist and by disc ID.
-Intermediate files are written to the disc ID directory.  B<fa-flacd>
-processes the disc ID directories into per-album files in the artist
-directories.
-
-=head2 FA-FLACD
-
-B<fa-flacd> does not exit; it runs until the user kills it.  Every 5
-seconds it scans its current directory for directories with a file
-called "tags" and creates a processing job for each one.  The number
-of jobs B<fa-flacd> attempts to run is controlled by the B<-j> option
-and defaults to 4.  B<fa-flacd> will print diagnostic output when the
-B<-v> option is given.
+B<fa-flacd> and B<fa-rip> together comprise B<flac-archive>, a system
+for archiving audio CDs to single FLAC files.  B<fa-flacd> is the guts
+of the system.  It runs in the directory where the audio archives are
+stored, scanning for new ripped CDs to encode and rename; it never
+exits.  B<fa-rip> generates the inputs for B<fa-flacd>: the ripped WAV
+file, Vorbis tags, and a cuesheet.
+
+Both programs expect to be run from the same directory.  They use that
+directory to manage directories named by artist.  Intermediate files
+are written to temporary directories here.  B<fa-flacd> processes the
+temporary directories into per-album files in the artist directories.
+
+Every 5 seconds, B<fa-flacd> scans its current directory for
+directories with a file called "tags" and creates a processing job for
+each one.  The number of jobs B<fa-flacd> attempts to run is
+controlled by the B<-j> option and defaults to 4.  B<fa-flacd> will
+print diagnostic output when the B<-v> option is given.

 
 A processing job first renames the directory's "tags" file to
 "using-tags" so that B<ra-flacd> will not try to start another job for
 
 A processing job first renames the directory's "tags" file to
 "using-tags" so that B<ra-flacd> will not try to start another job for


@@ -245,65 +319,41 @@ so a new job will not be started until the user corrects the error
 condition and renames "using-tags" back to "tags".  Next, it encodes
 the "wav" file to a FLAC file, using the "cue" file for the cuesheet
 and "using-tags" for Vorbis tags.  Any diagnostic output is saved in
 condition and renames "using-tags" back to "tags".  Next, it encodes
 the "wav" file to a FLAC file, using the "cue" file for the cuesheet
 and "using-tags" for Vorbis tags.  Any diagnostic output is saved in

-the "log" file.  Finally, the "cue" and "log" files are moved to the
-artist directory (and named by album) and the ID directory is removed.
-
-=head2 FA-RIP
-
-B<fa-rip> uses C<cd-discid(1)> to retrieve the disc ID and track
-information.  It creates a directory named by ID for storage of its
-intermediate files.  It passes the C<cd-discid(1)> output as
-command-line arguments to B<fa-tags> in the background.  It then uses
-C<cdrdao(1)> to create the "cue" file in the background.  Finally, it
-execs C<cdparanoia(1)> to rip the CD to the "wav" file.
-
-In order for this CD to be processed by B<fa-flacd>, the user must
-create a "tags" file.  This is usually done by renaming one of the
-candidate-tags files and deleting the others.
-
-=head2 FA-TAGS
-
-B<fa-tags> uses C<cddb-tool(1)> (from the B<abcde> package) to
-populate candidate-tags files.  These are numbered in the order of
-entries read from CDDB, e.g. candidate-tags-1, candidate-tags-2, etc.
-B<fa-tags> also creates candidate-tags-0, which has the correct fields
-for this CD (including correct number of TITLE= lines), but with all
-fields blank.
-
-B<fa-tags> expects the output of C<cd-discid(1)> as command-line
-arguments.  That is, the disc ID, number of tracks, list of track
-offsets, and total length of the CD in seconds.
-
-=head1 ENVIRONMENT
+the "log" file.  Finally, B<fa-flacd> moves the "cue" and "log" files
+to the artist directory (named by album) and removes the temporary
+directory.
+
+If the temporary directory contains an executable file named
+"post-processor", B<fa-flacd> executes that file with the relative
+path to the output FLAC file as an argument.  The output files are in
+their final location when "post-processor" starts.  Possible uses are
+running B<flac2mp3>, moving the output files to a different location,
+removing the lock file, or adding to a database.  The standard input,
+output, and error streams are inherited from B<fa-flacd>, so they may
+be connected to anything from a tty to /dev/null.  This means that you
+may want to redirect these streams, if you want to save them or do any
+logging.
+
+=head1 OPTIONS

 
 =over 4
 
 
 =over 4
 

-=item CDDBURL
+=item B<-j> [B<--jobs>] I<jobs>

 
 

-B<fa-tags> uses this to retrieve candidate Vorbis tags.  Defaults to
-"http://freedb.freedb.org/~cddb/cddb.cgi".
+Run up to I<jobs> jobs instead of the default 4.

 
 

-=item CDDEV
+=item B<-v> [B<--verbose>]

 
 

-B<fa-rip> uses this to rip audio and save the cuesheet for a CD.  It
-makes some effort to check some common device names for FreeBSD,
-Linux, and NetBSD by default.
+Print diagnostic information.

 
 =back
 
 =head1 AUTHORS
 
 
 =back
 
 =head1 AUTHORS
 

-Written by Eric Gillespie <epg@pretzelnet.org>.  B<fa-tags> contains
-code from B<abcde>, which bears the following notice:
-
-# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
-# Copyright (c) 2003-2004 Jesus Climent <jesus.climent@hispalinux.es>
-# This code is hereby licensed for public consumption under either the
-# GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
+Written by Eric Gillespie <epg@pretzelnet.org>.

 
 

-B<flac-archive> is hereby licensed for public consumption under either
-the GNU GPL v2 or greater, or Larry Wall's Artistic license - your
-choice.
+flac-archive is free software; you may redistribute it and/or modify
+it under the same terms as Perl itself.

 
 =cut
 
 
 =cut