Force scalar context on $ogg->comment

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

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index a25a132ba1427f847c361c4760244f9a762b8b9e..9422a07eb9e12921be309d7fe7b8ae1fcfde6f6a 100644 (file)
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -75,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,
        }
 }
@@ -154,7 +154,7 @@ sub run {
                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/;