Improve tests

[app-musicexpo.git] / lib / App / MusicExpo.pm

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index f23063b2bbb89daf3a02bb0d22090a195436a98e..3fccfbb333b36f430eb9d94e6f0d6dfa127f3d57 100644 (file)
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -8,15 +8,17 @@ our $VERSION = '0.005';
 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';
 
 ##################################################
 
@@ -35,7 +37,6 @@ GetOptions (
 sub flacinfo{
        my $file=$_[0];
        my $flac=Audio::FLAC::Header->new($file);
-       $file = scalar fileparse $file;
 
        freeze +{
                format => 'FLAC',
@@ -46,32 +47,31 @@ sub flacinfo{
                tracknumber => $flac->tags('TRACKNUMBER') // '?',
                tracktotal => $flac->tags('TRACKTOTAL') // '?',
                genre => $flac->tags('GENRE') // '?',
-               file => $file,
+               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 '/', $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',
@@ -82,7 +82,7 @@ sub vorbisinfo{
                tracknumber => $ogg->comment('TRACKNUMBER') || '?',
                tracktotal => $ogg->comment('TRACKTOTAL') || '?',
                genre => $ogg->comment('GENRE') || '?',
-               file => $file,
+               file => scalar fileparse $file,
        }
 }
 
@@ -95,9 +95,8 @@ 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},
@@ -108,7 +107,7 @@ sub mp4info{
                tracknumber => $tag{TRACKNUM} || '?',
                tracktotal => ($tag{TRKN} ? $tag{TRKN}->[1] : undef) || '?',
                genre => $tag{GENRE} || '?',
-               file => $file,
+               file => scalar fileparse $file,
        };
 }
 
@@ -149,8 +148,8 @@ sub run {
        );
 
        my @files;
-       for (values %files) {
-               my @versions = @$_;
+       for (sort keys %files) {
+               my @versions = @{$files{$_}};
                my %entry = (%{$versions[0]}, formats => []);
                for my $ver (@versions) {
                        push @{$entry{formats}}, {format => $ver->{format}, file => $ver->{file}};