YouTube: add config variable to disable use of HTTPS URLs (where possible)

[videosite.git] / videosite / YouTubeGrabber.pm

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index fd3e0c0..fd3ee93 100644 (file)
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -58,7 +58,8 @@ sub new {
                     '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();
@@ -113,8 +114,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);
@@ -127,7 +128,7 @@ sub _parse_by_video_info {
     $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'});
@@ -139,7 +140,7 @@ sub _parse_by_video_info {
         $urls = $self->decode_hexurl($content->{'fmt_url_map'});
         $urls = { split /[\|,]/, $urls };
     } elsif (exists($content->{'url_encoded_fmt_stream_map'})) {
-        $urls = $self->_decode_url_encoded_fmt_stream_map($content->{'url_encoded_fmt_stream_map'});
+        $urls = $self->_decode_url_encoded_fmt_stream_map($content->{'url_encoded_fmt_stream_map'}, 1);
     } else {
         $self->debug("No URL data found");
         return undef;
@@ -195,7 +196,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);
@@ -467,7 +468,7 @@ sub _decode_url_encoded_fmt_stream_map {
     my $dataencoded = shift;
     my @data;
 
-    $data = $self->decode_hexurl($data) if (defined($dataencoded) && $dataencoded);
+    $data = $self->decode_hexurl($data) if $dataencoded;
     # This will
     # - Split the decoded string into segments (along ,)
     # - Interpret each segment as a concatenated key-value list (key and value separated by =, pairs separated by &
@@ -475,7 +476,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