X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=f75af3afab361f8f5aba470d516455846812b99f;hp=3c0f4b7ae88f0fb79946ee5b3698408936ff4f6f;hb=d5aa2e89a33b5e7efa77dcc8f0bc2057ddc3a155;hpb=c2a060a40f75330118c74644ed85b8b489136322

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 3c0f4b7..f75af3a 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -7,6 +7,7 @@ use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
 use Memoize qw/memoize/;
 use MP3::Tag qw//;
+use Ogg::Vorbis::Header::PurePerl;
 
 use DB_File qw//;
 use File::Basename qw/fileparse/;
@@ -37,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',
@@ -48,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',
@@ -66,7 +67,25 @@ 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',
+	title => fix($ogg->comment('TITLE') || '?'),
+	artist => fix ($ogg->comment('artist') || '?'),
+	year => fix ($ogg->comment('DATE') || '?'),
+	album => fix ($ogg->comment('ALBUM') || '?'),
+	tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'),
+	tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'),
+	genre => fix ($ogg->comment('GENRE')) || '?',
+	file => $file,
   }
 }
 
@@ -78,18 +97,35 @@ sub run {
   tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644 unless $cache eq '';
   memoize 'flacinfo', NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] unless $cache eq '';
   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;
+	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',
+	global_vars => 2,
 	$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;
 }
 
@@ -103,7 +139,7 @@ $default_template = <<'HTML';
 <thead>
 <tr><th>Title<th>Artist<th>Album<th>Genre<th>Track<th>Year<th>Type
 <tbody><tmpl_loop files>
-<tr><td><a href="<tmpl_var ESCAPE=URL path>"><tmpl_var title></a><td><tmpl_var artist><td><tmpl_var album><td><tmpl_var genre><td><tmpl_var tracknumber>/<tmpl_var tracktotal><td><tmpl_var year><td><tmpl_var format></tmpl_loop>
+<tr><td><a href=<tmpl_var title><td><tmpl_var artist><td><tmpl_var album><td><tmpl_var genre><td><tmpl_var tracknumber>/<tmpl_var tracktotal><td><tmpl_var year><td><tmpl_loop formats><a href="<tmpl_var ...prefix><tmpl_var ESCAPE=URL file>"><tmpl_var format></a> </tmpl_loop></tmpl_loop>
 </table>
 HTML
 
@@ -130,7 +166,10 @@ The default template looks like:
     |---------+---------+-----------------+---------+-------+------+------|
     | Cellule | Silence | L'autre endroit | Electro | 01/09 | 2005 | FLAC |
 
-where the title is a download link.
+where the type is a download link. If you have multiple files with the same
+basename (such as C<cellule.flac> and C<cellule.ogg>), they will be treated
+as two versions of the same file, so a row will be created with two download
+links, one for each format.
 
 =head1 OPTIONS