aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpulpe <Pulpan3@gmail.com>2016-02-06 21:23:41 +0100
committerpulpe <Pulpan3@gmail.com>2016-02-06 21:23:41 +0100
commitf406c78785b57afb584cc0ee8ef4e84e568b0614 (patch)
tree4d1613f9186fd38f42b1ab54d9b09213ca6deaf8
parentf326b5837aafb244f48d3a7f1726c573bc092941 (diff)
[IPrima] Fix extractor (fixes #7617)
-rw-r--r--youtube_dl/extractor/iprima.py91
1 files changed, 18 insertions, 73 deletions
diff --git a/youtube_dl/extractor/iprima.py b/youtube_dl/extractor/iprima.py
index 073777f34..093a7e551 100644
--- a/youtube_dl/extractor/iprima.py
+++ b/youtube_dl/extractor/iprima.py
@@ -2,46 +2,30 @@
from __future__ import unicode_literals
import re
-from random import random
-from math import floor
+import time
from .common import InfoExtractor
from ..utils import (
- ExtractorError,
- remove_end,
sanitized_Request,
)
class IPrimaIE(InfoExtractor):
- _WORKING = False
- _VALID_URL = r'https?://play\.iprima\.cz/(?:[^/]+/)*(?P<id>[^?#]+)'
+ _VALID_URL = r'https?://play\.iprima\.cz/(?:.+/)?(?P<id>[^?#]+)'
_TESTS = [{
- 'url': 'http://play.iprima.cz/particka/particka-92',
+ 'url': 'http://play.iprima.cz/gondici-s-r-o-33',
'info_dict': {
- 'id': '39152',
- 'ext': 'flv',
- 'title': 'Partička (92)',
- 'description': 'md5:74e9617e51bca67c3ecfb2c6f9766f45',
- 'thumbnail': 'http://play.iprima.cz/sites/default/files/image_crops/image_620x349/3/491483_particka-92_image_620x349.jpg',
+ 'id': 'p136534',
+ 'ext': 'mp4',
+ 'title': 'Gondíci s. r. o. (34)',
+ 'description': 'md5:16577c629d006aa91f59ca8d8e7f99bd',
},
'params': {
- 'skip_download': True, # requires rtmpdump
+ 'skip_download': True, # m3u8 download
},
}, {
- 'url': 'http://play.iprima.cz/particka/tchibo-particka-jarni-moda',
- 'info_dict': {
- 'id': '9718337',
- 'ext': 'flv',
- 'title': 'Tchibo Partička - Jarní móda',
- 'thumbnail': 're:^http:.*\.jpg$',
- },
- 'params': {
- 'skip_download': True, # requires rtmpdump
- },
- }, {
- 'url': 'http://play.iprima.cz/zpravy-ftv-prima-2752015',
+ 'url': 'http://play.iprima.cz/particka/particka-92',
'only_matching': True,
}]
@@ -51,62 +35,23 @@ class IPrimaIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
- if re.search(r'Nemáte oprávnění přistupovat na tuto stránku\.\s*</div>', webpage):
- raise ExtractorError(
- '%s said: You do not have permission to access this page' % self.IE_NAME, expected=True)
+ video_id = self._search_regex(r'data-product="([^"]+)">', webpage, 'real id')
- player_url = (
- 'http://embed.livebox.cz/iprimaplay/player-embed-v2.js?__tok%s__=%s' %
- (floor(random() * 1073741824), floor(random() * 1073741824))
- )
-
- req = sanitized_Request(player_url)
+ req = sanitized_Request('http://play.iprima.cz/prehravac/init?_infuse=1'
+ '&_ts=%s&productId=%s' % (round(time.time()), 'p22201'))
req.add_header('Referer', url)
- playerpage = self._download_webpage(req, video_id)
-
- base_url = ''.join(re.findall(r"embed\['stream'\] = '(.+?)'.+'(\?auth=)'.+'(.+?)';", playerpage)[1])
-
- zoneGEO = self._html_search_regex(r'"zoneGEO":(.+?),', webpage, 'zoneGEO')
- if zoneGEO != '0':
- base_url = base_url.replace('token', 'token_' + zoneGEO)
-
- formats = []
- for format_id in ['lq', 'hq', 'hd']:
- filename = self._html_search_regex(
- r'"%s_id":(.+?),' % format_id, webpage, 'filename')
-
- if filename == 'null':
- continue
-
- real_id = self._search_regex(
- r'Prima-(?:[0-9]{10}|WEB)-([0-9]+)[-_]',
- filename, 'real video id')
+ playerpage = self._download_webpage(req, video_id, note='Downloading player')
- if format_id == 'lq':
- quality = 0
- elif format_id == 'hq':
- quality = 1
- elif format_id == 'hd':
- quality = 2
- filename = 'hq/' + filename
+ m3u8_url = self._search_regex(r"'src': '([^']+\.m3u8)'", playerpage, 'm3u8 url')
- formats.append({
- 'format_id': format_id,
- 'url': base_url,
- 'quality': quality,
- 'play_path': 'mp4:' + filename.replace('"', '')[:-4],
- 'rtmp_live': True,
- 'ext': 'flv',
- })
+ formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
self._sort_formats(formats)
return {
- 'id': real_id,
- 'title': remove_end(self._og_search_title(webpage), ' | Prima PLAY'),
+ 'id': video_id,
+ 'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
'formats': formats,
- 'description': self._search_regex(
- r'<p[^>]+itemprop="description"[^>]*>([^<]+)',
- webpage, 'description', default=None),
+ 'description': self._og_search_description(webpage),
}