summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-video/get_flash_videos/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-video/get_flash_videos/files')
-rw-r--r--media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch100
1 files changed, 100 insertions, 0 deletions
diff --git a/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch b/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch
new file mode 100644
index 000000000000..0bca2bbd450d
--- /dev/null
+++ b/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch
@@ -0,0 +1,100 @@
+https://bugs.gentoo.org/show_bug.cgi?id=405761
+
+https://github.com/richcollins/get-flash-videos/commit/27e0f1d214e291debfd567b1652908d0ef6b79d1#lib/FlashVideo/Site
+
+--- lib/FlashVideo/Site/Youtube.pm~ 2010-11-30 14:34:17.000000000 +0000
++++ lib/FlashVideo/Site/Youtube.pm 2012-02-20 23:56:35.000000000 +0000
+@@ -26,6 +26,7 @@
+ if($embed_url !~ m!youtube\.com/watch!) {
+ $browser->get($embed_url);
+ if ($browser->response->header('Location') =~ m!/swf/.*video_id=([^&]+)!
++ || $browser->content =~ m!\<iframe[^\>]*src="http://www.youtube.com/embed/([^"]+)"!i
+ || $embed_url =~ m!/v/([-_a-z0-9]+)!i
+ || $browser->uri =~ m!v%3D([-_a-z0-9]+)!i) {
+ # We ended up on a embedded SWF or other redirect page
+@@ -48,12 +49,19 @@
+ # If the page contains fmt_url_map, then process this. With this, we
+ # don't require the 't' parameter.
+ if ($browser->content =~ /["']fmt_url_map["']:\s{0,3}(["'][^"']+["'])/) {
+- debug "Using fmt_url_map method from page ($1)";
+- return $self->download_fmt_map($prefs, $browser, $title, {}, @{from_json $1});
++ my $fmt_map = $1;
++ if ($fmt_map !~ /\|/) {
++ # $fmt_map is double escaped. We should unescape it here just
++ # once. Be careful not to unescape ',' in the URL.
++ $fmt_map = uri_unescape($fmt_map);
++ }
++ debug "Using fmt_url_map method from page ($fmt_map)";
++ return $self->download_fmt_map($prefs, $browser, $title, {}, @{from_json $fmt_map});
+ }
+
+ my $video_id;
+ if ($browser->content =~ /(?:var pageVideoId =|(?:CFG_)?VIDEO_ID'?\s*:)\s*'(.+?)'/
++ || $browser->content =~ /"video_id": "([^"]+)"/
+ || $embed_url =~ /v=([^&]+)/) {
+ $video_id = $1;
+ } else {
+@@ -125,6 +133,9 @@
+ } elsif($info{fmt_url_map}) {
+ debug "Using fmt_url_map method from info";
+ return $self->download_fmt_map($prefs, $browser, $title, \%info, $info{fmt_url_map});
++ } elsif($info{url_encoded_fmt_stream_map}) {
++ debug "Using url_encoded_fmt_stream_map method from info";
++ return $self->download_url_encoded_fmt_stream_map($prefs, $browser, $title, \%info, $info{url_encoded_fmt_stream_map});
+ }
+ }
+
+@@ -132,6 +143,53 @@
+ return download_get_video($browser, $prefs, $video_id, $title, $t);
+ }
+
++sub download_url_encoded_fmt_stream_map {
++ my($self, $prefs, $browser, $title, $info, $fmt_map) = @_;
++
++ my $fmt_url_map = parse_youtube_url_encoded_fmt_stream_map($fmt_map);
++
++ if (!$title and $browser->uri->as_string =~ m'/user/.*?#') {
++ my $video_id = (split /\//, $browser->uri->fragment)[-1];
++
++ my %info = get_youtube_video_info($browser->clone, $video_id);
++
++ $title = $info->{title};
++ }
++
++ my $preferred_quality = $prefs->quality->choose(map { $fmt_url_map->{$_->{id}}
++ ? { resolution => $_->{resolution}, url => $fmt_url_map->{$_->{id}} }
++ : () } @formats);
++
++ $browser->allow_redirects;
++
++ return $preferred_quality->{url}, title_to_filename($title, "mp4");
++}
++
++sub parse_youtube_url_encoded_fmt_stream_map {
++ my($raw_map) = @_;;
++
++ my $map = {};
++
++ foreach my $params (split /,/, $raw_map) {
++
++ my $format = "";
++ my $url = "";
++
++ foreach my $pair (split /&/, $params) {
++ my ($name, $value) = split /=/, $pair;
++ if ($name eq "itag"){
++ $format = $value;
++ } elsif ($name eq "url") {
++ $url = uri_unescape($value);
++ }
++ }
++
++ $map->{$format} = $url;
++ }
++
++ return $map;
++}
++
+ sub download_fmt_map {
+ my($self, $prefs, $browser, $title, $info, $fmt_map) = @_;
+