Bug 32804: (QA follow-up) Typo ahs and fix ImportBatch.t

[koha-ffzg.git] / C4 / HTML5Media.pm

diff --git a/C4/HTML5Media.pm b/C4/HTML5Media.pm
index 7f6dff6..2c5a878 100644 (file)
--- a/C4/HTML5Media.pm
+++ b/C4/HTML5Media.pm
@@ -22,7 +22,7 @@ use warnings;
 
 use C4::Context;
 use MARC::Field;
-use Koha::Upload;
+use Koha::UploadedFiles;
 
 =head1 HTML5Media
 
@@ -50,8 +50,8 @@ sub gethtml5media {
     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 $is_youtube            = 0;
         my %HTML5Media;
         # protocol
         if ( $HTML5Media_field->indicator(1) eq '1' ) {
@@ -61,7 +61,7 @@ sub gethtml5media {
             $HTML5Media{protocol} = 'http';
         }
         elsif ( $HTML5Media_field->indicator(1) eq '7' ) {
-            if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC') {
+            if ($marcflavour eq 'MARC21') {
                 $HTML5Media{protocol} = $HTML5Media_field->subfield('2');
             }
             elsif ($marcflavour eq 'UNIMARC') {
@@ -100,18 +100,14 @@ sub gethtml5media {
             $HTML5Media{srcblock} = $HTML5Media_field->subfield('u');
             if (grep /youtu\.?be/, $HTML5Media_field->subfield('u') ) {
                 if ($HTML5MediaYouTube == 1) {
-                    require WWW::YouTube::Download;
-                    import  WWW::YouTube::Download qw(playback_url);
-                    my $youtube           = WWW::YouTube::Download->new;
-                    eval {
-                        $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
-                            }
-                        );
-                    };
-                    if ($@) { warn $@; }
-                    else  { $isyoutube = 1;}
+                    my $url = $HTML5Media_field->subfield('u');
+                    # Credit for regex goes to https://stackoverflow.com/questions/3452546/how-do-i-get-the-youtube-video-id-from-a-url
+                    next unless $url =~ m{^.*(youtu\.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*};
+                    my $video_id = $2;
+                    next unless length($video_id) == 11; # Youtube video ids are 11 chars length
+                    $HTML5Media{srcblock} = sprintf 'https://www.youtube.com/embed/%s', $video_id;
+                    $HTML5Media{is_youtube} = 1;
+                    $is_youtube = 1;
                 }
                else {
                    next; # do not embed youtube videos
@@ -134,21 +130,24 @@ sub gethtml5media {
         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];
+            my %public = ( ( caller )[1] =~ /opac/ ) ? ( public => 1 ): ();
+            my $upload = Koha::UploadedFiles->search({
+                hashvalue => $id, %public,
+            })->next;
+            next if !$upload || $upload->filename !~ /\./;
+            $HTML5Media{extension} = ( $upload->filename =~ m/([^.]+)$/ )[0];
         }
         # check remote files
         else {
             $HTML5Media{extension} = ($HTML5Media{srcblock} =~ m/([^.]+)$/)[0];
         }
-        if ( ( !grep /\Q$HTML5Media{extension}\E/, @HTML5MediaExtensions ) && ( $isyoutube != 1) ) {
+        if ( ( !grep /\Q$HTML5Media{extension}\E/, @HTML5MediaExtensions ) && ( $is_youtube != 1) ) {
             next; # not a specified media file
         }
         # youtube
-        if ($isyoutube == 1) {
-                $HTML5Media{mime} = 'video/webm';
+        if ($is_youtube == 1) {
+            $HTML5Media{mime} = 'video/webm';
+            $HTML5Media{type} = 'video';
         }
         # mime
         if ( $HTML5Media_field->subfield('c') ) {