X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=ebee6efc784f18ae802565dcc0c3a02a79fd8e81;hb=ddd1adc5bc05303d3a0b9328a16481af97c23323;hp=23489619410c1c031001ff98043f57724aaad897;hpb=7ad441f0fdb3394b96f96be789da87fd0ff8f4e5;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 2348961..ebee6ef 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,18 +1,22 @@
-package App::MusicExpo 0.002;
+package App::MusicExpo;
 use v5.14;
 use strict;
 use warnings;
 
+our $VERSION = '0.003003';
+
 use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
 use Memoize qw/memoize/;
 use MP3::Tag qw//;
 use Ogg::Vorbis::Header::PurePerl;
+use MP4::Info qw/get_mp4tag get_mp4info/;
 
 use DB_File qw//;
 use File::Basename qw/fileparse/;
 use Fcntl qw/O_RDWR O_CREAT/;
 use Getopt::Long;
+use JSON::MaybeXS;
 use Storable qw/thaw freeze/;
 
 ##################################################
@@ -24,108 +28,140 @@ 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 = 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,
-  }
+	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 = 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,
-  }
+	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,
-  }
+	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 mp4_format ($){
+	my $encoding = $_[0];
+	return 'AAC' if $encoding eq 'mp4a';
+	return 'ALAC' if $encoding eq 'alac';
+	"MP4-$encoding"
+}
+
+sub mp4info{
+	my $file=$_[0];
+	my %tag = %{get_mp4tag $file};
+	my %info = %{get_mp4info $file};
+	$file = scalar fileparse $file;
+
+	freeze +{
+		format => mp4_format $info{ENCODING},
+		title => $tag{TITLE} || '?',
+		artist => $tag{ARTIST} || '?',
+		year => $tag{YEAR} || '?',
+		album => $tag{ALBUM} || '?',
+		tracknumber => $tag{TRACKNUM} || '?',
+		tracktotal => ($tag{TRKN} ? $tag{TRKN}->[1] : undef) || '?',
+		genre => $tag{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 '';
-  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',
-	$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
-  }
-
-  $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix);
-  print $ht->output;
+	if ($cache) {
+		tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644;
+		memoize $_, NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] for qw/flacinfo mp3info vorbisinfo mp4info/;
+	}
+
+	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;
+		$info = thaw mp4info $file if $file =~ /\.mp4|\.aac|\.m4a$/i;
+		next unless defined $info;
+		my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a';
+		$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::MaybeXS->new(canonical => 1)->encode({files => \@files, prefix => $prefix});
+	$json =~ s/</&lt;/g;
+	$json =~ s/>/&gt;/g;
+	$ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix, json => $json);
+	print $ht->output;
 }
 
 $default_template = <<'HTML';
@@ -138,14 +174,18 @@ $default_template = <<'HTML';
 <thead>
 <tr><th>Title<th>Artist<th>Album<th>Genre<th>Track<th>Year<th>Type
 <tbody><tmpl_loop files>
-<tr><td><a href="<tmpl_var ESCAPE=URL path>"><tmpl_var title></a><td><tmpl_var artist><td><tmpl_var album><td><tmpl_var genre><td><tmpl_var tracknumber>/<tmpl_var tracktotal><td><tmpl_var year><td><tmpl_var format></tmpl_loop>
+<tr><td><tmpl_var title><td><tmpl_var artist><td><tmpl_var album><td><tmpl_var genre><td><tmpl_var tracknumber>/<tmpl_var tracktotal><td><tmpl_var year><td><tmpl_loop formats><a href="<tmpl_var ...prefix><tmpl_var ESCAPE=URL file>"><tmpl_var format></a> </tmpl_loop></tmpl_loop>
 </table>
+
+<pre id="json" style="display: none"><tmpl_var ESCAPE=0 json></pre>
 HTML
 
 1;
 
 __END__
 
+=encoding utf-8
+
 =head1 NAME
 
 App::MusicExpo - script which generates a HTML table of music tags
@@ -165,7 +205,10 @@ The default template looks like:
     |---------+---------+-----------------+---------+-------+------+------|
     | Cellule | Silence | L'autre endroit | Electro | 01/09 | 2005 | FLAC |
 
-where the title is a download link.
+where the type is a download link. If you have multiple files with the same
+basename (such as C<cellule.flac> and C<cellule.ogg>), they will be treated
+as two versions of the same file, so a row will be created with two download
+links, one for each format.
 
 =head1 OPTIONS
 
@@ -191,7 +234,7 @@ Marius Gavrilescu, E<lt>marius@ieval.roE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2013 by Marius Gavrilescu
+Copyright (C) 2013-2014 by Marius Gavrilescu
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.14.2 or,