X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=23489619410c1c031001ff98043f57724aaad897;hb=7ad441f0fdb3394b96f96be789da87fd0ff8f4e5;hp=68ef5da343684d16c663baedd20dac699de8b7f1;hpb=513a3718ede09c9b237b428b5e1e7784ff002351;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 68ef5da..2348961 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -38,7 +38,7 @@ sub fix{
 sub flacinfo{
   my $file=$_[0];
   my $flac=Audio::FLAC::Header->new($file);
-  $file = $prefix . scalar fileparse $file;
+  $file = scalar fileparse $file;
 
   freeze +{
 	format => 'FLAC',
@@ -49,14 +49,14 @@ sub flacinfo{
 	tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'),
 	tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'),
 	genre => fix ($flac->tags('GENRE') // '?'),
-	path => $file,
+	file => $file,
   }
 }
 
 sub mp3info{
   my $file=$_[0];
   my $mp3=MP3::Tag->new($file);
-  $file = $prefix . scalar fileparse $file;
+  $file = scalar fileparse $file;
 
   freeze +{
 	format => 'MP3',
@@ -67,13 +67,14 @@ sub mp3info{
 	tracknumber => fix ($mp3->track1 || '?'),
 	tracktotal => fix ($mp3->track2 || '?'),
 	genre => fix ($mp3->genre) || '?',
-	path => $file,
+	file => $file,
   }
 }
 
 sub vorbisinfo{
   my $file=$_[0];
   my $ogg=Ogg::Vorbis::Header::PurePerl->new($file);
+  $file = scalar fileparse $file;
 
   freeze +{
 	format => 'Vorbis',
@@ -84,7 +85,7 @@ sub vorbisinfo{
 	tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'),
 	tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'),
 	genre => fix ($ogg->comment('GENRE')) || '?',
-	path => $file,
+	file => $file,
   }
 }
 
@@ -98,18 +99,32 @@ sub run {
   memoize 'mp3info' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq '';
   memoize 'vorbisinfo' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq '';
 
-  my @files;
+  my %files;
   for my $file (@ARGV) {
-	push @files, thaw flacinfo $file if $file =~ /.flac$/i;
-	push @files, thaw mp3info $file if $file =~ /.mp3$/i;
-	push @files, thaw vorbisinfo $file if $file =~ /.og(?:g|a)$/i;
+	my $info;
+	$info = thaw flacinfo $file if $file =~ /.flac$/i;
+	$info = thaw mp3info $file if $file =~ /.mp3$/i;
+	$info = thaw vorbisinfo $file if $file =~ /.og(?:g|a)$/i;
+	next unless defined $info;
+	my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga';
+	$files{$basename} //= [];
+	push $files{$basename}, $info;
   }
 
   my $ht=HTML::Template::Compiled->new(
 	default_escape => 'HTML',
 	$template eq '' ? (scalarref => \$default_template) : (filename => $template),
   );
-  $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]);
+
+  my @files;
+  for (values %files) {
+	my @versions = @$_;
+	my %entry = (%{$versions[0]}, formats => []);
+	push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions;
+	push @files, \%entry
+  }
+
+  $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix);
   print $ht->output;
 }