mirror of
https://source.netsyms.com/Mirrors/youtube-dl
synced 2026-05-04 22:11:06 +00:00
Compare commits
4 Commits
2013.12.16
...
2013.12.16
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
83c632dc43 | ||
|
|
ff07a05575 | ||
|
|
f25571ffbf | ||
|
|
f7a6892572 |
@@ -266,20 +266,6 @@ class ArteTVDDCIE(ArteTVPlus7IE):
|
|||||||
IE_NAME = u'arte.tv:ddc'
|
IE_NAME = u'arte.tv:ddc'
|
||||||
_VALID_URL = r'http?://ddc\.arte\.tv/(?P<lang>emission|folge)/(?P<id>.+)'
|
_VALID_URL = r'http?://ddc\.arte\.tv/(?P<lang>emission|folge)/(?P<id>.+)'
|
||||||
|
|
||||||
_TEST = {
|
|
||||||
u'url': u'http://ddc.arte.tv/folge/neues-aus-mauretanien',
|
|
||||||
u'file': u'049881-009_PLUS7-D.flv',
|
|
||||||
u'info_dict': {
|
|
||||||
u'title': u'Mit offenen Karten',
|
|
||||||
u'description': u'md5:57929b0eaeddeb8a0c983f58e9ebd3b6',
|
|
||||||
u'upload_date': u'20131207',
|
|
||||||
},
|
|
||||||
u'params': {
|
|
||||||
# rtmp download
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id, lang = self._extract_url_info(url)
|
video_id, lang = self._extract_url_info(url)
|
||||||
if lang == 'folge':
|
if lang == 'folge':
|
||||||
|
|||||||
@@ -241,6 +241,12 @@ class GenericIE(InfoExtractor):
|
|||||||
# Don't set the extractor because it can be a track url or an album
|
# Don't set the extractor because it can be a track url or an album
|
||||||
return self.url_result(burl)
|
return self.url_result(burl)
|
||||||
|
|
||||||
|
# Look for embedded Vevo player
|
||||||
|
mobj = re.search(
|
||||||
|
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:cache\.)?vevo\.com/.+?)\1', webpage)
|
||||||
|
if mobj is not None:
|
||||||
|
return self.url_result(mobj.group('url'))
|
||||||
|
|
||||||
# Start with something easy: JW Player in SWFObject
|
# Start with something easy: JW Player in SWFObject
|
||||||
mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
|
mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
|
||||||
if mobj is None:
|
if mobj is None:
|
||||||
|
|||||||
@@ -15,7 +15,11 @@ class VevoIE(InfoExtractor):
|
|||||||
Accepts urls from vevo.com or in the format 'vevo:{id}'
|
Accepts urls from vevo.com or in the format 'vevo:{id}'
|
||||||
(currently used by MTVIE)
|
(currently used by MTVIE)
|
||||||
"""
|
"""
|
||||||
_VALID_URL = r'((http://www\.vevo\.com/watch/(?:[^/]+/[^/]+/)?)|(vevo:))(?P<id>.*?)(\?|$)'
|
_VALID_URL = r'''(?x)
|
||||||
|
(?:https?://www\.vevo\.com/watch/(?:[^/]+/[^/]+/)?|
|
||||||
|
https?://cache\.vevo\.com/m/html/embed\.html\?video=|
|
||||||
|
vevo:)
|
||||||
|
(?P<id>[^&?#]+)'''
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
u'url': u'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
|
u'url': u'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
|
||||||
u'file': u'GB1101300280.mp4',
|
u'file': u'GB1101300280.mp4',
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
|
|
||||||
__version__ = '2013.12.16.5'
|
__version__ = '2013.12.16.6'
|
||||||
|
|||||||
Reference in New Issue
Block a user