Merge remote-tracking branch 'gekitsuu/master' (closes PR #1913)

This commit is contained in:
Jaime Marquínez Ferrándiz 2013-12-07 10:48:15 +01:00
commit 870fc4e578
2 changed files with 26 additions and 0 deletions

View file

@ -111,6 +111,7 @@ from .photobucket import PhotobucketIE
from .podomatic import PodomaticIE from .podomatic import PodomaticIE
from .pornhub import PornHubIE from .pornhub import PornHubIE
from .pornotube import PornotubeIE from .pornotube import PornotubeIE
from .pyvideo import PyvideoIE
from .rbmaradio import RBMARadioIE from .rbmaradio import RBMARadioIE
from .redtube import RedTubeIE from .redtube import RedTubeIE
from .ringtv import RingTVIE from .ringtv import RingTVIE

View file

@ -0,0 +1,25 @@
import re
from .common import InfoExtractor
from ..utils import determine_ext
class PyvideoIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?pyvideo\.org/video/(\d+)/(.*)'
_TEST = {
u'url': u'http://pyvideo.org/video/1737/become-a-logging-expert-in-30-minutes',
u'file': u'Become a logging expert in 30 minutes-24_4WWkSmNo.mp4',
u'md5': u'bf08cae24e1601027f98ae1262c299ad',
u'info_dict': {
u"title": u"Become a logging expert in 30 minutes"
}
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group(2)
webpage = self._download_webpage(url, video_id)
m_youtube = re.search(r'(https?://www\.youtube\.com/watch\?v=.*)', webpage)
if m_youtube is not None:
return self.url_result(m_youtube.group(1), 'Youtube')