Work with raw bytes instead of UTF-8

[app-musicexpo.git] / lib / App / MusicExpo.pm

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index c38d2b7f7b22ff56e6e884ab94be428f233f76a4..f23063b2bbb89daf3a02bb0d22090a195436a98e 100644 (file)
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -32,13 +32,6 @@ GetOptions (
        "cache:s" => \$cache,
 );
 
-
-sub fix{
-       my $copy = $_[0];
-       utf8::decode($copy);
-       $copy
-}
-
 sub flacinfo{
        my $file=$_[0];
        my $flac=Audio::FLAC::Header->new($file);
@@ -46,13 +39,13 @@ sub flacinfo{
 
        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') // '?'),
+               title => $flac->tags('TITLE') // '?',
+               artist => $flac->tags('ARTIST') // '?',
+               year => $flac->tags('DATE') // '?',
+               album => $flac->tags('ALBUM') // '?',
+               tracknumber => $flac->tags('TRACKNUMBER') // '?',
+               tracktotal => $flac->tags('TRACKTOTAL') // '?',
+               genre => $flac->tags('GENRE') // '?',
                file => $file,
        }
 }
@@ -64,13 +57,13 @@ sub mp3info{
 
        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) || '?',
+               title => $mp3->title || '?',
+               artist => $mp3->artist || '?',
+               year => $mp3->year || '?',
+               album => $mp3->album || '?',
+               tracknumber => $mp3->track1 || '?',
+               tracktotal => $mp3->track2 || '?',
+               genre => $mp3->genre || '?',
                file => $file,
        }
 }
@@ -82,13 +75,13 @@ sub vorbisinfo{
 
        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')) || '?',
+               title => $ogg->comment('TITLE') || '?',
+               artist => $ogg->comment('artist') || '?',
+               year => $ogg->comment('DATE') || '?',
+               album => $ogg->comment('ALBUM') || '?',
+               tracknumber => $ogg->comment('TRACKNUMBER') || '?',
+               tracktotal => $ogg->comment('TRACKTOTAL') || '?',
+               genre => $ogg->comment('GENRE') || '?',
                file => $file,
        }
 }
@@ -119,6 +112,16 @@ sub mp4info{
        };
 }
 
+my %info = (
+       '.flac' => \&flacinfo,
+       '.mp3' => \&mp3info,
+       '.ogg' => \&vorbisinfo,
+       '.oga' => \&vorbisinfo,
+       '.mp4' => \&mp4info,
+       '.aac' => \&mp4info,
+       '.m4a' => \&mp4info,
+);
+
 sub normalizer{
        "$_[0]|".(stat $_[0])[9]
 }
@@ -126,22 +129,17 @@ sub normalizer{
 sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ }
 
 sub run {
+       my %info = %info;
        if ($cache) {
                tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644;
-               memoize $_, NORMALIZER => \&normalizer, LIST_CACHE => 'MERGE', SCALAR_CACHE => [HASH => \%cache] for qw/flacinfo mp3info vorbisinfo mp4info/;
+               $info{$_} = memoize $info{$_}, INSTALL => undef, NORMALIZER => \&normalizer, LIST_CACHE => 'FAULT', SCALAR_CACHE => [HASH => \%cache] for keys %info;
        }
 
        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;
-               next unless defined $info;
-               my $basename = fileparse $file, '.flac', '.mp3', '.ogg', '.oga', '.mp4', '.aac', '.m4a';
+               my ($basename, undef, $suffix) = fileparse $file, keys %info;
                $files{$basename} //= [];
-               push @{$files{$basename}}, $info;
+               push @{$files{$basename}}, thaw scalar $info{$suffix}->($file);
        }
 
        my $ht=HTML::Template::Compiled->new(