commit 867274e997f8aa3f035af4489947ad743c954e7e
parent 65157783050b5d2bee55310e084ab4e5e15c2b1b
Author: Sergey M․ <dstftw@gmail.com>
Date: Sun, 4 May 2014 16:52:10 +0700
[statigram] Update to fit new website name and rename extractor
Diffstat:
3 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
@@ -113,6 +113,7 @@ from .hotnewhiphop import HotNewHipHopIE
from .howcast import HowcastIE
from .huffpost import HuffPostIE
from .hypem import HypemIE
+from .iconosquare import IconosquareIE
from .ign import IGNIE, OneUPIE
from .imdb import (
ImdbIE,
@@ -246,7 +247,6 @@ from .spankwire import SpankwireIE
from .spiegel import SpiegelIE
from .spike import SpikeIE
from .stanfordoc import StanfordOpenClassroomIE
-from .statigram import StatigramIE
from .steam import SteamIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
diff --git a/youtube_dl/extractor/iconosquare.py b/youtube_dl/extractor/iconosquare.py
@@ -0,0 +1,40 @@
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+
+
+class IconosquareIE(InfoExtractor):
+ _VALID_URL = r'https?://(www\.)?(?:iconosquare\.com|statigr\.am)/p/(?P<id>[^/]+)'
+ _TEST = {
+ 'url': 'http://statigr.am/p/522207370455279102_24101272',
+ 'md5': '6eb93b882a3ded7c378ee1d6884b1814',
+ 'info_dict': {
+ 'id': '522207370455279102_24101272',
+ 'ext': 'mp4',
+ 'uploader_id': 'aguynamedpatrick',
+ 'title': 'Instagram photo by @aguynamedpatrick (Patrick Janelle)',
+ 'description': 'md5:644406a9ec27457ed7aa7a9ebcd4ce3d',
+ },
+ }
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ video_id = mobj.group('id')
+ webpage = self._download_webpage(url, video_id)
+ html_title = self._html_search_regex(
+ r'<title>(.+?)</title>',
+ webpage, 'title')
+ title = re.sub(r'(?: *\(Videos?\))? \| (?:Iconosquare|Statigram)$', '', html_title)
+ uploader_id = self._html_search_regex(
+ r'@([^ ]+)', title, 'uploader name', fatal=False)
+
+ return {
+ 'id': video_id,
+ 'url': self._og_search_video_url(webpage),
+ 'title': title,
+ 'description': self._og_search_description(webpage),
+ 'thumbnail': self._og_search_thumbnail(webpage),
+ 'uploader_id': uploader_id
+ }
diff --git a/youtube_dl/extractor/statigram.py b/youtube_dl/extractor/statigram.py
@@ -1,38 +0,0 @@
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-
-
-class StatigramIE(InfoExtractor):
- _VALID_URL = r'https?://(www\.)?statigr\.am/p/(?P<id>[^/]+)'
- _TEST = {
- 'url': 'http://statigr.am/p/522207370455279102_24101272',
- 'md5': '6eb93b882a3ded7c378ee1d6884b1814',
- 'info_dict': {
- 'id': '522207370455279102_24101272',
- 'ext': 'mp4',
- 'uploader_id': 'aguynamedpatrick',
- 'title': 'Instagram photo by @aguynamedpatrick (Patrick Janelle)',
- },
- }
-
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
- webpage = self._download_webpage(url, video_id)
- html_title = self._html_search_regex(
- r'<title>(.+?)</title>',
- webpage, 'title')
- title = re.sub(r'(?: *\(Videos?\))? \| Statigram$', '', html_title)
- uploader_id = self._html_search_regex(
- r'@([^ ]+)', title, 'uploader name', fatal=False)
-
- return {
- 'id': video_id,
- 'url': self._og_search_video_url(webpage),
- 'title': title,
- 'thumbnail': self._og_search_thumbnail(webpage),
- 'uploader_id': uploader_id
- }