From: Eric Gillespie Date: Mon, 21 Mar 2022 02:07:13 +0000 (-0500) Subject: perltidy -bt=2 -pt=2 -nvc X-Git-Url: https://diplodocus.org/git/flac-archive/commitdiff_plain/cd6b00d1cf4de2e18326ceb94a32366dbd4cd228?ds=inline;hp=8a6d2345b45def0b0bd302194d8cef67b67faf64 perltidy -bt=2 -pt=2 -nvc --- diff --git a/flac2mp3 b/flac2mp3 index fd0b148..c8e9d11 100755 --- a/flac2mp3 +++ b/flac2mp3 @@ -58,64 +58,72 @@ use FindBin; require "$FindBin::Bin/tags.pl"; epg::flac::archive::tags->import( qw[ - track_tags - read_tags_metaflac - mangle_for_file_name - quote - two_digits - ]); + track_tags + read_tags_metaflac + mangle_for_file_name + quote + two_digits + ] +); sub flac2mp3 { my $mp3 = shift; my $flac = shift; my $tags = shift; + # This is an old TODO; what's wrong with --ty ? # TODO: Look at TDOR, TDRL, TDRC for date. - say(join(' ', - 'flac', - '-cd', - quote($flac), - '|', - 'lame', - '--id3v2-only', - '--id3v2-latin1', - '--pad-id3v2-size', 0, - '--preset standard', - '--ta', - quote($tags->{artist}), - '--tl', - quote($tags->{album}), - '--tn', - quote($tags->{tracknumber}), - '--tt', - quote($tags->{title}), - '--ty', - quote($tags->{date}), - '$pic_options', - #(map { ('--tv', quote("TPE2=$_")) } @{$albumartist}), - (map { ('--tv', quote("TPOS=$_")) } @{$tags->{discnumber}}), - '-', - quote($mp3), - )) + say( + join( + ' ', + 'flac', + '-cd', + quote($flac), + '|', + 'lame', + '--id3v2-only', + '--id3v2-latin1', + '--pad-id3v2-size', 0, + '--preset standard', + '--ta', + quote($tags->{artist}), + '--tl', + quote($tags->{album}), + '--tn', + quote($tags->{tracknumber}), + '--tt', + quote($tags->{title}), + '--ty', + quote($tags->{date}), + '$pic_options', + + #(map { ('--tv', quote("TPE2=$_")) } @{$albumartist}), + (map { ('--tv', quote("TPOS=$_")) } @{$tags->{discnumber}}), + '-', + quote($mp3), + ) + ); } sub main { for my $flac (@_) { - say('metaflac --export-picture-to=flac2mp3.cover.$$ ', quote($flac), ' && pic_options="--ti flac2mp3.cover.$$"'); + say('metaflac --export-picture-to=flac2mp3.cover.$$ ', + quote($flac), ' && pic_options="--ti flac2mp3.cover.$$"'); my %tags = track_tags(read_tags_metaflac($flac)); flac2mp3( mangle_for_file_name( join(' ', - $tags{artist}, - $tags{album}, - (map { two_digits($_) } @{$tags{discnumber}}), - two_digits($tags{tracknumber}), - $tags{title}, - )) - . '.mp3', + $tags{artist}, + $tags{album}, + (map { two_digits($_) } @{$tags{discnumber}}), + two_digits($tags{tracknumber}), + $tags{title}, + ) + ) + . '.mp3', $flac, \%tags, - ); + ); say('unset pic_options'); } say('rm -f flac2mp3.cover.$$'); @@ -124,7 +132,7 @@ sub main { } if (!caller) { - exit(main(@ARGV)) + exit(main(@ARGV)); } 1;