aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-28 03:32:07 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-28 03:32:07 +0100
commit37e3b90d5996bc14e6ced937907a36b02bb8e490 (patch)
treec228d2f79d33d6d0bac5a552a4c0e60efd1a808b /youtube_dl/extractor
parent4857beba3a2b4f4e3f67b8d2697768db4d67175d (diff)
[rutube] Simplify
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/rutube.py26
1 files changed, 14 insertions, 12 deletions
diff --git a/youtube_dl/extractor/rutube.py b/youtube_dl/extractor/rutube.py
index 9a20facfd..f58c775ba 100644
--- a/youtube_dl/extractor/rutube.py
+++ b/youtube_dl/extractor/rutube.py
@@ -15,7 +15,7 @@ from ..utils import (
class RutubeIE(InfoExtractor):
IE_NAME = 'rutube'
- IE_DESC = 'Rutube videos'
+ IE_DESC = 'Rutube videos'
_VALID_URL = r'https?://rutube\.ru/video/(?P<id>[\da-z]{32})'
_TEST = {
@@ -68,7 +68,7 @@ class RutubeIE(InfoExtractor):
class RutubeChannelIE(InfoExtractor):
IE_NAME = 'rutube:channel'
- IE_DESC = 'Rutube channels'
+ IE_DESC = 'Rutube channels'
_VALID_URL = r'http://rutube\.ru/tags/video/(?P<id>\d+)'
_PAGE_TEMPLATE = 'http://rutube.ru/api/tags/video/%s/?page=%s&format=json'
@@ -76,15 +76,16 @@ class RutubeChannelIE(InfoExtractor):
def _extract_videos(self, channel_id, channel_title=None):
entries = []
for pagenum in itertools.count(1):
- api_response = self._download_webpage(self._PAGE_TEMPLATE % (channel_id, pagenum),
- channel_id, 'Downloading page %s' % pagenum)
+ api_response = self._download_webpage(
+ self._PAGE_TEMPLATE % (channel_id, pagenum),
+ channel_id, 'Downloading page %s' % pagenum)
page = json.loads(api_response)
results = page['results']
- if len(results) == 0:
- break;
+ if not results:
+ break
entries.extend(self.url_result(result['video_url'], 'Rutube') for result in results)
- if page['has_next'] is False:
- break;
+ if not page['has_next']:
+ break
return self.playlist_result(entries, channel_id, channel_title)
def _real_extract(self, url):
@@ -95,7 +96,7 @@ class RutubeChannelIE(InfoExtractor):
class RutubeMovieIE(RutubeChannelIE):
IE_NAME = 'rutube:movie'
- IE_DESC = 'Rutube movies'
+ IE_DESC = 'Rutube movies'
_VALID_URL = r'http://rutube\.ru/metainfo/tv/(?P<id>\d+)'
_MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json'
@@ -104,8 +105,9 @@ class RutubeMovieIE(RutubeChannelIE):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
movie_id = mobj.group('id')
- api_response = self._download_webpage(self._MOVIE_TEMPLATE % movie_id, movie_id,
- 'Downloading movie JSON')
+ api_response = self._download_webpage(
+ self._MOVIE_TEMPLATE % movie_id, movie_id,
+ 'Downloading movie JSON')
movie = json.loads(api_response)
movie_name = movie['name']
return self._extract_videos(movie_id, movie_name)
@@ -116,4 +118,4 @@ class RutubePersonIE(RutubeChannelIE):
IE_DESC = 'Rutube person videos'
_VALID_URL = r'http://rutube\.ru/video/person/(?P<id>\d+)'
- _PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json' \ No newline at end of file
+ _PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json'