X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=9f7de60d23804b309cad96209c80f123a3b50bdf;hb=fb40d666a8878b8272656e9de7ef7374f2ec3627;hp=242e0df0cd19d66cba78cc883ad27b3c965edfb6;hpb=c681179f99c8f2a7c501639c19ff65a740a8b7ea;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 242e0df..9f7de60 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -1,22 +1,21 @@
 package App::MusicExpo;
-use v5.14;
+use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '0.003002';
+our $VERSION = '1.002001';
 
-use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
 use Memoize qw/memoize/;
-use MP3::Tag qw//;
-use Ogg::Vorbis::Header::PurePerl;
 
+use Carp qw/carp/;
 use DB_File qw//;
+use Encode qw/encode/;
 use File::Basename qw/fileparse/;
 use Fcntl qw/O_RDWR O_CREAT/;
 use Getopt::Long;
-use JSON;
 use Storable qw/thaw freeze/;
+use sort 'stable';
 
 ##################################################
 
@@ -27,92 +26,149 @@ 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{
-	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,
+		title => $flac->tags('TITLE'),
+		artist => $flac->tags('ARTIST'),
+		year => $flac->tags('DATE'),
+		album => $flac->tags('ALBUM'),
+		tracknumber => $flac->tags('TRACKNUMBER'),
+		tracktotal => $flac->tags('TRACKTOTAL'),
+		genre => $flac->tags('GENRE'),
+		file => scalar fileparse $file,
 	}
 }
 
 sub mp3info{
 	my $file=$_[0];
-	my $mp3=MP3::Tag->new($file);
-	$file = scalar fileparse $file;
+	my %tag = map { encode 'UTF-8', $_ } %{MP3::Info::get_mp3tag $file};
+	my @trkn = split m#/#s, $tag{TRACKNUM} // '';
 
 	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,
+		title => $tag{TITLE},
+		artist => $tag{ARTIST},
+		year => $tag{YEAR},
+		album => $tag{ALBUM},
+		tracknumber => $trkn[0],
+		tracktotal => $trkn[1],
+		genre => $tag{GENRE},
+		file => scalar fileparse $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,
+		title => scalar $ogg->comment('TITLE'),
+		artist => scalar $ogg->comment('artist'),
+		year => scalar $ogg->comment('DATE'),
+		album => scalar $ogg->comment('ALBUM'),
+		tracknumber => scalar $ogg->comment('TRACKNUMBER'),
+		tracktotal => scalar $ogg->comment('TRACKTOTAL'),
+		genre => scalar $ogg->comment('GENRE'),
+		file => scalar fileparse $file,
 	}
 }
 
+sub mp4_format ($){ ## no critic (ProhibitSubroutinePrototypes)
+	my $encoding = $_[0];
+	return 'AAC' if $encoding eq 'mp4a';
+	return 'ALAC' if $encoding eq 'alac';
+	"MP4-$encoding"
+}
+
+sub mp4info{
+	my $file=$_[0];
+	my %tag = map { ref() ? $_ : encode 'UTF-8', $_ } %{MP4::Info::get_mp4tag $file};
+	my %info = %{MP4::Info::get_mp4info $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 => scalar fileparse $file,
+	};
+}
+
+sub opusinfo {
+	my $file = $_[0];
+	my $of = Audio::Opusfile->new_from_file($file);
+	my $tags = $of->tags;
+
+	my %data = (
+		format => 'Opus',
+		title => $tags->query('TITLE'),
+		artist => $tags->query('ARTIST'),
+		year => $tags->query('DATE'),
+		album => $tags->query('ALBUM'),
+		tracknumber => $tags->query('TRACKNUMBER'),
+		tracktotal => $tags->query('TRACKTOTAL'),
+		genre => $tags->query('GENRE'),
+		file => scalar fileparse $file,
+	);
+
+	freeze \%data;
+}
+
+my @optional_modules = (
+	[ 'Audio::FLAC::Header', \&flacinfo, '.flac' ],
+	[ 'MP3::Info', \&mp3info, '.mp3' ],
+	[ 'Ogg::Vorbis::Header::PurePerl', \&vorbisinfo, '.ogg', '.oga' ],
+	[ 'MP4::Info', \&mp4info, '.mp4', '.aac', '.m4a' ],
+	[ 'Audio::Opusfile', \&opusinfo, '.opus' ],
+);
+
+my %info;
+
+for (@optional_modules) {
+	my ($module, $coderef, @extensions_handled) = @$_;
+	if (eval "require $module") {
+		$info{$_} = $coderef for @extensions_handled
+	}
+}
+
+unless (%info) {
+	carp 'No tags-reading module detected. Install one of the following modules: ' . join ', ', map { $_->[0] } @optional_modules;
+}
+
 sub normalizer{
 	"$_[0]|".(stat $_[0])[9]
 }
 
+sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ }
+
+sub extensions_handled { keys %info }
+
 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 '';
+	if ($cache) {
+		tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644; ## no critic (ProhibitTie)
+		$info{$_} = memoize $info{$_}, INSTALL => undef, NORMALIZER => \&normalizer, LIST_CACHE => 'FAULT', SCALAR_CACHE => [HASH => \%cache] for keys %info;
+	}
 
 	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';
+		my ($basename, undef, $suffix) = fileparse $file, keys %info;
+		next unless $suffix;
 		$files{$basename} //= [];
-		push $files{$basename}, $info;
+		push @{$files{$basename}}, thaw scalar $info{$suffix}->($file);
 	}
 
 	my $ht=HTML::Template::Compiled->new(
@@ -122,34 +178,40 @@ sub run {
 	);
 
 	my @files;
-	for (values %files) {
-		my @versions = @$_;
-		my %entry = (%{$versions[0]}, formats => []);
-		push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions;
+	for (sort keys %files) {
+		my @versions = @{$files{$_}};
+		my %entry = (formats => [], map { $_ => '?' } qw/title artist year album tracknumber tracktotal genre/);
+		for my $ver (@versions) {
+			push @{$entry{formats}}, {format => $ver->{format}, file => $ver->{file}};
+			for my $key (keys %$ver) {
+				$entry{$key} = $ver->{$key} if $ver->{$key} && $ver->{$key} ne '?';
+			}
+		}
+		delete $entry{$_} for qw/format file/;
+		$entry{fragment} = make_fragment @entry{qw/artist title/};
 		push @files, \%entry
 	}
 
-	my $json = JSON->new->utf8->canonical->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;
+	@files = sort { $a->{title} cmp $b->{title} } @files;
+	$ht->param(files => \@files, prefix => $prefix);
+	print $ht->output; ## no critic (RequireCheckedSyscalls)
 }
 
 $default_template = <<'HTML';
 <!DOCTYPE html>
 <title>Music</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="/music.css">
+<link rel="stylesheet" href="musicexpo.css">
+<script async defer type="application/javascript" src="player.js"></script>
+
+<div id="player"></div>
 
 <table border>
 <thead>
 <tr><th>Title<th>Artist<th>Album<th>Genre<th>Track<th>Year<th>Type
 <tbody><tmpl_loop files>
-<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>
+<tr><td class="title"><a href="#<tmpl_var fragment>" data-hash="#<tmpl_var fragment>"><tmpl_var title></a><td class="artist"><tmpl_var artist><td class="album"><tmpl_var album><td class="genre"><tmpl_var genre><td class="track"><tmpl_var tracknumber>/<tmpl_var tracktotal><td class="year"><tmpl_var year><td class="formats"><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;
@@ -206,7 +268,7 @@ Marius Gavrilescu, E<lt>marius@ieval.roE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2013-2014 by Marius Gavrilescu
+Copyright (C) 2013-2016 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,