X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=sidebyside;f=lib%2FApp%2FMusicExpo.pm;h=d6ce05e4d168b4f352e9f4d6cae48536ae62be43;hb=9b8a99f23a5ed4c5c82fd91056fd17319bc834c2;hp=475ef80f971dba4595ef3975a2637f997e9d531d;hpb=e0fa307063761968a2fe530c5f27e002aa8bdd8c;p=app-musicexpo.git
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 475ef80..d6ce05e 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,12 +1,15 @@
-package App::MusicExpo 0.001;
+package App::MusicExpo;
use v5.14;
use strict;
use warnings;
+our $VERSION = 0.003;
+
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,26 +22,25 @@ 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{
my $file=$_[0];
my $flac=Audio::FLAC::Header->new($file);
- $file = $prefix . scalar fileparse $file;
+ $file = scalar fileparse $file;
freeze +{
format => 'FLAC',
@@ -49,14 +51,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,7 +69,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,
}
}
@@ -76,21 +96,38 @@ sub normalizer{
}
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',
+ 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;
}
@@ -104,7 +141,7 @@ $default_template = <<'HTML';
Title Artist Album Genre Track Year Type