X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=a25a132ba1427f847c361c4760244f9a762b8b9e;hp=3fccfbb333b36f430eb9d94e6f0d6dfa127f3d57;hb=b484a12921835e84ece975361da2c7b209beba6b;hpb=a535e8790ef7f825c6049e16dff723d9e9b54634

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 3fccfbb..a25a132 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -40,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,
 	}
 }
@@ -58,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,
 	}
 }
@@ -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 => $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 => scalar fileparse $file,
 	}
 }
@@ -100,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,
 	};
 }
@@ -150,7 +150,7 @@ sub run {
 	my @files;
 	for (sort keys %files) {
 		my @versions = @{$files{$_}};
-		my %entry = (%{$versions[0]}, formats => []);
+		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) {