X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=adb8fc153c99faecc6509a96644cd6705eab656b;hp=42526fa749045cc5c48326874770c78427e7ca38;hb=5be1651c653fbb543578f5d894a9e99e814dd499;hpb=fb015c820358882b679ab02746043d74ea7764ee

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 42526fa..adb8fc1 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,4 +1,4 @@
-package App::MusicExpo 0.001;
+package App::MusicExpo 0.002;
 use v5.14;
 use strict;
 use warnings;
@@ -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/;
@@ -31,6 +32,7 @@ GetOptions (
 
 sub fix{
   utf8::decode($_[0]);
+  $_[0]
 }
 
 sub flacinfo{
@@ -69,6 +71,24 @@ sub mp3info{
   }
 }
 
+sub vorbisinfo{
+  my $file=$_[0];
+  my $ogg=Ogg::Vorbis::Header::PurePerl->new($file);
+  $file = $prefix . 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')) || '?',
+	path => $file,
+  }
+}
+
 sub normalizer{
   "$_[0]|".(stat $_[0])[9]
 }
@@ -77,17 +97,33 @@ 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',
 	$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;
 }