Add MP4 support

diff --git a/Makefile.PL b/Makefile.PL
index f49ecc6922f8f530d0db7da0e260f26cc1429f06..41dbd892f88685649b8704b51e9d914e1edff4db 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,6 +15,7 @@ WriteMakefile(
                   HTML::Template::Compiled      0
                   Memoize                       0
                   MP3::Tag                      1.12
+                  MP4::Info                     0
                   JSON::MaybeXS                 0
                   DB_File                       0
                   Ogg::Vorbis::Header::PurePerl 0/,

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 7b5f4e2f46d7ba70d0bcb3b7852f03d1b81afb9c..ebee6efc784f18ae802565dcc0c3a02a79fd8e81 100644 (file)
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -10,6 +10,7 @@ use HTML::Template::Compiled qw//;
 use Memoize qw/memoize/;
 use MP3::Tag qw//;
 use Ogg::Vorbis::Header::PurePerl;
+use MP4::Info qw/get_mp4tag get_mp4info/;
 
 use DB_File qw//;
 use File::Basename qw/fileparse/;
@@ -93,6 +94,32 @@ sub vorbisinfo{
        }
 }
 
+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 = %{get_mp4tag $file};
+       my %info = %{get_mp4info $file};
+       $file = scalar fileparse $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 => $file,
+       };
+}
+
 sub normalizer{
        "$_[0]|".(stat $_[0])[9]
 }
@@ -100,7 +127,7 @@ sub normalizer{
 sub run {
        if ($cache) {
                tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644;
-               memoize $_, NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] for qw/flacinfo mp3info vorbisinfo/;
+               memoize $_, NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] for qw/flacinfo mp3info vorbisinfo mp4info/;
        }
 
        my %files;
@@ -109,8 +136,9 @@ sub run {
                $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;
+               $info = thaw mp4info $file if $file =~ /\.mp4|\.aac|\.m4a$/i;
                next unless defined $info;
-               my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga';
+               my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a';
                $files{$basename} //= [];
                push $files{$basename}, $info;
        }