X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=19456874f615d5be8d898a9c88353362d2fdce6f;hp=3194665a5a0a91bc9d9583425e27c7b06d0a6757;hb=b8e18bed40c5ec5d39b19acc2e380b3efbd4b807;hpb=75c564d81acda3f119514960b110f6628deca31e diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index 3194665..1945687 100644 --- a/lib/App/MusicExpo.pm +++ b/lib/App/MusicExpo.pm @@ -1,16 +1,19 @@ -package App::MusicExpo 0.001; +package App::MusicExpo; use v5.14; use strict; use warnings; +our $VERSION = '0.005'; + use Audio::FLAC::Header qw//; -use HTML::Entities qw/encode_entities/; use HTML::Template::Compiled qw//; use Memoize qw/memoize/; -use MP3::Tag qw//; -use URI::Escape qw/uri_escape/; +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; @@ -21,90 +24,162 @@ use Storable qw/thaw freeze/; my $default_template; our $prefix='/music/'; -our $cache='cache.db'; -our $caching=1; +our $cache=''; our $template=''; GetOptions ( - "template=s" => \$template, - "prefix=s" => \$prefix, - "cache=s" => \$cache, - "caching!" => \$caching, + "template:s" => \$template, + "prefix:s" => \$prefix, + "cache:s" => \$cache, ); +sub flacinfo{ + my $file=$_[0]; + my $flac=Audio::FLAC::Header->new($file); + + freeze +{ + format => 'FLAC', + 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 %tag = map { encode 'UTF-8', $_ } %{get_mp3tag $file}; + my @trkn = split '/', $tag{TRACKNUM} // ''; + + freeze +{ + format => 'MP3', + 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 fix{ - utf8::decode($_[0]); - encode_entities($_[0]) +sub vorbisinfo{ + my $file=$_[0]; + my $ogg=Ogg::Vorbis::Header::PurePerl->new($file); + + freeze +{ + format => 'Vorbis', + 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 flacinfo{ - my $file=$_[0]; - my $flac=Audio::FLAC::Header->new($file); - $file = $prefix . uri_escape 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') // '?'), - path => $file, - } +sub mp4_format ($){ + my $encoding = $_[0]; + return 'AAC' if $encoding eq 'mp4a'; + return 'ALAC' if $encoding eq 'alac'; + "MP4-$encoding" } -sub mp3info{ - my $file=$_[0]; - my $mp3=MP3::Tag->new($file); - $file = $prefix . uri_escape scalar fileparse $file; - - 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) || '?', - path => $file, - } +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] + "$_[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 if $caching; - memoize 'flacinfo', NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] if $caching; - memoize 'mp3info' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] if $caching; - - my @files; - for my $file (@ARGV) { - push @files, thaw flacinfo $file if $file =~ /.flac$/i; - push @files, thaw mp3info $file if $file =~ /.mp3$/i; - } - - my $ht=HTML::Template::Compiled->new( $template eq '' ? (scalarref => \$default_template) : (filename => $template)); - $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]); - print $ht->output; + 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 ($basename, undef, $suffix) = fileparse $file, keys %info; + $files{$basename} //= []; + push @{$files{$basename}}, thaw scalar $info{$suffix}->($file); + } + + my $ht=HTML::Template::Compiled->new( + default_escape => 'HTML', + global_vars => 2, + $template eq '' ? (scalarref => \$default_template) : (filename => $template), + ); + + my @files; + for (values %files) { + my @versions = @$_; + my %entry = (%{$versions[0]}, formats => []); + 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 + } + + @files = sort { $a->{title} cmp $b->{title} } @files; + $ht->param(files => \@files, prefix => $prefix); + print $ht->output; } $default_template = <<'HTML'; Music - + + + +
-
TitleArtistAlbumGenreTrackYearType
/ +
/
HTML @@ -112,6 +187,8 @@ HTML __END__ +=encoding utf-8 + =head1 NAME App::MusicExpo - script which generates a HTML table of music tags @@ -131,7 +208,10 @@ The default template looks like: |---------+---------+-----------------+---------+-------+------+------| | Cellule | Silence | L'autre endroit | Electro | 01/09 | 2005 | FLAC | -where the title is a download link. +where the type is a download link. If you have multiple files with the same +basename (such as C and C), they will be treated +as two versions of the same file, so a row will be created with two download +links, one for each format. =head1 OPTIONS @@ -147,11 +227,7 @@ Prefix for download links. Defaults to '/music/'. =item B<--cache> I -Path to the cache file. Created if it does not exist. Defaults to 'cache.db' - -=item B<--caching>, B<--no-caching> - -Enables or disables caching. Defaults to B<--caching> +Path to the cache file. Created if it does not exist. If '' (empty), disables caching. Is empty by default. =back @@ -161,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,