From e0fa307063761968a2fe530c5f27e002aa8bdd8c Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <Marius Gavrilescu>
Date: Sun, 18 Aug 2013 00:09:54 +0300
Subject: [PATCH] Use the escaping in HTML::Template::Compiled

---
 Makefile.PL          |  2 --
 lib/App/MusicExpo.pm | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 2748617..4126026 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,11 +6,9 @@ WriteMakefile(
     VERSION       => '0.001001',
     PREREQ_PM     => {
 	  'Audio::FLAC::Header'      => 0,
-	  'HTML::Entities'           => 0,
 	  'HTML::Template::Compiled' => 0,
 	  'Memoize'                  => 0,
 	  'MP3::Tag'                 => 0,
-	  'URI::Escape'              => 0,
 	  'DB_File'                  => 0,
 	},
 	MIN_PERL_VERSION => 5.014,
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 3194665..475ef80 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -4,11 +4,9 @@ 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 DB_File qw//;
 use File::Basename qw/fileparse/;
@@ -35,13 +33,12 @@ GetOptions (
 
 sub fix{
   utf8::decode($_[0]);
-  encode_entities($_[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',
@@ -89,7 +86,10 @@ sub run {
 	push @files, thaw mp3info $file if $file =~ /.mp3$/i;
   }
 
-  my $ht=HTML::Template::Compiled->new( $template eq '' ? (scalarref => \$default_template) : (filename => $template));
+  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;
 }
@@ -104,7 +104,7 @@ $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 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><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>
 </table>
 HTML
 
-- 
2.30.2