From 5be1651c653fbb543578f5d894a9e99e814dd499 Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 3 Sep 2013 10:35:05 +0300
Subject: [PATCH] Group files with same basename

---
 lib/App/MusicExpo.pm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 68ef5da..adb8fc1 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -74,6 +74,7 @@ sub mp3info{
 sub vorbisinfo{
   my $file=$_[0];
   my $ogg=Ogg::Vorbis::Header::PurePerl->new($file);
+  $file = $prefix . scalar fileparse $file;
 
   freeze +{
 	format => 'Vorbis',
@@ -98,17 +99,31 @@ 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),
   );
+
+  my @files;
+  for (values %files) {
+	my @versions = @$_;
+	my %entry = (%{$versions[0]}, formats => []);
+	push $entry{formats}, {format => $_->{format}, path => $_->{path}} for @versions;
+	push @files, \%entry
+  }
+
   $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]);
   print $ht->output;
 }
-- 
2.30.2