From: Ralf Ertzinger <ralf@skytale.net>
Date: Sat, 3 Sep 2011 22:10:42 +0000 (+0200)
Subject: YouTube: add config variable to disable use of HTTPS URLs (where possible)
X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=d99e82114bef70ddbb261ac55ddbe6e9bebea789

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

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index 8d8d8fd..fd3ee93 100644
--- 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);
@@ -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);