summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorremitamine <[email protected]>2015-08-06 19:17:50 +0100
committerremitamine <[email protected]>2015-08-06 19:17:50 +0100
commitcd6b555e19c601d575679dd29da0080eda7f8890 (patch)
treecbe26f2c958acb2514e9592af286e3c33ac0b8b2
parent9d681c2bb3b75a666b76d8e346ffab66b65f9132 (diff)
downloadyoutube-dl-cd6b555e19c601d575679dd29da0080eda7f8890.tar.gz
youtube-dl-cd6b555e19c601d575679dd29da0080eda7f8890.zip
[dcn] add origin to api request and fix the test and check with flake8
-rw-r--r--youtube_dl/extractor/dcn.py30
1 files changed, 20 insertions, 10 deletions
diff --git a/youtube_dl/extractor/dcn.py b/youtube_dl/extractor/dcn.py
index f76ebda9e..d44e8cef0 100644
--- a/youtube_dl/extractor/dcn.py
+++ b/youtube_dl/extractor/dcn.py
@@ -1,4 +1,9 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
from .common import InfoExtractor
+from ..compat import compat_urllib_request
+
class DcnIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?dcndigital\.ae/(?:#/)?(?:video/.+|show/\d+/.+?)/(?P<id>\d+)/?'
@@ -9,24 +14,29 @@ class DcnIE(InfoExtractor):
'id': '17375',
'ext': 'm3u8',
'title': 'رحلة العمر : الحلقة 1',
- 'description': '"في هذه الحلقة من برنامج رحلة العمر يقدّم الدكتور عمر عبد الكافي تبسيطاً لمناسك الحج والعمرة ويجيب مباشرة على استفسارات حجاج بيت الله الحرام بخصوص مناسك الحج والعمرة1"',
+ 'description': 'في هذه الحلقة من برنامج رحلة العمر يقدّم الدكتور عمر عبد الكافي تبسيطاً لمناسك الحج والعمرة ويجيب مباشرة على استفسارات حجاج بيت الله الحرام بخصوص مناسك الحج والعمرة\n1',
'thumbnail': 'http://admin.mangomolo.com/analytics/uploads/71/images/media/2/2cefc09d7bec80afa754682f40e49503.jpg',
'duration': '2041'
- }
+ },
+ 'params': {
+ # m3u8 download
+ 'skip_download': True,
+ },
}
def _real_extract(self, url):
video_id = self._match_id(url)
- json_data = self._download_json(
- 'http://admin.mangomolo.com/analytics/index.php/plus/video?id='+video_id,
- video_id
+ request = compat_urllib_request.Request(
+ 'http://admin.mangomolo.com/analytics/index.php/plus/video?id=' + video_id,
+ headers={'Origin': 'http://www.dcndigital.ae'}
)
- title = json_data['title_ar'];
- thumbnail = 'http://admin.mangomolo.com/analytics/'+json_data['img'];
- duration = json_data['duration'];
- description = json_data['description_ar'];
+ json_data = self._download_json(request, video_id)
+ title = json_data['title_ar']
+ thumbnail = 'http://admin.mangomolo.com/analytics/' + json_data['img']
+ duration = json_data['duration']
+ description = json_data['description_ar']
webpage = self._download_webpage(
- 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?id='+json_data['id']+'&user_id='+json_data['user_id']+'&countries=Q0M=&w=100%&h=100%&filter=DENY&signature='+json_data['signature'],
+ 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?id=' + json_data['id'] + '&user_id=' + json_data['user_id'] + '&countries=Q0M=&w=100%&h=100%&filter=DENY&signature=' + json_data['signature'],
video_id
)
m3u8_url = self._html_search_regex(