From ca9e02dc00fcfbc86fdf5d645417430ecb135537 Mon Sep 17 00:00:00 2001 From: Adam Glenn Date: Fri, 6 Dec 2013 21:11:01 -0800 Subject: [PATCH 1/2] Adding pyvideo support --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/pyvideo.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 youtube_dl/extractor/pyvideo.py diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index f6a23f663..d7cb6e463 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -111,6 +111,7 @@ from .photobucket import PhotobucketIE from .podomatic import PodomaticIE from .pornhub import PornHubIE from .pornotube import PornotubeIE +from .pyvideo import PyvideoIE from .rbmaradio import RBMARadioIE from .redtube import RedTubeIE from .ringtv import RingTVIE diff --git a/youtube_dl/extractor/pyvideo.py b/youtube_dl/extractor/pyvideo.py new file mode 100644 index 000000000..243dff806 --- /dev/null +++ b/youtube_dl/extractor/pyvideo.py @@ -0,0 +1,26 @@ +import re + +from .common import InfoExtractor +from ..utils import determine_ext + + +class PyvideoIE(InfoExtractor): + _VALID_URL = r'(?:http://)?(?:www\.)?break\.com/video/([^/]+)' + _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') From f623530d6e1ac63e0e2056274cb9b59b8699ce0c Mon Sep 17 00:00:00 2001 From: Adam Glenn Date: Fri, 6 Dec 2013 21:12:10 -0800 Subject: [PATCH 2/2] removing bad VALID_URL --- youtube_dl/extractor/pyvideo.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/pyvideo.py b/youtube_dl/extractor/pyvideo.py index 243dff806..5c47993e7 100644 --- a/youtube_dl/extractor/pyvideo.py +++ b/youtube_dl/extractor/pyvideo.py @@ -5,7 +5,6 @@ from ..utils import determine_ext class PyvideoIE(InfoExtractor): - _VALID_URL = r'(?:http://)?(?:www\.)?break\.com/video/([^/]+)' _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',