git://git.camperquake.de
/
videosite.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5b3d83
)
YouTube: add config variable to disable use of HTTPS URLs (where possible)
author
Ralf Ertzinger
<ralf@skytale.net>
Sat, 3 Sep 2011 22:10:42 +0000
(
00:10
+0200)
committer
Ralf Ertzinger
<ralf@skytale.net>
Sat, 3 Sep 2011 22:10:42 +0000
(
00:10
+0200)
videosite/YouTubeGrabber.pm
patch
|
blob
|
history
diff --git
a/videosite/YouTubeGrabber.pm
b/videosite/YouTubeGrabber.pm
index
8d8d8fd
..
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'],
'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();
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}));
$preflist = $preflist{$quality};
$self->debug("Quality: %s, preflist: [%s]", $quality, join(", ", @{$preflist}));
- $videourl = sprintf('
http
s://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);
$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}));
$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);
unless(defined($r = $ua->get($videourl))) {
$self->error('Could not download %s', $url);