mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 08:26:50 +00:00
[pyvideo] add support for videos that don't come from Youtube
This commit is contained in:
parent
0d9ec5d963
commit
c4d9e6731a
@ -1,11 +1,12 @@
|
|||||||
import re
|
import re
|
||||||
|
import os
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class PyvideoIE(InfoExtractor):
|
class PyvideoIE(InfoExtractor):
|
||||||
_VALID_URL = r'(?:http://)?(?:www\.)?pyvideo\.org/video/(\d+)/(.*)'
|
_VALID_URL = r'(?:http://)?(?:www\.)?pyvideo\.org/video/(?P<id>\d+)/(.*)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
u'url': u'http://pyvideo.org/video/1737/become-a-logging-expert-in-30-minutes',
|
u'url': u'http://pyvideo.org/video/1737/become-a-logging-expert-in-30-minutes',
|
||||||
u'file': u'24_4WWkSmNo.mp4',
|
u'file': u'24_4WWkSmNo.mp4',
|
||||||
u'md5': u'de317418c8bc76b1fd8633e4f32acbc6',
|
u'md5': u'de317418c8bc76b1fd8633e4f32acbc6',
|
||||||
@ -17,13 +18,34 @@ class PyvideoIE(InfoExtractor):
|
|||||||
u"uploader_id": u"NextDayVideo",
|
u"uploader_id": u"NextDayVideo",
|
||||||
},
|
},
|
||||||
u'add_ie': ['Youtube'],
|
u'add_ie': ['Youtube'],
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
u'url': u'http://pyvideo.org/video/2542/gloriajw-spotifywitherikbernhardsson182m4v',
|
||||||
|
u'md5': u'5fe1c7e0a8aa5570330784c847ff6d12',
|
||||||
|
u'info_dict': {
|
||||||
|
u'id': u'2542',
|
||||||
|
u'ext': u'm4v',
|
||||||
|
u'title': u'Gloriajw-SpotifyWithErikBernhardsson182',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group(2)
|
video_id = mobj.group('id')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
m_youtube = re.search(r'(https?://www\.youtube\.com/watch\?v=.*)', webpage)
|
m_youtube = re.search(r'(https?://www\.youtube\.com/watch\?v=.*)', webpage)
|
||||||
|
|
||||||
if m_youtube is not None:
|
if m_youtube is not None:
|
||||||
return self.url_result(m_youtube.group(1), 'Youtube')
|
return self.url_result(m_youtube.group(1), 'Youtube')
|
||||||
|
|
||||||
|
title = self._html_search_regex(r'<div class="section">.*?<h3>([^>]+?)</h3>',
|
||||||
|
webpage, u'title', flags=re.DOTALL)
|
||||||
|
video_url = self._search_regex([r'<source src="(.*?)"',
|
||||||
|
r'<dt>Download</dt>.*?<a href="(.+?)"'],
|
||||||
|
webpage, u'video url', flags=re.DOTALL)
|
||||||
|
return {
|
||||||
|
'id': video_id,
|
||||||
|
'title': os.path.splitext(title)[0],
|
||||||
|
'url': video_url,
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user