X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=96f9d8dda75d7c7680e0b99469bcdc2e2bcec456;hb=9b989f9631e26e943f09be01e8846771112c695c;hp=ebee6efc784f18ae802565dcc0c3a02a79fd8e81;hpb=ddd1adc5bc05303d3a0b9328a16481af97c23323;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index ebee6ef..96f9d8d 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//;
@@ -140,7 +140,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,7 +153,13 @@ 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
 	}
 
@@ -169,6 +175,9 @@ $default_template = <<'HTML';
 <title>Music</title>
 <meta charset="utf-8">
 <link rel="stylesheet" href="/music.css">
+<script async defer type="application/javascript" src="player.js"></script>
+
+<div id="player"></div>
 
 <table border>
 <thead>