projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] More explicit player config JSON extraction (fixes #7468)
[youtube-dl]
/
youtube_dl
/
extractor
/
la7.py
diff --git
a/youtube_dl/extractor/la7.py
b/youtube_dl/extractor/la7.py
index a91b94ee9e80314a898a761fd30c87768e1b4dc8..b08f6e3c9548de02217e43bebbf20b5f2ab871e8 100644
(file)
--- a/
youtube_dl/extractor/la7.py
+++ b/
youtube_dl/extractor/la7.py
@@
-1,7
+1,5
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from ..utils import (
parse_duration,
from .common import InfoExtractor
from ..utils import (
parse_duration,
@@
-10,23
+8,29
@@
from ..utils import (
class LA7IE(InfoExtractor):
IE_NAME = 'la7.tv'
class LA7IE(InfoExtractor):
IE_NAME = 'la7.tv'
- _VALID_URL = r'https?://(?:www\.)?la7\.tv/richplayer/\?assetid=(?P<id>[0-9]+)'
+ _VALID_URL = r'''(?x)
+ https?://(?:www\.)?la7\.tv/
+ (?:
+ richplayer/\?assetid=|
+ \?contentId=
+ )
+ (?P<id>[0-9]+)'''
_TEST = {
'url': 'http://www.la7.tv/richplayer/?assetid=50355319',
_TEST = {
'url': 'http://www.la7.tv/richplayer/?assetid=50355319',
- 'file': '50355319.mp4',
'md5': 'ec7d1f0224d20ba293ab56cf2259651f',
'info_dict': {
'md5': 'ec7d1f0224d20ba293ab56cf2259651f',
'info_dict': {
+ 'id': '50355319',
+ 'ext': 'mp4',
'title': 'IL DIVO',
'description': 'Un film di Paolo Sorrentino con Toni Servillo, Anna Bonaiuto, Giulio Bosetti e Flavio Bucci',
'duration': 6254,
'title': 'IL DIVO',
'description': 'Un film di Paolo Sorrentino con Toni Servillo, Anna Bonaiuto, Giulio Bosetti e Flavio Bucci',
'duration': 6254,
- }
+ },
+ 'skip': 'Blocked in the US',
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
xml_url = 'http://www.la7.tv/repliche/content/index.php?contentId=%s' % video_id
doc = self._download_xml(xml_url, video_id)
xml_url = 'http://www.la7.tv/repliche/content/index.php?contentId=%s' % video_id
doc = self._download_xml(xml_url, video_id)