Merge branch 'master' of http://10.200.0.3/GIT/videosite

diff --combined videosite/YouTubeGrabber.pm
index ede2dcc,fd3ee93..1a331d1
--- 1/videosite/YouTubeGrabber.pm
--- 2/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@@ -26,17 -26,16 +26,17 @@@ my %preflist = 
      'high' => [34, 35, 18, 37, 22, 6, 5, 38, 43],
      'normal' => [6, 5, 34, 35, 18, 22, 37, 38, 43]);
  my %videoformats = (
 -    43 => 'webm,360p',
 -    44 => 'webm,480p',
 -    45 => 'webm,720p',
 -    38 => 'mp4,h264,4k',
 -    37 => 'mp4,h264,1080p',
 -    35 => 'flv,h264,large',
 -    34 => 'flv,h264',
 -    22 => 'mp4,h264,720p',
 -    18 => 'mp4,h264',
 -    5 => 'flv,flv',
 +    # Container/Video codec/Audio codec/Resolution
 +    5 => 'FLV/Sorenson/MP3/240p',
 +    18 => 'MP4/H264/AAC/360p',
 +    22 => 'MP4/H264/AAC/720p',
 +    34 => 'FLV/H264/AAC/360p',
 +    35 => 'FLV/H264/AAC/480p',
 +    37 => 'MP4/H264/AAC/1080p',
 +    38 => 'MP4/H264/AAC/3072p',
 +    43 => 'WebM/VP8/Vorbis/360p',
 +    44 => 'WebM/VP8/Vorbis/480p',
 +    45 => 'WebM/VP8/Vorbis/720p',
      );
  
  sub new {
@@@ -59,7 -58,8 +59,8 @@@
                      'h264' => 'high resolution MPEG4 video',
                      'hd' => 'HD720 resolution'}],
              'USERNAME' => ['', 'Username to use for YouTube login'],
-             'PASSWORD' => ['', 'Password to use for YouTube login']};
+             'PASSWORD' => ['', 'Password to use for YouTube login'],
+             'HTTPS' => [1, 'Whether to use HTTPS (if available) to connect to YouTube']};
  
      bless($self, $class);
      $self->_prepare_parameters();
@@@ -114,8 -114,8 +115,8 @@@ sub _parse_by_video_info 
      $preflist = $preflist{$quality};
      $self->debug("Quality: %s, preflist: [%s]", $quality, join(", ", @{$preflist}));
  
-     $videourl = sprintf('https://www.youtube.com/get_video_info?video_id=%s&eurl=%s',
-             $id, 'http%3A%2F%2Fwww%2Eyoutube%2Ecom%2F');
+     $videourl = sprintf('%s://www.youtube.com/get_video_info?video_id=%s&eurl=%s',
+             $self->_getval('HTTPS')?'https':'http', $id, 'http%3A%2F%2Fwww%2Eyoutube%2Ecom%2F');
      $self->debug("Video info URL: %s", $videourl);
  
      $r = $ua->get($videourl);
@@@ -128,7 -128,7 +129,7 @@@
      $self->debug('Content from get_video_info: %s', $content);
  
      # Decode content
-     $content = { split /[&=]/, $content };
+     $content = $self->decode_querystring($content);
  
      if ($content->{'status'} ne 'ok') {
          $self->debug("Non OK status code found: %s", $content->{'status'});
@@@ -196,7 -196,7 +197,7 @@@ sub _parse_by_scrape 
      $preflist = $preflist{$quality};
      $self->debug("Quality: %s, preflist: [%s]", $quality, join(", ", @{$preflist}));
  
-     $videourl = sprintf('https://www.youtube.com/watch?v=%s', $id);
+     $videourl = sprintf('%s://www.youtube.com/watch?v=%s', $self->_getval('HTTPS')?'https':'http', $id);
  
      unless(defined($r = $ua->get($videourl))) {
          $self->error('Could not download %s', $url);
@@@ -476,7 -476,7 +477,7 @@@ sub _decode_url_encoded_fmt_stream_map 
      #
      # @data will be an array of hash references
      
-     @data = map { { map { $self->decode_hexurl($_) } split /[=&]/ } } split /,/, $data;
+     @data = map { { map { $self->decode_hexurl($_) } split /[&=]/  } } split /,/, $data;
      $self->debug("_decode_url_encoded_fmt_stream_map() decoded %s", Dumper(\@data));
  
      # From each array entry, pick the itag and the url values and return that