From 6a1f7df933501d8b892e6f38528e1aa804130c6f Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Sun, 1 Jun 2014 11:28:08 +0300 Subject: [PATCH] Reindent MusicExpo.pm --- lib/App/MusicExpo.pm | 170 +++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm index c3ee03a..967e9f4 100644 --- a/lib/App/MusicExpo.pm +++ b/lib/App/MusicExpo.pm @@ -26,110 +26,110 @@ our $cache=''; our $template=''; GetOptions ( - "template=s" => \$template, - "prefix=s" => \$prefix, - "cache=s" => \$cache, + "template=s" => \$template, + "prefix=s" => \$prefix, + "cache=s" => \$cache, ); sub fix{ - my $copy = $_[0]; - utf8::decode($copy); - $copy + my $copy = $_[0]; + utf8::decode($copy); + $copy } sub flacinfo{ - my $file=$_[0]; - my $flac=Audio::FLAC::Header->new($file); - $file = scalar fileparse $file; - - freeze +{ - format => 'FLAC', - title => fix ($flac->tags('TITLE') // '?'), - artist => fix ($flac->tags('ARTIST') // '?'), - year => fix ($flac->tags('DATE') // '?'), - album => fix ($flac->tags('ALBUM') // '?'), - tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'), - tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'), - genre => fix ($flac->tags('GENRE') // '?'), - file => $file, - } + my $file=$_[0]; + my $flac=Audio::FLAC::Header->new($file); + $file = scalar fileparse $file; + + freeze +{ + format => 'FLAC', + title => fix ($flac->tags('TITLE') // '?'), + artist => fix ($flac->tags('ARTIST') // '?'), + year => fix ($flac->tags('DATE') // '?'), + album => fix ($flac->tags('ALBUM') // '?'), + tracknumber => fix ($flac->tags('TRACKNUMBER') // '?'), + tracktotal => fix ($flac->tags('TRACKTOTAL') // '?'), + genre => fix ($flac->tags('GENRE') // '?'), + file => $file, + } } sub mp3info{ - my $file=$_[0]; - my $mp3=MP3::Tag->new($file); - $file = scalar fileparse $file; - - freeze +{ - format => 'MP3', - title => fix ($mp3->title || '?'), - artist => fix ($mp3->artist || '?'), - year => fix ($mp3->year || '?'), - album => fix ($mp3->album || '?'), - tracknumber => fix ($mp3->track1 || '?'), - tracktotal => fix ($mp3->track2 || '?'), - genre => fix ($mp3->genre) || '?', - file => $file, - } + my $file=$_[0]; + my $mp3=MP3::Tag->new($file); + $file = scalar fileparse $file; + + freeze +{ + format => 'MP3', + title => fix ($mp3->title || '?'), + artist => fix ($mp3->artist || '?'), + year => fix ($mp3->year || '?'), + album => fix ($mp3->album || '?'), + tracknumber => fix ($mp3->track1 || '?'), + tracktotal => fix ($mp3->track2 || '?'), + genre => fix ($mp3->genre) || '?', + file => $file, + } } sub vorbisinfo{ - my $file=$_[0]; - my $ogg=Ogg::Vorbis::Header::PurePerl->new($file); - $file = scalar fileparse $file; - - freeze +{ - format => 'Vorbis', - title => fix($ogg->comment('TITLE') || '?'), - artist => fix ($ogg->comment('artist') || '?'), - year => fix ($ogg->comment('DATE') || '?'), - album => fix ($ogg->comment('ALBUM') || '?'), - tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'), - tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'), - genre => fix ($ogg->comment('GENRE')) || '?', - file => $file, - } + my $file=$_[0]; + my $ogg=Ogg::Vorbis::Header::PurePerl->new($file); + $file = scalar fileparse $file; + + freeze +{ + format => 'Vorbis', + title => fix($ogg->comment('TITLE') || '?'), + artist => fix ($ogg->comment('artist') || '?'), + year => fix ($ogg->comment('DATE') || '?'), + album => fix ($ogg->comment('ALBUM') || '?'), + tracknumber => fix ($ogg->comment('TRACKNUMBER') || '?'), + tracktotal => fix ($ogg->comment('TRACKTOTAL') || '?'), + genre => fix ($ogg->comment('GENRE')) || '?', + file => $file, + } } sub normalizer{ - "$_[0]|".(stat $_[0])[9] + "$_[0]|".(stat $_[0])[9] } 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 ''; - - 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; - next unless defined $info; - my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga'; - $files{$basename} //= []; - push $files{$basename}, $info; - } - - my $ht=HTML::Template::Compiled->new( - default_escape => 'HTML', - global_vars => 2, - $template eq '' ? (scalarref => \$default_template) : (filename => $template), - ); - - my @files; - for (values %files) { - my @versions = @$_; - my %entry = (%{$versions[0]}, formats => []); - push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions; - push @files, \%entry - } - - $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix); - print $ht->output; + 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 ''; + + 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; + next unless defined $info; + my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga'; + $files{$basename} //= []; + push $files{$basename}, $info; + } + + my $ht=HTML::Template::Compiled->new( + default_escape => 'HTML', + global_vars => 2, + $template eq '' ? (scalarref => \$default_template) : (filename => $template), + ); + + my @files; + for (values %files) { + my @versions = @$_; + my %entry = (%{$versions[0]}, formats => []); + push $entry{formats}, {format => $_->{format}, file => $_->{file}} for @versions; + push @files, \%entry + } + + $ht->param(files=>[sort { $a->{title} cmp $b->{title} } @files], prefix => $prefix); + print $ht->output; } $default_template = <<'HTML'; -- 2.30.2