Bump version and update Changes

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

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 19456874f615d5be8d898a9c88353362d2fdce6f..7cdf6e29441f15fdf2493d1e893c8e966aeb66e6 100644 (file)
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -3,7 +3,7 @@ use v5.14;
 use strict;
 use warnings;
 
-our $VERSION = '0.005';
+our $VERSION = '0.006';
 
 use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
@@ -18,6 +18,7 @@ use File::Basename qw/fileparse/;
 use Fcntl qw/O_RDWR O_CREAT/;
 use Getopt::Long;
 use Storable qw/thaw freeze/;
+use sort 'stable';
 
 ##################################################
 
@@ -39,13 +40,13 @@ sub flacinfo{
 
        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') // '?',
+               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,
        }
 }
@@ -57,13 +58,13 @@ sub mp3info{
 
        freeze +{
                format => 'MP3',
-               title => $tag{TITLE} || '?',
-               artist => $tag{ARTIST} || '?',
-               year => $tag{YEAR} || '?',
-               album => $tag{ALBUM} || '?',
-               tracknumber => $trkn[0] || '?',
-               tracktotal => $trkn[1] || '?',
-               genre => $tag{GENRE} || '?',
+               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,
        }
 }
@@ -74,13 +75,13 @@ sub vorbisinfo{
 
        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') || '?',
+               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,
        }
 }
@@ -99,13 +100,13 @@ sub mp4info{
 
        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} || '?',
+               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,
        };
 }
@@ -147,13 +148,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/;