X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FYouTubeGrabber.pm;h=9866c2757d6499f42a1f95f9b3c9021d933a6aed;hb=2e4c1c63603e09140a769bc3f89614f2cdd49629;hp=f4bac102695f61c02fffc588f8a7486f706ae49e;hpb=bd9a8a86176b546d3336587a8f28f9c25299f5f6;p=videosite.git

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index f4bac10..9866c27 100644
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -25,7 +25,7 @@ sub new {
     $self->{'NAME'} = 'youtube';
     $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*youtube.(?:com|de|co.uk)/watch\?(?:.+=.+&)*v=([-a-zA-Z0-9_]+))',
                            '(http://(?:[-a-zA-Z0-9_.]+\.)*youtube.(?:com|de|co.uk)/v/([-a-zA-Z0-9_]+))'];
-    $self->{'_PARAMS'} = {'QUALITY' => ['normal', 'Quality of the video to download. normal = standard resolution flash video, high = higher resolution flash video, h264 = high resolution MPEG4 video'], 'USERNAME' => ['', 'Username to use for YouTube login'], 'PASSWORD' => ['', 'Password to use for YouTube login']};
+    $self->{'_PARAMS'} = {'QUALITY' => ['normal', 'Quality of the video to download. normal = standard resolution flash video, high = higher resolution flash video, h264 = high resolution MPEG4 video, hd = HD720 rsolution'], 'USERNAME' => ['', 'Username to use for YouTube login'], 'PASSWORD' => ['', 'Password to use for YouTube login']};
 
     bless($self, $class);
     $self->_prepare_parameters();
@@ -63,6 +63,8 @@ sub _parse {
         $append = '&fmt=6';
     } elsif ($quality eq 'h264') {
         $append = '&fmt=18';
+    } elsif ($quality eq 'hd') {
+        $append = '&fmt=22';
     }
 
     $videourl = sprintf('http://www.youtube.com/watch?v=%s%s', $2, $append);
@@ -94,7 +96,7 @@ sub _parse {
         } elsif ('script' eq $tag->[0]) {
             $e = $p->get_text();
             if ($e =~ m|/watch_fullscreen\?(.+)\x27|) {
-                my %args = map { split(/=/, $_, 2); } split(/&/, $1);
+                my %args = map { split(/=/, $_, 2); } split(/&(?!amp;)/, $1);
                 $metadata->{'DLURL'} = sprintf('http://www.youtube.com/get_video.php?video_id=%s&t=%s%s',
                         $metadata->{'ID'}, $args{'t'}, $append);
                 $self->debug('URL found: %s', $metadata->{'DLURL'});