Group files with same basename

[app-musicexpo.git] / lib / App / MusicExpo.pm

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 475ef80f971dba4595ef3975a2637f997e9d531d..adb8fc153c99faecc6509a96644cd6705eab656b 100644 (file)
--- 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/;
@@ -19,20 +20,19 @@ use Storable qw/thaw freeze/;
 my $default_template;
 
 our $prefix='/music/';
-our $cache='cache.db';
-our $caching=1;
+our $cache='';
 our $template='';
 
 GetOptions (
   "template=s" => \$template,
   "prefix=s" => \$prefix,
   "cache=s" => \$cache,
-  "caching!" => \$caching,
 );
 
 
 sub fix{
   utf8::decode($_[0]);
+  $_[0]
 }
 
 sub flacinfo{
@@ -71,25 +71,59 @@ 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]
 }
 
 sub run {
-  tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644 if $caching;
-  memoize 'flacinfo', NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] if $caching;
-  memoize 'mp3info' , NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] if $caching;
+  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;
 }
@@ -147,11 +181,7 @@ Prefix for download links. Defaults to '/music/'.
 
 =item B<--cache> I<filename>
 
-Path to the cache file. Created if it does not exist. Defaults to 'cache.db'
-
-=item B<--caching>, B<--no-caching>
-
-Enables or disables caching. Defaults to B<--caching>
+Path to the cache file. Created if it does not exist. If '' (empty), disables caching. Is empty by default.
 
 =back