From acf37ca151d67ee28034775662318d9a0a1eb6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 29 Nov 2013 07:56:14 +0100
Subject: [PATCH 1/5] [imdb] Fix the resolution values (fixes #1847)
We were using the size of the player, it was the same for all the formats
---
youtube_dl/extractor/imdb.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/imdb.py b/youtube_dl/extractor/imdb.py
index 520edc7d0..d8e9712a7 100644
--- a/youtube_dl/extractor/imdb.py
+++ b/youtube_dl/extractor/imdb.py
@@ -46,8 +46,7 @@ class ImdbIE(InfoExtractor):
formats.append({
'format_id': f_id,
'url': format_info['url'],
- 'height': format_info['height'],
- 'width': format_info['width'],
+ 'height': int(info['titleObject']['encoding']['selected'][:-1]),
})
return {
From e1f900d6a4c449b2a7c7ed74dbe8eca74cbccf13 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 29 Nov 2013 09:44:05 +0100
Subject: [PATCH 2/5] fix typo in README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 580b16004..af4d969d6 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ which means you can modify it, redistribute it or use it however you like.
directory
## Video Format Options:
- -f, --format FORMAT video format code, specifiy the order of
+ -f, --format FORMAT video format code, specify the order of
preference using slashes: "-f 22/17/18". "-f mp4"
and "-f flv" are also supported
--all-formats download all available video formats
From 9986238ba9a486ca76334c50562760a312ab20fa Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 29 Nov 2013 09:48:38 +0100
Subject: [PATCH 3/5] fix typo in help
---
youtube_dl/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 0704515df..8f8422cc7 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -235,7 +235,7 @@ def parseOpts(overrideArguments=None):
video_format.add_option('-f', '--format',
action='store', dest='format', metavar='FORMAT', default='best',
- help='video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
+ help='video format code, specify the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
video_format.add_option('--all-formats',
action='store_const', dest='format', help='download all available video formats', const='all')
video_format.add_option('--prefer-free-formats',
From befd88b786dc41ff075693fd17bafbc7fa4c100e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 29 Nov 2013 15:25:43 +0100
Subject: [PATCH 4/5] [yahoo] Add an extractor for yahoo news (closes #1849)
---
youtube_dl/extractor/__init__.py | 6 +++++-
youtube_dl/extractor/yahoo.py | 34 +++++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index fd890e251..664639b53 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -172,7 +172,11 @@ from .xhamster import XHamsterIE
from .xnxx import XNXXIE
from .xvideos import XVideosIE
from .xtube import XTubeIE
-from .yahoo import YahooIE, YahooSearchIE
+from .yahoo import (
+ YahooIE,
+ YahooNewsIE,
+ YahooSearchIE,
+)
from .youjizz import YouJizzIE
from .youku import YoukuIE
from .youporn import YouPornIE
diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py
index 617e3bb06..2d87e81b2 100644
--- a/youtube_dl/extractor/yahoo.py
+++ b/youtube_dl/extractor/yahoo.py
@@ -53,8 +53,11 @@ class YahooIE(InfoExtractor):
# The 'meta' field is not always in the video webpage, we request it
# from another page
long_id = info['id']
+ return self._get_info(info['id'], video_id)
+
+ def _get_info(self, long_id, video_id):
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
- ' AND plrs="86Gj0vCaSzV_Iuf6hNylf2"' % long_id)
+ ' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"' % long_id)
data = compat_urllib_parse.urlencode({
'q': query,
'env': 'prod',
@@ -100,6 +103,35 @@ class YahooIE(InfoExtractor):
}
+class YahooNewsIE(YahooIE):
+ IE_NAME = 'yahoo:news'
+ _VALID_URL = r'http://news\.yahoo\.com/video/.*?-(?P<id>\d*?)\.html'
+
+ _TEST = {
+ u'url': u'http://news.yahoo.com/video/china-moses-crazy-blues-104538833.html',
+ u'info_dict': {
+ u'id': u'104538833',
+ u'ext': u'flv',
+ u'title': u'China Moses Is Crazy About the Blues',
+ u'description': u'md5:9900ab8cd5808175c7b3fe55b979bed0',
+ },
+ u'params': {
+ # Requires rtmpdump
+ u'skip_download': True,
+ },
+ }
+
+ # Overwrite YahooIE properties we don't want
+ _TESTS = []
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ video_id = mobj.group('id')
+ webpage = self._download_webpage(url, video_id)
+ long_id = self._search_regex(r'contentId: \'(.+?)\',', webpage, u'long id')
+ return self._get_info(long_id, video_id)
+
+
class YahooSearchIE(SearchInfoExtractor):
IE_DESC = u'Yahoo screen search'
_MAX_RESULTS = 1000
From c5171c454b4392f7276b7f9e94c25d7f1ad60375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 29 Nov 2013 22:06:17 +0100
Subject: [PATCH 5/5] [yahoo] Force use of the http protocol for downloading
the videos.
---
youtube_dl/extractor/yahoo.py | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py
index 2d87e81b2..e457c4707 100644
--- a/youtube_dl/extractor/yahoo.py
+++ b/youtube_dl/extractor/yahoo.py
@@ -17,27 +17,21 @@ class YahooIE(InfoExtractor):
_TESTS = [
{
u'url': u'http://screen.yahoo.com/julian-smith-travis-legg-watch-214727115.html',
- u'file': u'214727115.flv',
+ u'file': u'214727115.mp4',
+ u'md5': u'4962b075c08be8690a922ee026d05e69',
u'info_dict': {
u'title': u'Julian Smith & Travis Legg Watch Julian Smith',
u'description': u'Julian and Travis watch Julian Smith',
},
- u'params': {
- # Requires rtmpdump
- u'skip_download': True,
- },
},
{
u'url': u'http://screen.yahoo.com/wired/codefellas-s1-ep12-cougar-lies-103000935.html',
- u'file': u'103000935.flv',
+ u'file': u'103000935.mp4',
+ u'md5': u'd6e6fc6e1313c608f316ddad7b82b306',
u'info_dict': {
u'title': u'Codefellas - The Cougar Lies with Spanish Moss',
u'description': u'Agent Topple\'s mustache does its dirty work, and Nicole brokers a deal for peace. But why is the NSA collecting millions of Instagram brunch photos? And if your waffles have nothing to hide, what are they so worried about?',
},
- u'params': {
- # Requires rtmpdump
- u'skip_download': True,
- },
},
]
@@ -57,7 +51,8 @@ class YahooIE(InfoExtractor):
def _get_info(self, long_id, video_id):
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
- ' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"' % long_id)
+ ' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"'
+ ' AND protocol="http"' % long_id)
data = compat_urllib_parse.urlencode({
'q': query,
'env': 'prod',
@@ -109,16 +104,13 @@ class YahooNewsIE(YahooIE):
_TEST = {
u'url': u'http://news.yahoo.com/video/china-moses-crazy-blues-104538833.html',
+ u'md5': u'67010fdf3a08d290e060a4dd96baa07b',
u'info_dict': {
u'id': u'104538833',
- u'ext': u'flv',
+ u'ext': u'mp4',
u'title': u'China Moses Is Crazy About the Blues',
u'description': u'md5:9900ab8cd5808175c7b3fe55b979bed0',
},
- u'params': {
- # Requires rtmpdump
- u'skip_download': True,
- },
}
# Overwrite YahooIE properties we don't want