X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FMusicExpo.pm;h=49276c124703efb78393e0c19e1c4d6db3f4dced;hb=1904b54c0625bcff5edc4434f953f44ef51e16d9;hp=5b66bab875a222b234086ec0636b3f3d0c5991bc;hpb=60376c0c311eded06caad49aec2d485462ffbb8e;p=app-musicexpo.git

diff --git a/lib/App/MusicExpo.pm b/lib/App/MusicExpo.pm
index 5b66bab..49276c1 100644
--- a/lib/App/MusicExpo.pm
+++ b/lib/App/MusicExpo.pm
@@ -3,14 +3,10 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '1.000';
+our $VERSION = '1.002001';
 
-use Audio::FLAC::Header qw//;
 use HTML::Template::Compiled qw//;
 use Memoize qw/memoize/;
-use MP3::Info qw/get_mp3tag/;
-use Ogg::Vorbis::Header::PurePerl;
-use MP4::Info qw/get_mp4tag get_mp4info/;
 
 use DB_File qw//;
 use Encode qw/encode/;
@@ -53,7 +49,7 @@ sub flacinfo{
 
 sub mp3info{
 	my $file=$_[0];
-	my %tag = map { encode 'UTF-8', $_ } %{get_mp3tag $file};
+	my %tag = map { encode 'UTF-8', $_ } %{MP3::Info::get_mp3tag $file};
 	my @trkn = split m#/#s, $tag{TRACKNUM} // '';
 
 	freeze +{
@@ -95,8 +91,8 @@ sub mp4_format ($){ ## no critic (ProhibitSubroutinePrototypes)
 
 sub mp4info{
 	my $file=$_[0];
-	my %tag = map { ref() ? $_ : encode 'UTF-8', $_ } %{get_mp4tag $file};
-	my %info = %{get_mp4info $file};
+	my %tag = map { ref() ? $_ : encode 'UTF-8', $_ } %{MP4::Info::get_mp4tag $file};
+	my %info = %{MP4::Info::get_mp4info $file};
 
 	freeze +{
 		format => mp4_format $info{ENCODING},
@@ -111,22 +107,55 @@ sub mp4info{
 	};
 }
 
-my %info = (
-	'.flac' => \&flacinfo,
-	'.mp3' => \&mp3info,
-	'.ogg' => \&vorbisinfo,
-	'.oga' => \&vorbisinfo,
-	'.mp4' => \&mp4info,
-	'.aac' => \&mp4info,
-	'.m4a' => \&mp4info,
+sub opusinfo {
+	my $file = $_[0];
+	my $of = Audio::Opusfile->new_from_file($file);
+	my $tags = $of->tags;
+
+	my %data = (
+		format => 'Opus',
+		title => $tags->query('TITLE'),
+		artist => $tags->query('ARTIST'),
+		year => $tags->query('DATE'),
+		album => $tags->query('ALBUM'),
+		tracknumber => $tags->query('TRACKNUMBER'),
+		tracktotal => $tags->query('TRACKTOTAL'),
+		genre => $tags->query('GENRE'),
+		file => scalar fileparse $file
+	);
+
+	freeze \%data;
+}
+
+my @optional_modules = (
+	[ 'Audio::FLAC::Header', \&flacinfo, '.flac' ],
+	[ 'MP3::Info', \&mp3info, '.mp3' ],
+	[ 'Ogg::Vorbis::Header::PurePerl', \&vorbisinfo, '.ogg', '.oga' ],
+	[ 'MP4::Info', \&mp4info, '.mp4', '.aac', '.m4a' ],
+	[ 'Audio::Opusfile', \&opusinfo, '.opus' ]
 );
 
+my %info;
+
+for (@optional_modules) {
+	my ($module, $coderef, @extensions_handled) = @$_;
+	if (eval "require $module") {
+		$info{$_} = $coderef for @extensions_handled
+	}
+}
+
+unless (%info) {
+	warn 'No tags-reading module detected. Install one of the following modules: ' . join ', ', map { $_->[0] } @optional_modules;
+}
+
 sub normalizer{
 	"$_[0]|".(stat $_[0])[9]
 }
 
 sub make_fragment{ join '-', map { lc =~ y/a-z0-9/_/csr } @_ }
 
+sub extensions_handled { keys %info }
+
 sub run {
 	if ($cache) {
 		tie my %cache, 'DB_File', $cache, O_RDWR|O_CREAT, 0644; ## no critic (ProhibitTie)
@@ -136,6 +165,7 @@ sub run {
 	my %files;
 	for my $file (@ARGV) {
 		my ($basename, undef, $suffix) = fileparse $file, keys %info;
+		next unless $suffix;
 		$files{$basename} //= [];
 		push @{$files{$basename}}, thaw scalar $info{$suffix}->($file);
 	}