Merge branch 'master' of ssh://ryoko:22003/home/sun/GIT/videosite

diff --combined videosite/YouTubeGrabber.pm
index f164af2,b0e6964..81c6dc1
--- 1/videosite/YouTubeGrabber.pm
--- 2/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@@ -57,7 -57,7 +57,7 @@@ sub new 
      $self->{'NAME'} = 'youtube';
      $self->{_SELFTESTURL} = 'http://www.youtube.com/watch?v=dMH0bHeiRNg';
      $self->{_SELFTESTTITLE} = 'Evolution of Dance - By Judson Laipply';
-     $self->{'PATTERNS'} = ['(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch(?:_popup)?\?(?:.+=.+&)*v=([-a-zA-Z0-9_]+))',
+     $self->{'PATTERNS'} = ['(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch(?:_popup)?\?(?:.+=.+&|&)*v=([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch\#\!v=([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/v/([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/user/[[:alnum:]]+\?v=([-a-zA-Z0-9_]+))',
@@@ -123,6 -123,7 +123,6 @@@ sub _parse_by_video_info 
      $metadata->{'SOURCE'} = $self->{'NAME'};
      $metadata->{'TITLE'} = undef;
      $metadata->{'DLURL'} = undef;
 -    $metadata->{'COOKIE'} = undef;
  
      $preflist = $preflist{$quality};
      $self->debug("Quality: %s, preflist: [%s]", $quality, join(", ", @{$preflist}));
@@@ -203,6 -204,7 +203,6 @@@ sub _parse_by_scrape 
      $metadata->{'SOURCE'} = $self->{'NAME'};
      $metadata->{'TITLE'} = undef;
      $metadata->{'DLURL'} = undef;
 -    $metadata->{'COOKIE'} = undef;
  
  
      $preflist = $preflist{$quality};
@@@ -219,6 -221,7 +219,6 @@@
          $self->debug('Video requires age verification');
          my @logindata = $self->__login($videourl, $ua);
          $r = $logindata[0];
 -        $metadata->{'COOKIE'} = $logindata[1];
          unless(defined($r)) {
              $self->error('Could not log into YouTube');
              return undef;
@@@ -338,35 -341,8 +338,35 @@@
                      $self->error('fmt_url_map not found in PLAYER_CONFIG');
                      return undef;
                  }
 +            } elsif ($e =~ m|yt\.playerConfig\s*=\s*(.+);\n|) {
 +                my $args = $1;
 +                $self->debug("Found yt.playerConfig: %s", $args);
 +
 +                $jsp = videosite::JSArrayParser->new();
 +                $self->debug("Using %s to parse", ref($jsp));
 +                $r = $jsp->parse($args);
 +
 +                unless(defined($r)) {
 +                    $self->error("Found information hash, but could not parse");
 +                    return undef;
 +                }
 +
 +                if (exists($r->{'args'}) and exists($r->{'args'}->{'ps'}) and ($r->{'args'}->{'ps'} eq 'live')) {
 +                    $self->error("Video URL seems to point to a live stream, cannot save this");
 +                    return undef;
 +                }
 +
 +                if (exists($r->{'args'}) and exists($r->{'args'}->{'url_encoded_fmt_stream_map'}) and ($r->{'args'}->{'url_encoded_fmt_stream_map'} ne '')) {
 +                    %urls = %{$self->_decode_url_encoded_fmt_stream_map($r->{'args'}->{'url_encoded_fmt_stream_map'}, 0)};
 +
 +                    $self->debug("Pagetype: 2012 (yt.playerConfig), url_encoded_fmt_stream_map");
 +                } else {
 +                    $self->error('url_map not found in yt.playerConfig');
 +                    return undef;
 +                }
              }
  
 +
              if (%urls) {
                  $self->__pick_url(\%urls, $preflist, $metadata);
                  last SWF_ARGS;