X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=7b5f4e2f46d7ba70d0bcb3b7852f03d1b81afb9c;hb=1549062d92de87827a1e0016c898145f5a47eb63;hp=967e9f4013c95de29ca97e54db6bfa91f20140e2;hpb=6a1f7df933501d8b892e6f38528e1aa804130c6f;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 967e9f4..7b5f4e2 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -3,7 +3,7 @@ use v5.14;
 use strict;
 use warnings;
 
-our $VERSION = 0.003001;
+our $VERSION = '0.003003';
 
 use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
@@ -15,6 +15,7 @@ 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/;
 
 ##################################################
@@ -26,9 +27,9 @@ our $cache='';
 our $template='';
 
 GetOptions (
-	"template=s" => \$template,
-	"prefix=s" => \$prefix,
-	"cache=s" => \$cache,
+	"template:s" => \$template,
+	"prefix:s" => \$prefix,
+	"cache:s" => \$cache,
 );
 
 
@@ -97,17 +98,17 @@ sub normalizer{
 }
 
 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;
+		memoize $_, NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] for qw/flacinfo mp3info vorbisinfo/;
+	}
 
 	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 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} //= [];
@@ -128,7 +129,10 @@ sub run {
 		push @files, \%entry
 	}
 
-	$ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix);
+	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;
 }
 
@@ -142,14 +146,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 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><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
@@ -198,7 +206,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,