X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=32c780623351a5fe41b06d43554bd2a5d68a1fd9;hb=de93afc5b3d69c2bbf569fe495e579670aa756a6;hp=ebee6efc784f18ae802565dcc0c3a02a79fd8e81;hpb=ddd1adc5bc05303d3a0b9328a16481af97c23323;p=app-musicexpo.git diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index ebee6ef..32c7806 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.003003'; +our $VERSION = '0.004'; use Audio::FLAC::Header qw//; use HTML::Template::Compiled qw//; @@ -16,7 +16,6 @@ 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/; ################################################## @@ -140,7 +139,7 @@ sub run { next unless defined $info; my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a'; $files{$basename} //= []; - push $files{$basename}, $info; + push @{$files{$basename}}, $info; } my $ht=HTML::Template::Compiled->new( @@ -153,14 +152,18 @@ sub run { for (values %files) { my @versions = @$_; my %entry = (%{$versions[0]}, formats => []); - push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions; + 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} ne '?'; + } + } + delete $entry{$_} for qw/format file/; push @files, \%entry } - my $json = JSON::MaybeXS->new(canonical => 1)->encode({files => \@files, prefix => $prefix}); - $json =~ s//>/g; - $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix, json => $json); + @files = sort { $a->{title} cmp $b->{title} } @files; + $ht->param(files => \@files, prefix => $prefix); print $ht->output; } @@ -168,16 +171,17 @@ $default_template = <<'HTML'; Music - + + + +
-
TitleArtistAlbumGenreTrackYearType
/ +
/
- - HTML 1;