X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=19456874f615d5be8d898a9c88353362d2fdce6f;hp=b2d1cb201032b59dcb995ec1566d0423901652f5;hb=b8e18bed40c5ec5d39b19acc2e380b3efbd4b807;hpb=bb86a4168dde75bf8f5495b04ecbe44c3ce20741 diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index b2d1cb2..1945687 100644 --- a/lib/App/MusicExpo.pm +++ b/lib/App/MusicExpo.pm @@ -3,19 +3,20 @@ use v5.14; use strict; use warnings; -our $VERSION = 0.003001; +our $VERSION = '0.005'; use Audio::FLAC::Header qw//; use HTML::Template::Compiled qw//; use Memoize qw/memoize/; -use MP3::Tag qw//; +use MP3::Info qw/get_mp3tag/; use Ogg::Vorbis::Header::PurePerl; +use MP4::Info qw/get_mp4tag get_mp4info/; use DB_File qw//; +use Encode qw/encode/; use File::Basename qw/fileparse/; use Fcntl qw/O_RDWR O_CREAT/; use Getopt::Long; -use JSON; use Storable qw/thaw freeze/; ################################################## @@ -32,87 +33,111 @@ GetOptions ( "cache:s" => \$cache, ); - -sub fix{ - my $copy = $_[0]; - utf8::decode($copy); - $copy -} - sub flacinfo{ my $file=$_[0]; my $flac=Audio::FLAC::Header->new($file); - $file = scalar fileparse $file; freeze +{ format => 'FLAC', - title => fix ($flac->tags('TITLE') // '?'), - artist => fix ($flac->tags('ARTIST') // '?'), - year => fix ($flac->tags('DATE') // '?'), - album => fix ($flac->tags('ALBUM') // '?'), - tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'), - tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'), - genre => fix ($flac->tags('GENRE') // '?'), - file => $file, + title => $flac->tags('TITLE') // '?', + artist => $flac->tags('ARTIST') // '?', + year => $flac->tags('DATE') // '?', + album => $flac->tags('ALBUM') // '?', + tracknumber => $flac->tags('TRACKNUMBER') // '?', + tracktotal => $flac->tags('TRACKTOTAL') // '?', + genre => $flac->tags('GENRE') // '?', + file => scalar fileparse $file, } } sub mp3info{ my $file=$_[0]; - my $mp3=MP3::Tag->new($file); - $file = scalar fileparse $file; + my %tag = map { encode 'UTF-8', $_ } %{get_mp3tag $file}; + my @trkn = split '/', $tag{TRACKNUM} // ''; freeze +{ format => 'MP3', - title => fix ($mp3->title || '?'), - artist => fix ($mp3->artist || '?'), - year => fix ($mp3->year || '?'), - album => fix ($mp3->album || '?'), - tracknumber => fix ($mp3->track1 || '?'), - tracktotal => fix ($mp3->track2 || '?'), - genre => fix ($mp3->genre) || '?', - file => $file, + title => $tag{TITLE} || '?', + artist => $tag{ARTIST} || '?', + year => $tag{YEAR} || '?', + album => $tag{ALBUM} || '?', + tracknumber => $trkn[0] || '?', + tracktotal => $trkn[1] || '?', + genre => $tag{GENRE} || '?', + file => scalar fileparse $file, } } sub vorbisinfo{ my $file=$_[0]; my $ogg=Ogg::Vorbis::Header::PurePerl->new($file); - $file = scalar fileparse $file; freeze +{ format => 'Vorbis', - title => fix($ogg->comment('TITLE') || '?'), - artist => fix ($ogg->comment('artist') || '?'), - year => fix ($ogg->comment('DATE') || '?'), - album => fix ($ogg->comment('ALBUM') || '?'), - tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'), - tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'), - genre => fix ($ogg->comment('GENRE')) || '?', - file => $file, + title => $ogg->comment('TITLE') || '?', + artist => $ogg->comment('artist') || '?', + year => $ogg->comment('DATE') || '?', + album => $ogg->comment('ALBUM') || '?', + tracknumber => $ogg->comment('TRACKNUMBER') || '?', + tracktotal => $ogg->comment('TRACKTOTAL') || '?', + genre => $ogg->comment('GENRE') || '?', + file => scalar fileparse $file, } } +sub mp4_format ($){ + my $encoding = $_[0]; + return 'AAC' if $encoding eq 'mp4a'; + return 'ALAC' if $encoding eq 'alac'; + "MP4-$encoding" +} + +sub mp4info{ + my $file=$_[0]; + my %tag = map { ref() ? $_ : encode 'UTF-8', $_ } %{get_mp4tag $file}; + my %info = %{get_mp4info $file}; + + freeze +{ + format => mp4_format $info{ENCODING}, + title => $tag{TITLE} || '?', + artist => $tag{ARTIST} || '?', + year => $tag{YEAR} || '?', + album => $tag{ALBUM} || '?', + tracknumber => $tag{TRACKNUM} || '?', + tracktotal => ($tag{TRKN} ? $tag{TRKN}->[1] : undef) || '?', + genre => $tag{GENRE} || '?', + file => scalar fileparse $file, + }; +} + +my %info = ( + '.flac' => \&flacinfo, + '.mp3' => \&mp3info, + '.ogg' => \&vorbisinfo, + '.oga' => \&vorbisinfo, + '.mp4' => \&mp4info, + '.aac' => \&mp4info, + '.m4a' => \&mp4info, +); + sub normalizer{ "$_[0]|".(stat $_[0])[9] } +sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ } + sub run { - tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644 unless $cache eq ''; - memoize 'flacinfo', NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq ''; - memoize 'mp3info' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq ''; - memoize 'vorbisinfo' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq ''; + my %info = %info; + if ($cache) { + tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644; + $info{$_} = memoize $info{$_}, INSTALL => undef, NORMALIZER => \&normalizer, LIST_CACHE => 'FAULT', SCALAR_CACHE => [HASH => \%cache] for keys %info; + } my %files; for my $file (@ARGV) { - my $info; - $info = thaw flacinfo $file if $file =~ /.flac$/i; - $info = thaw mp3info $file if $file =~ /.mp3$/i; - $info = thaw vorbisinfo $file if $file =~ /.og(?:g|a)$/i; - next unless defined $info; - my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga'; + my ($basename, undef, $suffix) = fileparse $file, keys %info; $files{$basename} //= []; - push $files{$basename}, $info; + push @{$files{$basename}}, thaw scalar $info{$suffix}->($file); } my $ht=HTML::Template::Compiled->new( @@ -125,14 +150,19 @@ sub run { for (values %files) { my @versions = @$_; my %entry = (%{$versions[0]}, formats => []); - push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions; + for my $ver (@versions) { + push @{$entry{formats}}, {format => $ver->{format}, file => $ver->{file}}; + for my $key (keys %$ver) { + $entry{$key} = $ver->{$key} if $ver->{$key} ne '?'; + } + } + delete $entry{$_} for qw/format file/; + $entry{fragment} = make_fragment @entry{qw/artist title/}; push @files, \%entry } - my $json = JSON->new->utf8->canonical->encode({files => \@files, prefix => $prefix}); - $json =~ s//>/g; - $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix, json => $json); + @files = sort { $a->{title} cmp $b->{title} } @files; + $ht->param(files => \@files, prefix => $prefix); print $ht->output; } @@ -140,16 +170,17 @@ $default_template = <<'HTML'; Music - + + + +
-
TitleArtistAlbumGenreTrackYearType
/ +
/
- - HTML 1; @@ -206,7 +237,7 @@ Marius Gavrilescu, Emarius@ieval.roE =head1 COPYRIGHT AND LICENSE -Copyright (C) 2013 by Marius Gavrilescu +Copyright (C) 2013-2015 by Marius Gavrilescu This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.14.2 or,