aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/anitube.py
diff options
context:
space:
mode:
authorAndrew "Akari" Alexeyew <akari@dbc.1gb.ua>2015-12-02 06:00:47 +0200
committerSergey M․ <dstftw@gmail.com>2016-01-22 23:29:24 +0600
commitd570746e45cff3c0f89654bf748e44a5da75a924 (patch)
tree2100d351de4a4e310f7a9a454894369cd2a41de7 /youtube_dl/extractor/anitube.py
parent4fcd9d147df9b06d954b8f8a1749b50609529ed4 (diff)
[nuevo] Generalize nuevo extractor and add support for trollvids
Supports only the nuevo player for now (most common). [trollvids] convert duration to an int [trollvids] added a test [trollvids] made flake8 shut up Generalized the Nuevo extractor Affects: anitube, trollvids, trutube [nuevo] Complied with the code comments.
Diffstat (limited to 'youtube_dl/extractor/anitube.py')
-rw-r--r--youtube_dl/extractor/anitube.py34
1 files changed, 4 insertions, 30 deletions
diff --git a/youtube_dl/extractor/anitube.py b/youtube_dl/extractor/anitube.py
index 23f942ae2..73690df82 100644
--- a/youtube_dl/extractor/anitube.py
+++ b/youtube_dl/extractor/anitube.py
@@ -2,10 +2,10 @@ from __future__ import unicode_literals
import re
-from .common import InfoExtractor
+from .nuevo import NuevoBaseIE
-class AnitubeIE(InfoExtractor):
+class AnitubeIE(NuevoBaseIE):
IE_NAME = 'anitube.se'
_VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
@@ -29,31 +29,5 @@ class AnitubeIE(InfoExtractor):
key = self._search_regex(
r'src=["\']https?://[^/]+/embed/([A-Za-z0-9_-]+)', webpage, 'key')
- config_xml = self._download_xml(
- 'http://www.anitube.se/nuevo/econfig.php?key=%s' % key, key)
-
- video_title = config_xml.find('title').text
- thumbnail = config_xml.find('image').text
- duration = float(config_xml.find('duration').text)
-
- formats = []
- video_url = config_xml.find('file')
- if video_url is not None:
- formats.append({
- 'format_id': 'sd',
- 'url': video_url.text,
- })
- video_url = config_xml.find('filehd')
- if video_url is not None:
- formats.append({
- 'format_id': 'hd',
- 'url': video_url.text,
- })
-
- return {
- 'id': video_id,
- 'title': video_title,
- 'thumbnail': thumbnail,
- 'duration': duration,
- 'formats': formats
- }
+ config_url = 'http://www.anitube.se/nuevo/econfig.php?key=%s' % key
+ return self._extract_nuevo(config_url, video_id)