commit 7367bdef23a3db4691ba99f01613b7759340f05e
parent ad316425840315b40405a55243635fcfbcae5f19
Author: Remita Amine <remitamine@gmail.com>
Date: Mon, 22 Aug 2016 23:10:06 +0100
[awaan] fix extraction, modernize, rename the extractors and add test for live stream
Diffstat:
3 files changed, 205 insertions(+), 206 deletions(-)
diff --git a/youtube_dl/extractor/awaan.py b/youtube_dl/extractor/awaan.py
@@ -0,0 +1,199 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+import base64
+
+from .common import InfoExtractor
+from ..compat import (
+ compat_urllib_parse_urlencode,
+ compat_str,
+)
+from ..utils import (
+ int_or_none,
+ parse_iso8601,
+ smuggle_url,
+ unsmuggle_url,
+ urlencode_postdata,
+)
+
+
+class AWAANIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?show/(?P<show_id>\d+)/[^/]+(?:/(?P<video_id>\d+)/(?P<season_id>\d+))?'
+
+ def _real_extract(self, url):
+ show_id, video_id, season_id = re.match(self._VALID_URL, url).groups()
+ if video_id and int(video_id) > 0:
+ return self.url_result(
+ 'http://awaan.ae/media/%s' % video_id, 'AWAANVideo')
+ elif season_id and int(season_id) > 0:
+ return self.url_result(smuggle_url(
+ 'http://awaan.ae/program/season/%s' % season_id,
+ {'show_id': show_id}), 'AWAANSeason')
+ else:
+ return self.url_result(
+ 'http://awaan.ae/program/%s' % show_id, 'AWAANSeason')
+
+
+class AWAANBaseIE(InfoExtractor):
+ def _parse_video_data(self, video_data, video_id, is_live):
+ title = video_data.get('title_en') or video_data['title_ar']
+ img = video_data.get('img')
+
+ return {
+ 'id': video_id,
+ 'title': self._live_title(title) if is_live else title,
+ 'description': video_data.get('description_en') or video_data.get('description_ar'),
+ 'thumbnail': 'http://admin.mangomolo.com/analytics/%s' % img if img else None,
+ 'duration': int_or_none(video_data.get('duration')),
+ 'timestamp': parse_iso8601(video_data.get('create_time'), ' '),
+ 'is_live': is_live,
+ }
+
+ def _extract_video_formats(self, webpage, video_id, m3u8_entry_protocol):
+ formats = []
+ format_url_base = 'http' + self._html_search_regex(
+ [
+ r'file\s*:\s*"https?(://[^"]+)/playlist.m3u8',
+ r'<a[^>]+href="rtsp(://[^"]+)"'
+ ], webpage, 'format url')
+ formats.extend(self._extract_mpd_formats(
+ format_url_base + '/manifest.mpd',
+ video_id, mpd_id='dash', fatal=False))
+ formats.extend(self._extract_m3u8_formats(
+ format_url_base + '/playlist.m3u8', video_id, 'mp4',
+ m3u8_entry_protocol, m3u8_id='hls', fatal=False))
+ formats.extend(self._extract_f4m_formats(
+ format_url_base + '/manifest.f4m',
+ video_id, f4m_id='hds', fatal=False))
+ self._sort_formats(formats)
+ return formats
+
+
+class AWAANVideoIE(AWAANBaseIE):
+ IE_NAME = 'awaan:video'
+ _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?(?:video(?:/[^/]+)?|media|catchup/[^/]+/[^/]+)/(?P<id>\d+)'
+ _TESTS = [{
+ 'url': 'http://www.dcndigital.ae/#/video/%D8%B1%D8%AD%D9%84%D8%A9-%D8%A7%D9%84%D8%B9%D9%85%D8%B1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/17375',
+ 'md5': '5f61c33bfc7794315c671a62d43116aa',
+ 'info_dict':
+ {
+ 'id': '17375',
+ 'ext': 'mp4',
+ 'title': 'رحلة العمر : الحلقة 1',
+ 'description': 'md5:0156e935d870acb8ef0a66d24070c6d6',
+ 'duration': 2041,
+ 'timestamp': 1227504126,
+ 'upload_date': '20081124',
+ },
+ }, {
+ 'url': 'http://awaan.ae/video/26723981/%D8%AF%D8%A7%D8%B1-%D8%A7%D9%84%D8%B3%D9%84%D8%A7%D9%85:-%D8%AE%D9%8A%D8%B1-%D8%AF%D9%88%D8%B1-%D8%A7%D9%84%D8%A3%D9%86%D8%B5%D8%A7%D8%B1',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+
+ video_data = self._download_json(
+ 'http://admin.mangomolo.com/analytics/index.php/plus/video?id=%s' % video_id,
+ video_id, headers={'Origin': 'http://awaan.ae'})
+ info = self._parse_video_data(video_data, video_id, False)
+
+ webpage = self._download_webpage(
+ 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' +
+ compat_urllib_parse_urlencode({
+ 'id': video_data['id'],
+ 'user_id': video_data['user_id'],
+ 'signature': video_data['signature'],
+ 'countries': 'Q0M=',
+ 'filter': 'DENY',
+ }), video_id)
+ info['formats'] = self._extract_video_formats(webpage, video_id, 'm3u8_native')
+ return info
+
+
+class AWAANLiveIE(AWAANBaseIE):
+ IE_NAME = 'awaan:live'
+ _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?live/(?P<id>\d+)'
+ _TEST = {
+ 'url': 'http://awaan.ae/live/6/dubai-tv',
+ 'info_dict': {
+ 'id': '6',
+ 'ext': 'mp4',
+ 'title': 're:Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+ 'upload_date': '20150107',
+ 'timestamp': 1420588800,
+ },
+ 'params': {
+ # m3u8 download
+ 'skip_download': True,
+ },
+ }
+
+ def _real_extract(self, url):
+ channel_id = self._match_id(url)
+
+ channel_data = self._download_json(
+ 'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id=%s' % channel_id,
+ channel_id, headers={'Origin': 'http://awaan.ae'})
+ info = self._parse_video_data(channel_data, channel_id, True)
+
+ webpage = self._download_webpage(
+ 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' +
+ compat_urllib_parse_urlencode({
+ 'id': base64.b64encode(channel_data['user_id'].encode()).decode(),
+ 'channelid': base64.b64encode(channel_data['id'].encode()).decode(),
+ 'signature': channel_data['signature'],
+ 'countries': 'Q0M=',
+ 'filter': 'DENY',
+ }), channel_id)
+ info['formats'] = self._extract_video_formats(webpage, channel_id, 'm3u8')
+ return info
+
+
+class AWAANSeasonIE(InfoExtractor):
+ IE_NAME = 'awaan:season'
+ _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?program/(?:(?P<show_id>\d+)|season/(?P<season_id>\d+))'
+ _TEST = {
+ 'url': 'http://dcndigital.ae/#/program/205024/%D9%85%D8%AD%D8%A7%D8%B6%D8%B1%D8%A7%D8%AA-%D8%A7%D9%84%D8%B4%D9%8A%D8%AE-%D8%A7%D9%84%D8%B4%D8%B9%D8%B1%D8%A7%D9%88%D9%8A',
+ 'info_dict':
+ {
+ 'id': '7910',
+ 'title': 'محاضرات الشيخ الشعراوي',
+ },
+ 'playlist_mincount': 27,
+ }
+
+ def _real_extract(self, url):
+ url, smuggled_data = unsmuggle_url(url, {})
+ show_id, season_id = re.match(self._VALID_URL, url).groups()
+
+ data = {}
+ if season_id:
+ data['season'] = season_id
+ show_id = smuggled_data.get('show_id')
+ if show_id is None:
+ season = self._download_json(
+ 'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id=%s' % season_id,
+ season_id, headers={'Origin': 'http://awaan.ae'})
+ show_id = season['id']
+ data['show_id'] = show_id
+ show = self._download_json(
+ 'http://admin.mangomolo.com/analytics/index.php/plus/show',
+ show_id, data=urlencode_postdata(data), headers={
+ 'Origin': 'http://awaan.ae',
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ })
+ if not season_id:
+ season_id = show['default_season']
+ for season in show['seasons']:
+ if season['id'] == season_id:
+ title = season.get('title_en') or season['title_ar']
+
+ entries = []
+ for video in show['videos']:
+ video_id = compat_str(video['id'])
+ entries.append(self.url_result(
+ 'http://awaan.ae/media/%s' % video_id, 'AWAANVideo', video_id))
+
+ return self.playlist_result(entries, season_id, title)
diff --git a/youtube_dl/extractor/dcn.py b/youtube_dl/extractor/dcn.py
@@ -1,200 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-import base64
-
-from .common import InfoExtractor
-from ..compat import (
- compat_urllib_parse_urlencode,
- compat_str,
-)
-from ..utils import (
- int_or_none,
- parse_iso8601,
- sanitized_Request,
- smuggle_url,
- unsmuggle_url,
- urlencode_postdata,
-)
-
-
-class DCNIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?show/(?P<show_id>\d+)/[^/]+(?:/(?P<video_id>\d+)/(?P<season_id>\d+))?'
-
- def _real_extract(self, url):
- show_id, video_id, season_id = re.match(self._VALID_URL, url).groups()
- if video_id and int(video_id) > 0:
- return self.url_result(
- 'http://www.dcndigital.ae/media/%s' % video_id, 'DCNVideo')
- elif season_id and int(season_id) > 0:
- return self.url_result(smuggle_url(
- 'http://www.dcndigital.ae/program/season/%s' % season_id,
- {'show_id': show_id}), 'DCNSeason')
- else:
- return self.url_result(
- 'http://www.dcndigital.ae/program/%s' % show_id, 'DCNSeason')
-
-
-class DCNBaseIE(InfoExtractor):
- def _extract_video_info(self, video_data, video_id, is_live):
- title = video_data.get('title_en') or video_data['title_ar']
- img = video_data.get('img')
- thumbnail = 'http://admin.mangomolo.com/analytics/%s' % img if img else None
- duration = int_or_none(video_data.get('duration'))
- description = video_data.get('description_en') or video_data.get('description_ar')
- timestamp = parse_iso8601(video_data.get('create_time'), ' ')
-
- return {
- 'id': video_id,
- 'title': self._live_title(title) if is_live else title,
- 'description': description,
- 'thumbnail': thumbnail,
- 'duration': duration,
- 'timestamp': timestamp,
- 'is_live': is_live,
- }
-
- def _extract_video_formats(self, webpage, video_id, m3u8_entry_protocol):
- formats = []
- format_url_base = 'http' + self._html_search_regex(
- [
- r'file\s*:\s*"https?(://[^"]+)/playlist.m3u8',
- r'<a[^>]+href="rtsp(://[^"]+)"'
- ], webpage, 'format url')
- formats.extend(self._extract_mpd_formats(
- format_url_base + '/manifest.mpd',
- video_id, mpd_id='dash', fatal=False))
- formats.extend(self._extract_m3u8_formats(
- format_url_base + '/playlist.m3u8', video_id, 'mp4',
- m3u8_entry_protocol, m3u8_id='hls', fatal=False))
- formats.extend(self._extract_f4m_formats(
- format_url_base + '/manifest.f4m',
- video_id, f4m_id='hds', fatal=False))
- self._sort_formats(formats)
- return formats
-
-
-class DCNVideoIE(DCNBaseIE):
- IE_NAME = 'dcn:video'
- _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?(?:video(?:/[^/]+)?|media|catchup/[^/]+/[^/]+)/(?P<id>\d+)'
- _TESTS = [{
- 'url': 'http://www.dcndigital.ae/#/video/%D8%B1%D8%AD%D9%84%D8%A9-%D8%A7%D9%84%D8%B9%D9%85%D8%B1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/17375',
- 'info_dict':
- {
- 'id': '17375',
- 'ext': 'mp4',
- 'title': 'رحلة العمر : الحلقة 1',
- 'description': 'md5:0156e935d870acb8ef0a66d24070c6d6',
- 'duration': 2041,
- 'timestamp': 1227504126,
- 'upload_date': '20081124',
- },
- 'params': {
- # m3u8 download
- 'skip_download': True,
- },
- }, {
- 'url': 'http://awaan.ae/video/26723981/%D8%AF%D8%A7%D8%B1-%D8%A7%D9%84%D8%B3%D9%84%D8%A7%D9%85:-%D8%AE%D9%8A%D8%B1-%D8%AF%D9%88%D8%B1-%D8%A7%D9%84%D8%A3%D9%86%D8%B5%D8%A7%D8%B1',
- 'only_matching': True,
- }]
-
- def _real_extract(self, url):
- video_id = self._match_id(url)
-
- request = sanitized_Request(
- 'http://admin.mangomolo.com/analytics/index.php/plus/video?id=%s' % video_id,
- headers={'Origin': 'http://www.dcndigital.ae'})
- video_data = self._download_json(request, video_id)
- info = self._extract_video_info(video_data, video_id, False)
-
- webpage = self._download_webpage(
- 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' +
- compat_urllib_parse_urlencode({
- 'id': video_data['id'],
- 'user_id': video_data['user_id'],
- 'signature': video_data['signature'],
- 'countries': 'Q0M=',
- 'filter': 'DENY',
- }), video_id)
- info['formats'] = self._extract_video_formats(webpage, video_id, 'm3u8_native')
- return info
-
-
-class DCNLiveIE(DCNBaseIE):
- IE_NAME = 'dcn:live'
- _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?live/(?P<id>\d+)'
-
- def _real_extract(self, url):
- channel_id = self._match_id(url)
-
- request = sanitized_Request(
- 'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id=%s' % channel_id,
- headers={'Origin': 'http://www.dcndigital.ae'})
-
- channel_data = self._download_json(request, channel_id)
- info = self._extract_video_info(channel_data, channel_id, True)
-
- webpage = self._download_webpage(
- 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' +
- compat_urllib_parse_urlencode({
- 'id': base64.b64encode(channel_data['user_id'].encode()).decode(),
- 'channelid': base64.b64encode(channel_data['id'].encode()).decode(),
- 'signature': channel_data['signature'],
- 'countries': 'Q0M=',
- 'filter': 'DENY',
- }), channel_id)
- info['formats'] = self._extract_video_formats(webpage, channel_id, 'm3u8')
- return info
-
-
-class DCNSeasonIE(InfoExtractor):
- IE_NAME = 'dcn:season'
- _VALID_URL = r'https?://(?:www\.)?(?:awaan|dcndigital)\.ae/(?:#/)?program/(?:(?P<show_id>\d+)|season/(?P<season_id>\d+))'
- _TEST = {
- 'url': 'http://dcndigital.ae/#/program/205024/%D9%85%D8%AD%D8%A7%D8%B6%D8%B1%D8%A7%D8%AA-%D8%A7%D9%84%D8%B4%D9%8A%D8%AE-%D8%A7%D9%84%D8%B4%D8%B9%D8%B1%D8%A7%D9%88%D9%8A',
- 'info_dict':
- {
- 'id': '7910',
- 'title': 'محاضرات الشيخ الشعراوي',
- },
- 'playlist_mincount': 27,
- }
-
- def _real_extract(self, url):
- url, smuggled_data = unsmuggle_url(url, {})
- show_id, season_id = re.match(self._VALID_URL, url).groups()
-
- data = {}
- if season_id:
- data['season'] = season_id
- show_id = smuggled_data.get('show_id')
- if show_id is None:
- request = sanitized_Request(
- 'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id=%s' % season_id,
- headers={'Origin': 'http://www.dcndigital.ae'})
- season = self._download_json(request, season_id)
- show_id = season['id']
- data['show_id'] = show_id
- request = sanitized_Request(
- 'http://admin.mangomolo.com/analytics/index.php/plus/show',
- urlencode_postdata(data),
- {
- 'Origin': 'http://www.dcndigital.ae',
- 'Content-Type': 'application/x-www-form-urlencoded'
- })
-
- show = self._download_json(request, show_id)
- if not season_id:
- season_id = show['default_season']
- for season in show['seasons']:
- if season['id'] == season_id:
- title = season.get('title_en') or season['title_ar']
-
- entries = []
- for video in show['videos']:
- video_id = compat_str(video['id'])
- entries.append(self.url_result(
- 'http://www.dcndigital.ae/media/%s' % video_id, 'DCNVideo', video_id))
-
- return self.playlist_result(entries, season_id, title)
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
@@ -71,6 +71,12 @@ from .atttechchannel import ATTTechChannelIE
from .audimedia import AudiMediaIE
from .audioboom import AudioBoomIE
from .audiomack import AudiomackIE, AudiomackAlbumIE
+from .awaan import (
+ AWAANIE,
+ AWAANVideoIE,
+ AWAANLiveIE,
+ AWAANSeasonIE,
+)
from .azubu import AzubuIE, AzubuLiveIE
from .baidu import BaiduVideoIE
from .bambuser import BambuserIE, BambuserChannelIE
@@ -200,12 +206,6 @@ from .daum import (
DaumUserIE,
)
from .dbtv import DBTVIE
-from .dcn import (
- DCNIE,
- DCNVideoIE,
- DCNLiveIE,
- DCNSeasonIE,
-)
from .dctp import DctpTvIE
from .deezer import DeezerPlaylistIE
from .democracynow import DemocracynowIE
