X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=f23063b2bbb89daf3a02bb0d22090a195436a98e;hb=5614c544d4ae33cdc9257d78fd18b6a63b84e47e;hp=96f9d8dda75d7c7680e0b99469bcdc2e2bcec456;hpb=9b989f9631e26e943f09be01e8846771112c695c;p=app-musicexpo.git diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index 96f9d8d..f23063b 100644 --- a/lib/App/MusicExpo.pm +++ b/lib/App/MusicExpo.pm @@ -3,7 +3,7 @@ use v5.14; use strict; use warnings; -our $VERSION = '0.004'; +our $VERSION = '0.005'; use Audio::FLAC::Header qw//; use HTML::Template::Compiled qw//; @@ -16,7 +16,6 @@ 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/; ################################################## @@ -33,13 +32,6 @@ 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); @@ -47,13 +39,13 @@ sub flacinfo{ 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') // '?'), + 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 => $file, } } @@ -65,13 +57,13 @@ sub mp3info{ 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) || '?', + title => $mp3->title || '?', + artist => $mp3->artist || '?', + year => $mp3->year || '?', + album => $mp3->album || '?', + tracknumber => $mp3->track1 || '?', + tracktotal => $mp3->track2 || '?', + genre => $mp3->genre || '?', file => $file, } } @@ -83,13 +75,13 @@ sub vorbisinfo{ 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')) || '?', + 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 => $file, } } @@ -120,27 +112,34 @@ sub mp4info{ }; } +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 { + my %info = %info; 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 mp4info/; + $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; - $info = thaw mp4info $file if $file =~ /\.mp4|\.aac|\.m4a$/i; - next unless defined $info; - my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a'; + 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( @@ -160,13 +159,12 @@ sub run { } } 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; } @@ -174,7 +172,7 @@ $default_template = <<'HTML'; Music - +
@@ -183,10 +181,8 @@ $default_template = <<'HTML'; TitleArtistAlbumGenreTrackYearType -/ +/ - - HTML 1; @@ -243,7 +239,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,