mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 21:45:05 +00:00
Merge branch 'master' of github.com:rg3/youtube-dl
This commit is contained in:
commit
b138de72f2
|
@ -134,7 +134,7 @@ which means you can modify it, redistribute it or use it however you like.
|
||||||
directory
|
directory
|
||||||
|
|
||||||
## Video Format Options:
|
## 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"
|
preference using slashes: "-f 22/17/18". "-f mp4"
|
||||||
and "-f flv" are also supported
|
and "-f flv" are also supported
|
||||||
--all-formats download all available video formats
|
--all-formats download all available video formats
|
||||||
|
|
|
@ -235,7 +235,7 @@ def parseOpts(overrideArguments=None):
|
||||||
|
|
||||||
video_format.add_option('-f', '--format',
|
video_format.add_option('-f', '--format',
|
||||||
action='store', dest='format', metavar='FORMAT', default='best',
|
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',
|
video_format.add_option('--all-formats',
|
||||||
action='store_const', dest='format', help='download all available video formats', const='all')
|
action='store_const', dest='format', help='download all available video formats', const='all')
|
||||||
video_format.add_option('--prefer-free-formats',
|
video_format.add_option('--prefer-free-formats',
|
||||||
|
|
|
@ -172,7 +172,11 @@ from .xhamster import XHamsterIE
|
||||||
from .xnxx import XNXXIE
|
from .xnxx import XNXXIE
|
||||||
from .xvideos import XVideosIE
|
from .xvideos import XVideosIE
|
||||||
from .xtube import XTubeIE
|
from .xtube import XTubeIE
|
||||||
from .yahoo import YahooIE, YahooSearchIE
|
from .yahoo import (
|
||||||
|
YahooIE,
|
||||||
|
YahooNewsIE,
|
||||||
|
YahooSearchIE,
|
||||||
|
)
|
||||||
from .youjizz import YouJizzIE
|
from .youjizz import YouJizzIE
|
||||||
from .youku import YoukuIE
|
from .youku import YoukuIE
|
||||||
from .youporn import YouPornIE
|
from .youporn import YouPornIE
|
||||||
|
|
|
@ -46,8 +46,7 @@ class ImdbIE(InfoExtractor):
|
||||||
formats.append({
|
formats.append({
|
||||||
'format_id': f_id,
|
'format_id': f_id,
|
||||||
'url': format_info['url'],
|
'url': format_info['url'],
|
||||||
'height': format_info['height'],
|
'height': int(info['titleObject']['encoding']['selected'][:-1]),
|
||||||
'width': format_info['width'],
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -17,27 +17,21 @@ class YahooIE(InfoExtractor):
|
||||||
_TESTS = [
|
_TESTS = [
|
||||||
{
|
{
|
||||||
u'url': u'http://screen.yahoo.com/julian-smith-travis-legg-watch-214727115.html',
|
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'info_dict': {
|
||||||
u'title': u'Julian Smith & Travis Legg Watch Julian Smith',
|
u'title': u'Julian Smith & Travis Legg Watch Julian Smith',
|
||||||
u'description': u'Julian and Travis 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'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'info_dict': {
|
||||||
u'title': u'Codefellas - The Cougar Lies with Spanish Moss',
|
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'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,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -53,8 +47,12 @@ class YahooIE(InfoExtractor):
|
||||||
# The 'meta' field is not always in the video webpage, we request it
|
# The 'meta' field is not always in the video webpage, we request it
|
||||||
# from another page
|
# from another page
|
||||||
long_id = info['id']
|
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"'
|
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
|
||||||
' AND plrs="86Gj0vCaSzV_Iuf6hNylf2"' % long_id)
|
' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"'
|
||||||
|
' AND protocol="http"' % long_id)
|
||||||
data = compat_urllib_parse.urlencode({
|
data = compat_urllib_parse.urlencode({
|
||||||
'q': query,
|
'q': query,
|
||||||
'env': 'prod',
|
'env': 'prod',
|
||||||
|
@ -100,6 +98,32 @@ 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'md5': u'67010fdf3a08d290e060a4dd96baa07b',
|
||||||
|
u'info_dict': {
|
||||||
|
u'id': u'104538833',
|
||||||
|
u'ext': u'mp4',
|
||||||
|
u'title': u'China Moses Is Crazy About the Blues',
|
||||||
|
u'description': u'md5:9900ab8cd5808175c7b3fe55b979bed0',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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):
|
class YahooSearchIE(SearchInfoExtractor):
|
||||||
IE_DESC = u'Yahoo screen search'
|
IE_DESC = u'Yahoo screen search'
|
||||||
_MAX_RESULTS = 1000
|
_MAX_RESULTS = 1000
|
||||||
|
|
Loading…
Reference in a new issue