projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
iprima.py
diff --git
a/youtube_dl/extractor/iprima.py
b/youtube_dl/extractor/iprima.py
index 22820e51bc1e18258e41a2bb11b581ebecc3bd9a..073777f34b4dc8c36822a8023c87edcd5c2af90c 100644
(file)
--- a/
youtube_dl/extractor/iprima.py
+++ b/
youtube_dl/extractor/iprima.py
@@
-6,11
+6,16
@@
from random import random
from math import floor
from .common import InfoExtractor
from math import floor
from .common import InfoExtractor
-from ..utils import compat_urllib_request
+from ..utils import (
+ ExtractorError,
+ remove_end,
+ sanitized_Request,
+)
class IPrimaIE(InfoExtractor):
class IPrimaIE(InfoExtractor):
- _VALID_URL = r'https?://play\.iprima\.cz/[^?#]+/(?P<id>[^?#]+)'
+ _WORKING = False
+ _VALID_URL = r'https?://play\.iprima\.cz/(?:[^/]+/)*(?P<id>[^?#]+)'
_TESTS = [{
'url': 'http://play.iprima.cz/particka/particka-92',
_TESTS = [{
'url': 'http://play.iprima.cz/particka/particka-92',
@@
-18,7
+23,7
@@
class IPrimaIE(InfoExtractor):
'id': '39152',
'ext': 'flv',
'title': 'Partička (92)',
'id': '39152',
'ext': 'flv',
'title': 'Partička (92)',
- 'description': 'md5:
3740fda51464da35a2d4d0670b8e4fd6
',
+ 'description': 'md5:
74e9617e51bca67c3ecfb2c6f9766f45
',
'thumbnail': 'http://play.iprima.cz/sites/default/files/image_crops/image_620x349/3/491483_particka-92_image_620x349.jpg',
},
'params': {
'thumbnail': 'http://play.iprima.cz/sites/default/files/image_crops/image_620x349/3/491483_particka-92_image_620x349.jpg',
},
'params': {
@@
-30,12
+35,14
@@
class IPrimaIE(InfoExtractor):
'id': '9718337',
'ext': 'flv',
'title': 'Tchibo Partička - Jarní móda',
'id': '9718337',
'ext': 'flv',
'title': 'Tchibo Partička - Jarní móda',
- 'description': 'md5:589f8f59f414220621ff8882eb3ce7be',
'thumbnail': 're:^http:.*\.jpg$',
},
'params': {
'skip_download': True, # requires rtmpdump
},
'thumbnail': 're:^http:.*\.jpg$',
},
'params': {
'skip_download': True, # requires rtmpdump
},
+ }, {
+ 'url': 'http://play.iprima.cz/zpravy-ftv-prima-2752015',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-44,11
+51,16
@@
class IPrimaIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
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)
+
player_url = (
'http://embed.livebox.cz/iprimaplay/player-embed-v2.js?__tok%s__=%s' %
player_url = (
'http://embed.livebox.cz/iprimaplay/player-embed-v2.js?__tok%s__=%s' %
- (floor(random()*1073741824), floor(random()*1073741824))
+ (floor(random() * 1073741824), floor(random() * 1073741824))
+ )
- req =
compat_urllib_request.
Request(player_url)
+ req =
sanitized_
Request(player_url)
req.add_header('Referer', url)
playerpage = self._download_webpage(req, video_id)
req.add_header('Referer', url)
playerpage = self._download_webpage(req, video_id)
@@
-91,8
+103,10
@@
class IPrimaIE(InfoExtractor):
return {
'id': real_id,
return {
'id': real_id,
- 'title':
self._og_search_title(webpage
),
+ 'title':
remove_end(self._og_search_title(webpage), ' | Prima PLAY'
),
'thumbnail': self._og_search_thumbnail(webpage),
'formats': formats,
'thumbnail': self._og_search_thumbnail(webpage),
'formats': formats,
- 'description': self._og_search_description(webpage),
+ 'description': self._search_regex(
+ r'<p[^>]+itemprop="description"[^>]*>([^<]+)',
+ webpage, 'description', default=None),
}
}