X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=5b66bab875a222b234086ec0636b3f3d0c5991bc;hb=60376c0c311eded06caad49aec2d485462ffbb8e;hp=f23063b2bbb89daf3a02bb0d22090a195436a98e;hpb=5614c544d4ae33cdc9257d78fd18b6a63b84e47e;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index f23063b..5b66bab 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,22 +1,24 @@
 package App::MusicExpo;
-use v5.14;
+use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '0.005';
+our $VERSION = '1.000';
 
 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 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,66 +29,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 flacinfo{
 	my $file=$_[0];
 	my $flac=Audio::FLAC::Header->new($file);
-	$file = scalar fileparse $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 => $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 => $mp3->title || '?',
-		artist => $mp3->artist || '?',
-		year => $mp3->year || '?',
-		album => $mp3->album || '?',
-		tracknumber => $mp3->track1 || '?',
-		tracktotal => $mp3->track2 || '?',
-		genre => $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 => $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,
+		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';
@@ -95,20 +95,19 @@ 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,
 	};
 }
 
@@ -129,9 +128,8 @@ sub normalizer{
 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;
+		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;
 	}
 
@@ -149,13 +147,13 @@ 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/;
@@ -165,7 +163,7 @@ sub run {
 
 	@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';
@@ -239,7 +237,7 @@ Marius Gavrilescu, E<lt>marius@ieval.roE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2013-2015 by Marius Gavrilescu
+Copyright (C) 2013-2016 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,