Fix single-digit track numbers in flac2mp3.

[flac-archive] / fa-encode

diff --git a/fa-encode b/fa-encode
index c18b1bc18a5e9a5e0df39e327403eb13ef3dd89e..1401775f28e118009347f9d492b7d1ace099b4aa 100755 (executable)
--- a/fa-encode
+++ b/fa-encode
@@ -15,47 +15,6 @@ TODO:  implement B<-d>
 
 =cut
 
 
 =cut
 

-# POSIX.1-2017, Base Definitions, 3.282  Portable Filename Character Set says
-#   [A-Za-z0-9._-]
-# https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282
-
-# Flac tags (set with `flac -T fieldname=...`) are Vorbis comments.
-# https://www.xiph.org/vorbis/doc/v-comment.html#fieldnames field names we care about:
-# - TITLE - Track/Work name
-# - VERSION - may be used to differentiate multiple versions of the same track title in a single collection. (e.g. remix info)
-# - ALBUM - The collection name to which this track belongs
-# - TRACKNUMBER - The track number of this piece
-# - ARTIST - The artist generally considered responsible for the track
-# - DATE - Date the track was recorded (XXX I use US release date)
-# I use one more, though I'm unsure where I got it.  Did I make it up?
-# - DISCNUMBER - number in multi-disc collection
-
-# Input is a directory containing:
-# - trackNN.cdda.wav - WAV  format files ripped from CD-DA audio tracks where NN is track number 01 - 99
-# - tags - described below
-# - cover.front.jpeg - optional JPEG format file containing the album front cover
-
-# The tags file is composed of two blocks:
-# 1. album tags
-# 2. track tags
-# Album tags may be:
-# - ALBUM
-# - ARTIST
-# - DATE
-# - DISCNUMBER (optional)
-
-# Track tags may be any of the rest of the tags listed above, suffixed with
-# [N] where N is the track number.  ARTIST, and only ARTIST, may also appear
-# in the track tags.  In this case, it overrides the album artist.  In order
-# to add artists, the album artist must be listed again.  For example, Reba
-# McEntire's "The Heart Won't Lie" on the album "It's Your Call" features
-# Vince Gill, and is specified as:
-# ARTIST=Reba McEntire
-# ALBUM=It's Your Call
-# TITLE[5]=The Heart Won't Lie
-# ARTIST[5]=Reba McEntire
-# ARTIST[5]=Vince Gill
-

 package epg::flac::archive::encode;
 
 use v5.12;
 package epg::flac::archive::encode;
 
 use v5.12;


@@ -69,6 +28,7 @@ epg::flac::archive::tags->import(
         read_tags
         mangle_for_file_name
         quote
         read_tags
         mangle_for_file_name
         quote

+        two_digits

     ]);
 
 sub main {
     ]);
 
 sub main {


@@ -123,17 +83,17 @@ sub main {
             $track->{DISCNUMBER} = \@discnumber;
         }
         my $title = join(' ', @{$track->{TITLE}});
             $track->{DISCNUMBER} = \@discnumber;
         }
         my $title = join(' ', @{$track->{TITLE}});

-        my $tracknum_s = sprintf('%02d', $tracknum);
+        my $tracknum_s = two_digits($tracknum);

         my $fn = join('/',
                       $dir,
                       join('_',
         my $fn = join('/',
                       $dir,
                       join('_',

-                           (map { sprintf('%02d', $_) } @discnumber),
+                           (map { two_digits($_) } @discnumber),

                            $tracknum_s,
                            mangle_for_file_name($title) . '.flac',
                       ),
             );
         -e $fn && die("cowardly refusing to clobber $fn");
                            $tracknum_s,
                            mangle_for_file_name($title) . '.flac',
                       ),
             );
         -e $fn && die("cowardly refusing to clobber $fn");

-        my @pictures = ('--picture', quote('3|image/jpeg|||cover.front')); # TODO optional
+        my @pictures = ('--picture', quote('3|image/jpeg|||cover.front.jpeg')); # TODO optional

         say(join(' ',
                  'flac -o',
                  quote($fn),
         say(join(' ',
                  'flac -o',
                  quote($fn),


@@ -151,7 +111,7 @@ sub main {
                  "track$tracknum_s.cdda.wav"
             ));
     }
                  "track$tracknum_s.cdda.wav"
             ));
     }

-    say('rm tags cover.front');
+    say('rm tags cover.front.jpeg');

 
     return 0;
 }
 
     return 0;
 }


@@ -161,4 +121,3 @@ if (!caller) {
 }
 
 1;
 }
 
 1;

-