X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=3bdef011a6d7086d7ee766068e190a0271eba187;hb=b90b9dda037a4e41ac4aa11c80f70cb421c5feb2;hp=7b5f4e2f46d7ba70d0bcb3b7852f03d1b81afb9c;hpb=1549062d92de87827a1e0016c898145f5a47eb63;p=app-musicexpo.git diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index 7b5f4e2..3bdef01 100644 --- a/lib/App/MusicExpo.pm +++ b/lib/App/MusicExpo.pm @@ -3,19 +3,19 @@ use v5.14; use strict; use warnings; -our $VERSION = '0.003003'; +our $VERSION = '0.005'; use Audio::FLAC::Header qw//; 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/; use Fcntl qw/O_RDWR O_CREAT/; use Getopt::Long; -use JSON::MaybeXS; use Storable qw/thaw freeze/; ################################################## @@ -93,26 +93,55 @@ 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] } +sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ } + 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; 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; + $info = thaw scalar flacinfo $file if $file =~ /\.flac$/i; + $info = thaw scalar mp3info $file if $file =~ /\.mp3$/i; + $info = thaw scalar vorbisinfo $file if $file =~ /\.og(?:g|a)$/i; + $info = thaw scalar 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; + push @{$files{$basename}}, $info; } my $ht=HTML::Template::Compiled->new( @@ -125,14 +154,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::MaybeXS->new(canonical => 1)->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 +174,17 @@ $default_template = <<'HTML'; Music - + + + +
-
TitleArtistAlbumGenreTrackYearType
/ +
/
- - HTML 1; @@ -206,7 +241,7 @@ Marius Gavrilescu, Emarius@ieval.roE =head1 COPYRIGHT AND LICENSE -Copyright (C) 2013-2014 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,