X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/db3e715b108d452dd08452fcd5f0561b3122a223..568f0f82fb4def9061c8586add92fc97636f4d64:/fa-encode?ds=sidebyside

diff --git a/fa-encode b/fa-encode
index 5413ce0..10210b9 100755
--- a/fa-encode
+++ b/fa-encode
@@ -23,7 +23,9 @@ use warnings;
 use FindBin;
 use Pod::Usage;
 
-require "$FindBin::Bin/tags.pl";
+use lib $FindBin::Bin;
+
+require 'tags.pl';
 epg::flac::archive::tags->import(
     qw[
         read_tags
@@ -32,6 +34,18 @@ epg::flac::archive::tags->import(
         two_digits
     ]);
 
+sub filename {
+    my %a = @_;
+    my @discnumber = @{$a{discnumber} // []};
+    my $tracknumber = $a{tracknumber} // die('tracknumber required');
+    my $title = $a{title} // die('title required');
+    join('-',
+         (map { two_digits($_) } @discnumber),
+         two_digits($tracknumber),
+         mangle_for_file_name($title) . '.flac',
+        )
+}
+
 sub main {
     my $input_directory = shift || pod2usage();
     my $fn = "$input_directory/tags";
@@ -65,6 +79,7 @@ sub main {
     my $dir = join('/', '..', mangle_for_file_name($artist), mangle_for_file_name($album_tag));
 
     say('set -ex');
+    say('cd ', quote($input_directory));
     say('mkdir -p ', quote($dir));
     my $tracknum = 0;
     for my $track (@$tracks) {
@@ -84,17 +99,17 @@ sub main {
             $track->{DISCNUMBER} = \@discnumber;
         }
         my $title = join(' ', @{$track->{TITLE}});
-        my $tracknum_s = two_digits($tracknum);
         my $fn = join('/',
                       $dir,
-                      join('_',
-                           (map { two_digits($_) } @discnumber),
-                           $tracknum_s,
-                           mangle_for_file_name($title) . '.flac',
+                      filename(
+                          discnumber => \@discnumber,
+                          tracknumber => $tracknum,
+                          title => $title,
                       ),
             );
         -e $fn && die("cowardly refusing to clobber $fn");
         my @pictures = ('--picture', quote('3|image/jpeg|||cover.front.jpeg')); # TODO optional
+        my $tracknum_s = two_digits($tracknum);
         say(join(' ',
                  'flac -o',
                  quote($fn),