From eb1634cbf81f6b00705aa515af981aaf349870ac Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 23 Jun 2013 22:26:30 +0200 Subject: [PATCH] [Vine] move into own file --- youtube_dl/InfoExtractors.py | 34 +-------------------------------- youtube_dl/extractor/vine.py | 37 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 youtube_dl/extractor/vine.py diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 995dae062..c319545c7 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -57,6 +57,7 @@ from .extractor.ustream import UstreamIE from .extractor.vbox7 import Vbox7IE from .extractor.vimeo import VimeoIE +from .extractor.vine import VineIE from .extractor.worldstarhiphop import WorldStarHipHopIE from .extractor.xnxx import XNXXIE from .extractor.xvideos import XVideosIE @@ -190,39 +191,6 @@ def _real_extract(self, url): 'thumbnail': thumbnail, }] -class VineIE(InfoExtractor): - """Information Extractor for Vine.co""" - _VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P\w+)' - - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - - video_id = mobj.group('id') - webpage_url = 'https://vine.co/v/' + video_id - webpage = self._download_webpage(webpage_url, video_id) - - self.report_extraction(video_id) - - video_url = self._html_search_regex(r'.*?

(.+?)

', - webpage, u'uploader', fatal=False, flags=re.DOTALL) - - return [{ - 'id': video_id, - 'url': video_url, - 'ext': 'mp4', - 'title': video_title, - 'thumbnail': thumbnail, - 'uploader': uploader, - }] class FlickrIE(InfoExtractor): """Information Extractor for Flickr videos""" diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py new file mode 100644 index 000000000..b44b1cb02 --- /dev/null +++ b/youtube_dl/extractor/vine.py @@ -0,0 +1,37 @@ +import re + +from .common import InfoExtractor + + +class VineIE(InfoExtractor): + _VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P\w+)' + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + + video_id = mobj.group('id') + webpage_url = 'https://vine.co/v/' + video_id + webpage = self._download_webpage(webpage_url, video_id) + + self.report_extraction(video_id) + + video_url = self._html_search_regex(r'.*?

(.+?)

', + webpage, u'uploader', fatal=False, flags=re.DOTALL) + + return [{ + 'id': video_id, + 'url': video_url, + 'ext': 'mp4', + 'title': video_title, + 'thumbnail': thumbnail, + 'uploader': uploader, + }]