X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FYouTubeGrabber.pm;h=33ca46735a57c6b4b122ee20870f68e200c080e8;hb=4f73c0b48954f5f4f30ee96779ecaa3fca847305;hp=701a578a1e9b7d58f10d607b194628a50226ff0b;hpb=075b16a89d7b76ed8112c6fbce81f5517695fa9d;p=videosite.git

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index 701a578..33ca467 100644
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -6,10 +6,10 @@
 # download strategy revised using
 # http://www.kde-apps.org/content/show.php?content=41456
 
-package YouTubeGrabber;
+package videosite::YouTubeGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::UserAgent;
 use HTTP::Cookies;
@@ -25,7 +25,14 @@ 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 resolution'}],
+            'USERNAME' => ['', 'Username to use for YouTube login'],
+            'PASSWORD' => ['', 'Password to use for YouTube login']};
 
     bless($self, $class);
     $self->_prepare_parameters();
@@ -47,7 +54,12 @@ sub _parse {
     my $r;
     my $videourl;
     my $quality = $self->_getval('QUALITY');
-    my $append = '';
+    my %preflist = (
+        'hd' => [22, 35, 18, 34, 6, 5],
+        'h264' => [18, 34, 22, 35, 6, 5],
+        'high' => [34, 35, 18, 22, 6, 5],
+        'normal' => [6, 5, 34, 35, 18, 22]);
+    my $preflist;
 
     $url =~ m|$pattern|;
     $url = $1;
@@ -59,13 +71,10 @@ sub _parse {
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
-    if ($quality eq 'high') {
-        $append = '&fmt=6';
-    } elsif ($quality eq 'h264') {
-        $append = '&fmt=18';
-    }
+    $preflist = $preflist{$quality};
+    $self->debug("Quality: %s, preflist: [%s]", $quality, join(", ", @{$preflist}));
 
-    $videourl = sprintf('http://www.youtube.com/watch?v=%s%s', $2, $append);
+    $videourl = sprintf('http://www.youtube.com/watch?v=%s', $2);
 
     unless(defined($r = $ua->get($videourl))) {
         $self->error('Could not download %s', $url);
@@ -93,14 +102,44 @@ sub _parse {
             }
         } elsif ('script' eq $tag->[0]) {
             $e = $p->get_text();
-            if ($e =~ m|/watch_fullscreen\?(.+)\x27|) {
-                my %args = map { split(/=/, $_, 2); } split(/&/, $1);
-                $metadata->{'DLURL'} = sprintf('http://www.youtube.com/get_video.php?video_id=%s&t=%s%s',
-                        $metadata->{'ID'}, $args{'t'}, $append);
+            $self->debug("Found script: %s", $e);
+            if ($e =~ m|\x22fmt_url_map\x22\s*:\s*\x22([^\x22]+)\x22|) {
+                $self->debug("Found fmt_url_map: %s", $1);
+                my $urls = $1;
+                my %urls;
+
+                $urls =~ s/%([[:xdigit:]]{2})/chr(hex($1))/ge;
+                %urls = split(/[\|,]/, $urls);
+                $self->debug("Found quality levels [%s]", join(", ", keys(%urls)));
+
+                foreach (keys(%urls)) {
+                    if ($_ == 35) {
+                        $self->debug('Found flv,h264,large: %s', $urls{$_});
+                    } elsif ($_ == 34) {
+                        $self->debug('Found flv,h264: %s', $urls{$_});
+                    } elsif ($_ == 22) {
+                        $self->debug('Found mp4,h264,large: %s', $urls{$_});
+                    } elsif ($_ == 18) {
+                        $self->debug('Found mp4,h264: %s', $urls{$_});
+                    } elsif ($_ == 5) {
+                        $self->debug('Found flv,flv: %s', $urls{$_});
+                    } else {
+                        $self->error('Unknown tag %s: %s', $_, $urls{$_});
+                    }
+                }
+
+                foreach (@{$preflist}) {
+                    if (exists($urls{$_})) {
+                        $self->debug("Selected URL with quality level %s", $_);
+                        $metadata->{'DLURL'} = $urls{$_};
+                        last;
+                    }
+                }
+
                 $self->debug('URL found: %s', $metadata->{'DLURL'});
             }
         } elsif ('div' eq $tag->[0]) {
-            if ('errorBox' eq $tag->[1]->{'class'}) {
+            if (exists($tag->[1]->{'class'}) and ('errorBox' eq $tag->[1]->{'class'})) {
                 $self->error("Could not get video data for youtube %s: %s",
                         $metadata->{'ID'}, $p->get_trimmed_text());
                 return undef;