X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=f75af3afab361f8f5aba470d516455846812b99f;hb=d5aa2e89a33b5e7efa77dcc8f0bc2057ddc3a155;hp=adb8fc153c99faecc6509a96644cd6705eab656b;hpb=5be1651c653fbb543578f5d894a9e99e814dd499;p=app-musicexpo.git
diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index adb8fc1..f75af3a 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -38,7 +38,7 @@ sub fix{
sub flacinfo{
my $file=$_[0];
my $flac=Audio::FLAC::Header->new($file);
- $file = $prefix . scalar fileparse $file;
+ $file = scalar fileparse $file;
freeze +{
format => 'FLAC',
@@ -49,14 +49,14 @@ sub flacinfo{
tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'),
tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'),
genre => fix ($flac->tags('GENRE') // '?'),
- path => $file,
+ file => $file,
}
}
sub mp3info{
my $file=$_[0];
my $mp3=MP3::Tag->new($file);
- $file = $prefix . scalar fileparse $file;
+ $file = scalar fileparse $file;
freeze +{
format => 'MP3',
@@ -67,14 +67,14 @@ sub mp3info{
tracknumber => fix ($mp3->track1 || '?'),
tracktotal => fix ($mp3->track2 || '?'),
genre => fix ($mp3->genre) || '?',
- path => $file,
+ file => $file,
}
}
sub vorbisinfo{
my $file=$_[0];
my $ogg=Ogg::Vorbis::Header::PurePerl->new($file);
- $file = $prefix . scalar fileparse $file;
+ $file = scalar fileparse $file;
freeze +{
format => 'Vorbis',
@@ -85,7 +85,7 @@ sub vorbisinfo{
tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'),
tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'),
genre => fix ($ogg->comment('GENRE')) || '?',
- path => $file,
+ file => $file,
}
}
@@ -113,6 +113,7 @@ sub run {
my $ht=HTML::Template::Compiled->new(
default_escape => 'HTML',
+ global_vars => 2,
$template eq '' ? (scalarref => \$default_template) : (filename => $template),
);
@@ -120,11 +121,11 @@ sub run {
for (values %files) {
my @versions = @$_;
my %entry = (%{$versions[0]}, formats => []);
- push $entry{formats}, {format => $_->{format}, path => $_->{path}} for @versions;
+ push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions;
push @files, \%entry
}
- $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files]);
+ $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix);
print $ht->output;
}
@@ -138,7 +139,7 @@ $default_template = <<'HTML';
Title Artist Album Genre Track Year Type