Untested: make multi-file the default with a single-file option.

[flac-archive] / fa-flacd

diff --git a/fa-flacd b/fa-flacd
index 3c3637241b12b2ea8cac3b8227cf8572a4e18ead..69566ac0f68e7a6ff4b6ee24834f2808305faaa5 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -65,6 +65,29 @@ sub get_tags {
     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")
+        }
+    }
+
+    return @result;
+}
+
 # Process the fa-rip output in the directory DIR.
 sub flac {
     my $dir = shift;
@@ -80,48 +103,88 @@ sub flac {
       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): $!");
 
+    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): $!");
 
-    $outfile = "$album";
-    defined($discnum) and $outfile .= " (disc $discnum)";
-    $outfile =~ s/\//_/g;
+    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', "../$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");
+        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): \$? = $? \$! = $!");
         }
-    } 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): $!");
-    rename('log', "../$artist/$outfile.log")
-      or die("rename(log, ../$artist/$outfile.log): $!");
+    rename('log', "../$outdir/log")
+      or die("rename(log, ../$outdir/log): $!");
     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") {
-        verbose("Running './$dir/post-processor $artist/$outfile.flac'\n");
-        system("./$dir/post-processor", "$artist/$outfile.flac");
+        verbose("Running './$dir/post-processor'\n");
+        system("./$dir/post-processor", @files);
         unlink("$dir/post-processor") or die("unlink($dir/post-processor): $!");
     }
 
@@ -152,7 +215,7 @@ sub newjob {
     }
 
     if ($debug or $pid == 0) {
-        $SIG{CHLD} = 'IGNORE';
+        $SIG{CHLD} = 'DEFAULT';
         open(STDERR, ">$dir/log") or die("open(STDERR, >$dir/log): $!");
         exit(flac($dir));
     }