X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FHTML5Media.pm;h=b4389332a75aa6c0962c41f22bdf42979554226d;hb=eb04d174d91201b05b6e348dc672f9351dc0aaf0;hp=89620d3a7c27f5bc761f988f14a40064c90b1f27;hpb=840a907b86c054aa1c216a8cf353b1a9ef3c44fa;p=koha.git diff --git a/C4/HTML5Media.pm b/C4/HTML5Media.pm index 89620d3a7c..b4389332a7 100644 --- a/C4/HTML5Media.pm +++ b/C4/HTML5Media.pm @@ -1,28 +1,28 @@ package C4::HTML5Media; -# Copyright 2012 Mirko Tietgen +# Copyright 2012/2015 Mirko Tietgen # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; use C4::Context; use MARC::Field; - +use Koha::Upload; =head1 HTML5Media @@ -48,7 +48,9 @@ sub gethtml5media { my $HTML5MediaParent; my $HTML5MediaWidth; my @HTML5MediaExtensions = split( /\|/, C4::Context->preference("HTML5MediaExtensions") ); + my $HTML5MediaYouTube = C4::Context->preference("HTML5MediaYouTube"); my $marcflavour = C4::Context->preference("marcflavour"); + my $isyoutube = 0; foreach my $HTML5Media_field (@HTML5Media_fields) { my %HTML5Media; # protocol @@ -96,12 +98,29 @@ sub gethtml5media { # src if ( $HTML5Media_field->subfield('u') ) { $HTML5Media{srcblock} = $HTML5Media_field->subfield('u'); + if (grep /youtube/, $HTML5Media_field->subfield('u') ) { # TODO is there an official YT URL shortener? Can we use that too? + if ($HTML5MediaYouTube == 1) { + require WWW::YouTube::Download; + import WWW::YouTube::Download qw(playback_url); + my $youtube = WWW::YouTube::Download->new; + $HTML5Media{srcblock} = $youtube->playback_url( + $HTML5Media_field->subfield('u'), { + 'fmt' => '43' #webm is the only format compatible to all modern browsers. maybe check for available qualities + } + ); + # TODO handle error if format not available. Does that ever occur? + $isyoutube = 1; + } + else { + next; # do not embed youtube videos + } + } } elsif ( $HTML5Media_field->subfield('a') && $HTML5Media_field->subfield('d') && $HTML5Media_field->subfield('f') ) { $HTML5Media{host} = $HTML5Media_field->subfield('a'); $HTML5Media{host} =~ s/(^\/|\/$)//g; $HTML5Media{path} = $HTML5Media_field->subfield('d'); - $HTML5Media{path} =~ s/(^\/|\/$)//g; + $HTML5Media{path} =~ s/(^\/|\/$)//g; # TODO we could check for youtube here too, but nobody uses these fields anyway… $HTML5Media{file} = $HTML5Media_field->subfield('f'); $HTML5Media{srcblock} = $HTML5Media{protocol} . '://' . $HTML5Media{loginblock} . $HTML5Media{host} . $HTML5Media{portblock} . '/' . $HTML5Media{path} . '/' . $HTML5Media{file}; } @@ -109,10 +128,26 @@ sub gethtml5media { next; # no file to play } # extension - $HTML5Media{extension} = ($HTML5Media{srcblock} =~ m/([^.]+)$/)[0]; - if ( !grep /$HTML5Media{extension}/, @HTML5MediaExtensions ) { + # check uploaded files + if ( $HTML5Media{srcblock} =~ /\Qopac-retrieve-file.pl\E/ ) { + my ( undef, $id ) = split /id=/, $HTML5Media{srcblock}; + next if !$id; + my $public = ( ( caller )[1] =~ /opac/ ) ? { public => 1 }: {}; + my $upl = Koha::Upload->new( $public )->get({ hashvalue => $id }); + next if !$upl || $upl->{name} !~ /\./; + $HTML5Media{extension} = ( $upl->{name} =~ m/([^.]+)$/ )[0]; + } + # check remote files + else { + $HTML5Media{extension} = ($HTML5Media{srcblock} =~ m/([^.]+)$/)[0]; + } + if ( ( !grep /\Q$HTML5Media{extension}\E/, @HTML5MediaExtensions ) && ( $isyoutube != 1) ) { next; # not a specified media file } + # youtube + if ($isyoutube == 1) { + $HTML5Media{mime} = 'video/webm'; + } # mime if ( $HTML5Media_field->subfield('c') ) { $HTML5Media{codecs} = $HTML5Media_field->subfield('c'); @@ -144,7 +179,7 @@ sub gethtml5media { } if ( $HTML5Media{extension} eq 'oga' ) { $HTML5Media{mime} = 'audio/ogg'; - $HTML5Media{codecs} = 'vorbis'; + $HTML5Media{codecs} = 'vorbis'; } elsif ( $HTML5Media{extension} eq 'spx' ) { $HTML5Media{mime} = 'audio/ogg';