X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=c1433ca44c23566cf5ec4808f5c38a26930b9955;hb=17c8e5f607f576c8762858da54c8663e7d9bd7d0;hp=32c780623351a5fe41b06d43554bd2a5d68a1fd9;hpb=de93afc5b3d69c2bbf569fe495e579670aa756a6;p=app-musicexpo.git
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 32c7806..c1433ca 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,22 +1,25 @@
package App::MusicExpo;
-use v5.14;
+use 5.014000;
use strict;
use warnings;
-our $VERSION = '0.004';
+our $VERSION = '1.001_001';
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 Audio::Opusfile qw//;
use DB_File qw//;
+use Encode qw/encode/;
use File::Basename qw/fileparse/;
use Fcntl qw/O_RDWR O_CREAT/;
use Getopt::Long;
use Storable qw/thaw freeze/;
+use sort 'stable';
##################################################
@@ -27,73 +30,64 @@ our $cache='';
our $template='';
GetOptions (
- "template:s" => \$template,
- "prefix:s" => \$prefix,
- "cache:s" => \$cache,
+ 'template:s' => \$template,
+ 'prefix:s' => \$prefix,
+ '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 m#/#s, $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 => scalar $ogg->comment('TITLE'),
+ artist => scalar $ogg->comment('artist'),
+ year => scalar $ogg->comment('DATE'),
+ album => scalar $ogg->comment('ALBUM'),
+ tracknumber => scalar $ogg->comment('TRACKNUMBER'),
+ tracktotal => scalar $ogg->comment('TRACKTOTAL'),
+ genre => scalar $ogg->comment('GENRE'),
+ file => scalar fileparse $file,
}
}
-sub mp4_format ($){
+sub mp4_format ($){ ## no critic (ProhibitSubroutinePrototypes)
my $encoding = $_[0];
return 'AAC' if $encoding eq 'mp4a';
return 'ALAC' if $encoding eq 'alac';
@@ -102,44 +96,70 @@ sub mp4_format ($){
sub mp4info{
my $file=$_[0];
- my %tag = %{get_mp4tag $file};
+ my %tag = map { ref() ? $_ : encode 'UTF-8', $_ } %{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,
+ 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,
};
}
+sub opusinfo {
+ my $file = $_[0];
+ my $of = Audio::Opusfile->new_from_file($file);
+ my $tags = $of->tags;
+
+ my %data = (
+ format => 'Opus',
+ title => $tags->query('TITLE'),
+ artist => $tags->query('ARTIST'),
+ year => $tags->query('DATE'),
+ album => $tags->query('ALBUM'),
+ tracknumber => $tags->query('TRACKNUMBER'),
+ tracktotal => $tags->query('TRACKTOTAL'),
+ genre => $tags->query('GENRE'),
+ file => scalar fileparse $file
+ );
+
+ freeze \%data;
+}
+
+my %info = (
+ '.flac' => \&flacinfo,
+ '.mp3' => \&mp3info,
+ '.ogg' => \&vorbisinfo,
+ '.oga' => \&vorbisinfo,
+ '.mp4' => \&mp4info,
+ '.aac' => \&mp4info,
+ '.m4a' => \&mp4info,
+ '.opus' => \&opusinfo,
+);
+
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 mp4info/;
+ tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644; ## no critic (ProhibitTie)
+ $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(
@@ -149,22 +169,23 @@ sub run {
);
my @files;
- for (values %files) {
- my @versions = @$_;
- my %entry = (%{$versions[0]}, formats => []);
+ for (sort keys %files) {
+ my @versions = @{$files{$_}};
+ my %entry = (formats => [], map { $_ => '?' } qw/title artist year album tracknumber tracktotal genre/);
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 '?';
+ $entry{$key} = $ver->{$key} if $ver->{$key} && $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;
+ print $ht->output; ## no critic (RequireCheckedSyscalls)
}
$default_template = <<'HTML';
@@ -180,7 +201,7 @@ $default_template = <<'HTML';
Title Artist Album Genre Track Year Type