X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=inline;f=lib%2FApp%2FMusicExpo.pm;h=32715ae1680671c029729fa65b99f926670be995;hb=95267d4f67d75e452bdfe9f92260dd0a65a9b39e;hp=3c0f4b7ae88f0fb79946ee5b3698408936ff4f6f;hpb=c2a060a40f75330118c74644ed85b8b489136322;p=app-musicexpo.git
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 3c0f4b7..32715ae 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,17 +1,21 @@
-package App::MusicExpo 0.002;
+package App::MusicExpo;
use v5.14;
use strict;
use warnings;
+our $VERSION = 0.003001;
+
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/;
use Fcntl qw/O_RDWR O_CREAT/;
use Getopt::Long;
+use JSON;
use Storable qw/thaw freeze/;
##################################################
@@ -23,74 +27,113 @@ our $cache='';
our $template='';
GetOptions (
- "template=s" => \$template,
- "prefix=s" => \$prefix,
- "cache=s" => \$cache,
+ "template:s" => \$template,
+ "prefix:s" => \$prefix,
+ "cache:s" => \$cache,
);
sub fix{
- utf8::decode($_[0]);
- $_[0]
+ my $copy = $_[0];
+ utf8::decode($copy);
+ $copy
}
sub flacinfo{
- my $file=$_[0];
- my $flac=Audio::FLAC::Header->new($file);
- $file = $prefix . scalar fileparse $file;
-
- freeze +{
- format => 'FLAC',
- title => fix ($flac->tags('TITLE') // '?'),
- artist => fix ($flac->tags('ARTIST') // '?'),
- year => fix ($flac->tags('DATE') // '?'),
- album => fix ($flac->tags('ALBUM') // '?'),
- tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'),
- tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'),
- genre => fix ($flac->tags('GENRE') // '?'),
- path => $file,
- }
+ my $file=$_[0];
+ my $flac=Audio::FLAC::Header->new($file);
+ $file = scalar fileparse $file;
+
+ freeze +{
+ format => 'FLAC',
+ title => fix ($flac->tags('TITLE') // '?'),
+ artist => fix ($flac->tags('ARTIST') // '?'),
+ year => fix ($flac->tags('DATE') // '?'),
+ album => fix ($flac->tags('ALBUM') // '?'),
+ tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'),
+ tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'),
+ genre => fix ($flac->tags('GENRE') // '?'),
+ file => $file,
+ }
}
sub mp3info{
- my $file=$_[0];
- my $mp3=MP3::Tag->new($file);
- $file = $prefix . scalar fileparse $file;
-
- freeze +{
- format => 'MP3',
- title => fix ($mp3->title || '?'),
- artist => fix ($mp3->artist || '?'),
- year => fix ($mp3->year || '?'),
- album => fix ($mp3->album || '?'),
- tracknumber => fix ($mp3->track1 || '?'),
- tracktotal => fix ($mp3->track2 || '?'),
- genre => fix ($mp3->genre) || '?',
- path => $file,
- }
+ my $file=$_[0];
+ my $mp3=MP3::Tag->new($file);
+ $file = scalar fileparse $file;
+
+ freeze +{
+ format => 'MP3',
+ title => fix ($mp3->title || '?'),
+ artist => fix ($mp3->artist || '?'),
+ year => fix ($mp3->year || '?'),
+ album => fix ($mp3->album || '?'),
+ tracknumber => fix ($mp3->track1 || '?'),
+ tracktotal => fix ($mp3->track2 || '?'),
+ genre => fix ($mp3->genre) || '?',
+ 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,
+ }
}
sub normalizer{
- "$_[0]|".(stat $_[0])[9]
+ "$_[0]|".(stat $_[0])[9]
}
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 '';
-
- 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 $ht=HTML::Template::Compiled->new(
- default_escape => 'HTML',
- $template eq '' ? (scalarref => \$default_template) : (filename => $template),
- );
- $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]);
- print $ht->output;
+ 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;
+ for my $file (@ARGV) {
+ 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),
+ );
+
+ my @files;
+ for (values %files) {
+ my @versions = @$_;
+ my %entry = (%{$versions[0]}, formats => []);
+ push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions;
+ push @files, \%entry
+ }
+
+ my $json = JSON->new->utf8->canonical->encode({files => \@files, prefix => $prefix});
+ $json =~ s/</g;
+ $json =~ s/>/>/g;
+ $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix, json => $json);
+ print $ht->output;
}
$default_template = <<'HTML';
@@ -103,8 +146,10 @@ $default_template = <<'HTML';
Title Artist Album Genre Track Year Type