diff options
author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-02 19:50:57 +0100 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-02 19:50:57 +0100 |
commit | 165e3bb67a6d737f33d0aa2024c652b363d85ebe (patch) | |
tree | e508e3aee33bb0fbf0f044a3dce22772b21785dc /youtube_dl | |
parent | 72a5b4f70216fe1a5b1c22be34653ae0ff81058a (diff) |
[bambuser] Add an extractor for channels (closes #1702)
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/extractor/__init__.py | 2 | ||||
-rw-r--r-- | youtube_dl/extractor/bambuser.py | 40 |
2 files changed, 40 insertions, 2 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index a1e35eb46..a69c08f51 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -9,7 +9,7 @@ from .arte import ( ArteTVFutureIE, ) from .auengine import AUEngineIE -from .bambuser import BambuserIE +from .bambuser import BambuserIE, BambuserChannelIE from .bandcamp import BandcampIE from .bliptv import BlipTVIE, BlipTVUserIE from .bloomberg import BloombergIE diff --git a/youtube_dl/extractor/bambuser.py b/youtube_dl/extractor/bambuser.py index cf8da22e3..f3b36f473 100644 --- a/youtube_dl/extractor/bambuser.py +++ b/youtube_dl/extractor/bambuser.py @@ -1,10 +1,15 @@ import re import json +import itertools from .common import InfoExtractor +from ..utils import ( + compat_urllib_request, +) class BambuserIE(InfoExtractor): + IE_NAME = u'bambuser' _VALID_URL = r'https?://bambuser\.com/v/(?P<id>\d+)' _API_KEY = '005f64509e19a868399060af746a00aa' @@ -33,10 +38,43 @@ class BambuserIE(InfoExtractor): 'id': video_id, 'title': info['title'], 'url': info['url'], - 'thumbnail': info['preview'], + 'thumbnail': info.get('preview'), 'duration': int(info['length']), 'view_count': int(info['views_total']), 'uploader': info['username'], 'uploader_id': info['uid'], } + +class BambuserChannelIE(InfoExtractor): + IE_NAME = u'bambuser:channel' + _VALID_URL = r'http://bambuser.com/channel/(?P<user>.*?)(?:/|#|\?|$)' + # The maximum number we can get with each request + _STEP = 50 + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + user = mobj.group('user') + urls = [] + last_id = '' + for i in itertools.count(1): + req_url = ('http://bambuser.com/xhr-api/index.php?username={user}' + '&sort=created&access_mode=0%2C1%2C2&limit={count}' + '&method=broadcast&format=json&vid_older_than={last}' + ).format(user=user, count=self._STEP, last=last_id) + req = compat_urllib_request.Request(req_url) + # Without setting this header, we wouldn't get any result + req.add_header('Referer', 'http://bambuser.com/channel/%s' % user) + info_json = self._download_webpage(req, user, + u'Downloading page %d' % i) + results = json.loads(info_json)['result'] + if len(results) == 0: + break + last_id = results[-1]['vid'] + urls.extend(self.url_result(v['page'], 'Bambuser') for v in results) + + return { + '_type': 'playlist', + 'title': user, + 'entries': urls, + } |