aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-09-14 23:56:03 +0700
committerSergey M․ <dstftw@gmail.com>2018-09-14 23:56:03 +0700
commit0f2aa0dcaa5ebffbca781f8ecd15c4d52a80f011 (patch)
treeb4b23cf696f559cdf053311f0d10f168255e6a3c
parentdb348e88495bd87adcf058bb6c0a26c1fc591f4f (diff)
[asiancrush] Fix extraction (closes #15630)
-rw-r--r--youtube_dl/extractor/asiancrush.py42
1 files changed, 31 insertions, 11 deletions
diff --git a/youtube_dl/extractor/asiancrush.py b/youtube_dl/extractor/asiancrush.py
index 594c88c9c..6d71c5ad5 100644
--- a/youtube_dl/extractor/asiancrush.py
+++ b/youtube_dl/extractor/asiancrush.py
@@ -8,7 +8,6 @@ from .kaltura import KalturaIE
from ..utils import (
extract_attributes,
remove_end,
- urlencode_postdata,
)
@@ -34,19 +33,40 @@ class AsianCrushIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
- data = self._download_json(
- 'https://www.asiancrush.com/wp-admin/admin-ajax.php', video_id,
- data=urlencode_postdata({
- 'postid': video_id,
- 'action': 'get_channel_kaltura_vars',
- }))
+ webpage = self._download_webpage(url, video_id)
- entry_id = data['entry_id']
+ entry_id, partner_id, title = [None] * 3
+
+ vars = self._parse_json(
+ self._search_regex(
+ r'iEmbedVars\s*=\s*({.+?})', webpage, 'embed vars',
+ default='{}'), video_id, fatal=False)
+ if vars:
+ entry_id = vars.get('entry_id')
+ partner_id = vars.get('partner_id')
+ title = vars.get('vid_label')
+
+ if not entry_id:
+ entry_id = self._search_regex(
+ r'\bentry_id["\']\s*:\s*["\'](\d+)', webpage, 'entry id')
+
+ player = self._download_webpage(
+ 'https://api.asiancrush.com/embeddedVideoPlayer', video_id,
+ query={'id': entry_id})
+
+ kaltura_id = self._search_regex(
+ r'entry_id["\']\s*:\s*(["\'])(?P<id>(?:(?!\1).)+)\1', player,
+ 'kaltura id', group='id')
+
+ if not partner_id:
+ partner_id = self._search_regex(
+ r'/p(?:artner_id)?/(\d+)', player, 'partner id',
+ default='513551')
return self.url_result(
- 'kaltura:%s:%s' % (data['partner_id'], entry_id),
- ie=KalturaIE.ie_key(), video_id=entry_id,
- video_title=data.get('vid_label'))
+ 'kaltura:%s:%s' % (partner_id, kaltura_id),
+ ie=KalturaIE.ie_key(), video_id=kaltura_id,
+ video_title=title)
class AsianCrushPlaylistIE(InfoExtractor):