X-Git-Url: http://git.ieval.ro/?p=app-musicexpo.git;a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=adb8fc153c99faecc6509a96644cd6705eab656b;hp=3194665a5a0a91bc9d9583425e27c7b06d0a6757;hb=5be1651c653fbb543578f5d894a9e99e814dd499;hpb=75c564d81acda3f119514960b110f6628deca31e
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 3194665..adb8fc1 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,14 +1,13 @@
-package App::MusicExpo 0.001;
+package App::MusicExpo 0.002;
use v5.14;
use strict;
use warnings;
use Audio::FLAC::Header qw//;
-use HTML::Entities qw/encode_entities/;
use HTML::Template::Compiled qw//;
use Memoize qw/memoize/;
use MP3::Tag qw//;
-use URI::Escape qw/uri_escape/;
+use Ogg::Vorbis::Header::PurePerl;
use DB_File qw//;
use File::Basename qw/fileparse/;
@@ -21,27 +20,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]);
- encode_entities($_[0])
+ $_[0]
}
sub flacinfo{
my $file=$_[0];
my $flac=Audio::FLAC::Header->new($file);
- $file = $prefix . uri_escape scalar fileparse $file;
+ $file = $prefix . scalar fileparse $file;
freeze +{
format => 'FLAC',
@@ -59,7 +56,7 @@ sub flacinfo{
sub mp3info{
my $file=$_[0];
my $mp3=MP3::Tag->new($file);
- $file = $prefix . uri_escape scalar fileparse $file;
+ $file = $prefix . scalar fileparse $file;
freeze +{
format => 'MP3',
@@ -74,22 +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
}
- my $ht=HTML::Template::Compiled->new( $template eq '' ? (scalarref => \$default_template) : (filename => $template));
$ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]);
print $ht->output;
}
@@ -104,7 +138,7 @@ $default_template = <<'HTML';
Title Artist Album Genre Track Year Type