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 (from parent 1:
f44eaa8
)
Youtube: Whitespace fixes
author
Ralf Ertzinger
<ralf@skytale.net>
Wed, 26 Nov 2014 20:00:01 +0000
(21:00 +0100)
committer
Ralf Ertzinger
<ralf@skytale.net>
Wed, 26 Nov 2014 20:00:01 +0000
(21:00 +0100)
videosite/YouTubeGrabber.pm
patch
|
blob
|
history
diff --git
a/videosite/YouTubeGrabber.pm
b/videosite/YouTubeGrabber.pm
index
503ec51
..
b67ea53
100644
(file)
--- a/
videosite/YouTubeGrabber.pm
+++ b/
videosite/YouTubeGrabber.pm
@@
-44,7
+44,7
@@
my %videoformats = (
36 => '3GP/MPEG4-Visual/240p',
37 => 'MP4/H264/AAC/1080p', # High
38 => 'MP4/H264/AAC/3072p', # High
36 => '3GP/MPEG4-Visual/240p',
37 => 'MP4/H264/AAC/1080p', # High
38 => 'MP4/H264/AAC/3072p', # High
- 43 => 'WebM/VP8/Vorbis/360p',
+ 43 => 'WebM/VP8/Vorbis/360p',
44 => 'WebM/VP8/Vorbis/480p',
45 => 'WebM/VP8/Vorbis/720p',
46 => 'WebM/VP8/Vorbis/1080p/3D', # effective 540p
44 => 'WebM/VP8/Vorbis/480p',
45 => 'WebM/VP8/Vorbis/720p',
46 => 'WebM/VP8/Vorbis/1080p/3D', # effective 540p
@@
-134,7
+134,7
@@
sub _parse {
#
# Returns hashref on success
# Returns undef on retryable error (try to scrape the website)
#
# Returns hashref on success
# Returns undef on retryable error (try to scrape the website)
-# Returns 0 on non-retryable error
+# Returns 0 on non-retryable error
#
sub _parse_by_video_info {
my $self = shift;
#
sub _parse_by_video_info {
my $self = shift;
@@
-292,7
+292,7
@@
sub _parse_by_scrape {
# Convert HTML entities in the title. This is a bit convoluted.
$metadata->{'TITLE'} = decode_entities(
decode("utf8", $metadata->{'TITLE'}));
# Convert HTML entities in the title. This is a bit convoluted.
$metadata->{'TITLE'} = decode_entities(
decode("utf8", $metadata->{'TITLE'}));
-
+
$self->debug('Title found: %s', $metadata->{'TITLE'});
}
} elsif ('script' eq $tag->[0]) {
$self->debug('Title found: %s', $metadata->{'TITLE'});
}
} elsif ('script' eq $tag->[0]) {
@@
-513,13
+513,13
@@
sub _decode_url_encoded_fmt_stream_map {
# - URL-decode each key and value _again_
#
# @data will be an array of hash references
# - URL-decode each key and value _again_
#
# @data will be an array of hash references
-
+
@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
# as a hash reference
@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
# as a hash reference
-
+
foreach (@data) {
if (exists($_->{'sig'})) {
foreach (@data) {
if (exists($_->{'sig'})) {