aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-09-03 16:04:36 +0700
committerSergey M․ <dstftw@gmail.com>2017-09-03 16:05:31 +0700
commit23b2df82c70a832e485aaf52befa26e27a904995 (patch)
treeebda1ea14c60cd94aba4013d9086f71e887cb694 /youtube_dl
parent503115540d8f135dc944ae48e40ba78f36238867 (diff)
[aliexpress:live] Fix issues (closes #13698, closes #13707)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/aliexpress.py47
1 files changed, 30 insertions, 17 deletions
diff --git a/youtube_dl/extractor/aliexpress.py b/youtube_dl/extractor/aliexpress.py
index 3997213f8..6f241e683 100644
--- a/youtube_dl/extractor/aliexpress.py
+++ b/youtube_dl/extractor/aliexpress.py
@@ -1,40 +1,53 @@
# coding: utf-8
from __future__ import unicode_literals
-
-import re
-
from .common import InfoExtractor
-from ..utils import try_get, float_or_none
from ..compat import compat_str
+from ..utils import (
+ float_or_none,
+ try_get,
+)
class AliExpressLiveIE(InfoExtractor):
-
- _VALID_URL = r'https?://live\.aliexpress\.com/live/(?P<id>[0-9]{16})'
+ _VALID_URL = r'https?://live\.aliexpress\.com/live/(?P<id>\d+)'
_TEST = {
'url': 'https://live.aliexpress.com/live/2800002704436634',
- 'md5': '7ac2bc46afdd18f0b45a0a340fc47ffe',
+ 'md5': 'e729e25d47c5e557f2630eaf99b740a5',
'info_dict': {
'id': '2800002704436634',
- 'ext': 'm3u8',
+ 'ext': 'mp4',
'title': 'CASIMA7.22',
+ 'thumbnail': r're:http://.*\.jpg',
'uploader': 'CASIMA Official Store',
- 'upload_date': '20170714',
- 'timestamp': 1500027138,
+ 'timestamp': 1500717600,
+ 'upload_date': '20170722',
},
}
def _real_extract(self, url):
video_id = self._match_id(url)
- page = self._download_webpage(url, video_id)
- run_params_json = self._search_regex(r'runParams = (.+)[\s+]var myCtl', page, 'runParams', flags=re.DOTALL)
- run_params = self._parse_json(run_params_json, video_id)
+
+ webpage = self._download_webpage(url, video_id)
+
+ data = self._parse_json(
+ self._search_regex(
+ r'(?s)runParams\s*=\s*({.+?})\s*;?\s*var',
+ webpage, 'runParams'),
+ video_id)
+
+ title = data['title']
+
+ formats = self._extract_m3u8_formats(
+ data['replyStreamUrl'], video_id, 'mp4',
+ entry_protocol='m3u8_native', m3u8_id='hls')
return {
'id': video_id,
- 'title': run_params['title'],
- 'url': run_params['replyStreamUrl'],
- 'uploader': try_get(run_params, lambda x: x['followBar']['name'], compat_str),
- 'timestamp': float_or_none(try_get(run_params, lambda x: x['followBar']['createTime']) / 1000),
+ 'title': title,
+ 'thumbnail': data.get('coverUrl'),
+ 'uploader': try_get(
+ data, lambda x: x['followBar']['name'], compat_str),
+ 'timestamp': float_or_none(data.get('startTimeLong'), scale=1000),
+ 'formats': formats,
}