X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=f23063b2bbb89daf3a02bb0d22090a195436a98e;hb=5614c544d4ae33cdc9257d78fd18b6a63b84e47e;hp=4ff61baaa9d548494a75433d87f74aa21522f796;hpb=a06c3a2b63b4589efad35aebfbbe32d53e8f3d13;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 4ff61ba..f23063b 100644
--- 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,27 +112,34 @@ sub mp4info{
 	};
 }
 
+my %info = (
+	'.flac' => \&flacinfo,
+	'.mp3' => \&mp3info,
+	'.ogg' => \&vorbisinfo,
+	'.oga' => \&vorbisinfo,
+	'.mp4' => \&mp4info,
+	'.aac' => \&mp4info,
+	'.m4a' => \&mp4info,
+);
+
 sub normalizer{
 	"$_[0]|".(stat $_[0])[9]
 }
 
+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(
@@ -159,6 +159,7 @@ sub run {
 			}
 		}
 		delete $entry{$_} for qw/format file/;
+		$entry{fragment} = make_fragment @entry{qw/artist title/};
 		push @files, \%entry
 	}
 
@@ -180,7 +181,7 @@ $default_template = <<'HTML';
 <thead>
 <tr><th>Title<th>Artist<th>Album<th>Genre<th>Track<th>Year<th>Type
 <tbody><tmpl_loop files>
-<tr><td class="title"><tmpl_var title><td class="artist"><tmpl_var artist><td class="album"><tmpl_var album><td class="genre"><tmpl_var genre><td class="track"><tmpl_var tracknumber>/<tmpl_var tracktotal><td class="year"><tmpl_var year><td class="formats"><tmpl_loop formats><a href="<tmpl_var ...prefix><tmpl_var ESCAPE=URL file>"><tmpl_var format></a> </tmpl_loop></tmpl_loop>
+<tr><td class="title"><a href="#<tmpl_var fragment>" data-hash="#<tmpl_var fragment>"><tmpl_var title></a><td class="artist"><tmpl_var artist><td class="album"><tmpl_var album><td class="genre"><tmpl_var genre><td class="track"><tmpl_var tracknumber>/<tmpl_var tracktotal><td class="year"><tmpl_var year><td class="formats"><tmpl_loop formats><a href="<tmpl_var ...prefix><tmpl_var ESCAPE=URL file>"><tmpl_var format></a> </tmpl_loop></tmpl_loop>
 </table>
 HTML