X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FYouTubeGrabber.pm;h=5d328de82f6b10f23d70df62448161852f5bd15d;hb=c41cdd5161342c69724537a5094fb9e270f48c55;hp=4449d1fa8122ee4ca362f517b9752e5e14217705;hpb=e3ddf9a3b8b6daf7ab0b5de3d5b26a1bd79eda15;p=videosite.git

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index 4449d1f..5d328de 100644
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -27,8 +27,10 @@ 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)/watch\#\!v=([-a-zA-Z0-9_]+))',
                            '(http://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/v/([-a-zA-Z0-9_]+))',
-			   '(http://(?:[-a-zA-Z0-9_.]+\.)*youtu\.be/([-a-zA-Z0-9_]+))'];
+                           '(http://(?:[-a-zA-Z0-9_.]+\.)*youtu\.be/([-a-zA-Z0-9_]+))',
+                           '(http://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/user/\w+\?.*/([-a-zA-Z0-9_]+))'];
     $self->{'_PARAMS'} = {
             'QUALITY' => ['normal', 'Quality of the video to download.', {
                     'normal' => 'standard resolution flash video',
@@ -113,10 +115,12 @@ sub _parse {
                 $self->debug('Title found: %s', $metadata->{'TITLE'});
             }
         } elsif ('script' eq $tag->[0]) {
+            my %urls;
+
             $e = $p->get_text();
             $self->debug("Found script: %s", $e);
+
             if ($e =~ m|\x27SWF_ARGS\x27:\s+(.+),|) {
-                my %urls;
                 my $args = $1;
 
                 $self->debug("Found SWF_ARGS: %s", $args);
@@ -136,6 +140,8 @@ sub _parse {
 
                     $urls =~ s/%([[:xdigit:]]{2})/chr(hex($1))/ge;
                     %urls = split(/[\|,]/, $urls);
+                    $self->debug("Pagetype: old (SWF_ARGS), fmt_url_map");
+
                 } elsif (exists($r->{'t'}) and ($r->{'t'} ne '')) {
                     my $thash = $r->{'t'};
 
@@ -153,17 +159,28 @@ sub _parse {
                                 $_[0],
                                 $thash);
                         }
+                        $self->debug("Pagetype: 2009 (SWF_ARGS), t with fmt_map");
+
                     } else {
                         $urls{5} = sprintf('http://www.youtube.com/get_video?video_id=%s&t=%s',
                             $metadata->{'ID'},
                             $thash);
+                        $self->debug("Pagetype: 2009 (SWF_ARGS), t without fmt_map");
                     }
                 } else {
                     $self->error('Neither fmt_url_map nor t found in video information hash');
                     return undef;
                 }
-                $self->debug("Found quality levels [%s]", join(", ", keys(%urls)));
+            } elsif ($e =~ m|var swfHTML = .*fmt_url_map=([^\&]+)\&|) {
+                my $urls = $1;
+                $self->debug("Video has fmt_url_map: %s", $urls);
 
+                $urls =~ s/%([[:xdigit:]]{2})/chr(hex($1))/ge;
+                %urls = split(/[\|,]/, $urls);
+                $self->debug("Pagetype: 2010 (swfHTML), fmt_url_map");
+            }
+
+            if (%urls) {
                 foreach (keys(%urls)) {
                     if ($_ == 35) {
                         $self->debug('Found flv,h264,large: %s', $urls{$_});
@@ -245,6 +262,8 @@ sub __login {
         return undef;
     }
 
+    $self->debug("Got a cookie");
+
     $r = $ua->get($videourl);
     if ($r->base->as_string() =~ m,/verify_age,) {
         $self->debug("Looking for session token...");