X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=3bdef011a6d7086d7ee766068e190a0271eba187;hb=b90b9dda037a4e41ac4aa11c80f70cb421c5feb2;hp=dd3e57565591620d7ab4ff9070e308618f3d1bf0;hpb=6dcbbf44de50d95be5ba8f1e3416c1c1ade96f04;p=app-musicexpo.git diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index dd3e575..3bdef01 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.004'; +our $VERSION = '0.005'; 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/; ################################################## @@ -124,6 +123,8 @@ sub normalizer{ "$_[0]|".(stat $_[0])[9] } +sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ } + sub run { if ($cache) { tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644; @@ -133,10 +134,10 @@ sub run { 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 mp4info $file if $file =~ /\.mp4|\.aac|\.m4a$/i; + $info = thaw scalar flacinfo $file if $file =~ /\.flac$/i; + $info = thaw scalar mp3info $file if $file =~ /\.mp3$/i; + $info = thaw scalar vorbisinfo $file if $file =~ /\.og(?:g|a)$/i; + $info = thaw scalar mp4info $file if $file =~ /\.mp4|\.aac|\.m4a$/i; next unless defined $info; my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a'; $files{$basename} //= []; @@ -160,14 +161,12 @@ sub run { } } delete $entry{$_} for qw/format file/; + $entry{fragment} = make_fragment @entry{qw/artist title/}; push @files, \%entry } @files = sort { $a->{title} cmp $b->{title} } @files; - my $json = JSON::MaybeXS->new(canonical => 1)->encode({files => \@files, prefix => $prefix}); - $json =~ s//>/g; - $ht->param(files => \@files, prefix => $prefix, json => $json); + $ht->param(files => \@files, prefix => $prefix); print $ht->output; } @@ -175,7 +174,7 @@ $default_template = <<'HTML'; Music - +
@@ -184,10 +183,8 @@ $default_template = <<'HTML'; TitleArtistAlbumGenreTrackYearType -/ +/ - - HTML 1; @@ -244,7 +241,7 @@ Marius Gavrilescu, Emarius@ieval.roE =head1 COPYRIGHT AND LICENSE -Copyright (C) 2013-2014 by Marius Gavrilescu +Copyright (C) 2013-2015 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,