projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[npo] Compound title
[youtube-dl]
/
youtube_dl
/
extractor
/
iprima.py
diff --git
a/youtube_dl/extractor/iprima.py
b/youtube_dl/extractor/iprima.py
index d1defd363c5fe9c86330236f53b8aa21bfe65a38..821c8ec109236b787b9afa2985e450ff8a647595 100644
(file)
--- a/
youtube_dl/extractor/iprima.py
+++ b/
youtube_dl/extractor/iprima.py
@@
-6,14
+6,17
@@
from random import random
from math import floor
from .common import InfoExtractor
from math import floor
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_request,
compat_urllib_request,
+)
+from ..utils import (
ExtractorError,
ExtractorError,
+ remove_end,
)
class IPrimaIE(InfoExtractor):
)
class IPrimaIE(InfoExtractor):
- _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',
_TESTS = [{
'url': 'http://play.iprima.cz/particka/particka-92',
@@
-21,7
+24,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': {
@@
-33,13
+36,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
},
- 'skip': 'Do not have permission to access this page',
+ }, {
+ 'url': 'http://play.iprima.cz/zpravy-ftv-prima-2752015',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-54,7
+58,7
@@
class IPrimaIE(InfoExtractor):
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 = compat_urllib_request.Request(player_url)
@@
-100,8
+104,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),
}
}