projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jwplatform:base] Improve subtitles extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
mitele.py
diff --git
a/youtube_dl/extractor/mitele.py
b/youtube_dl/extractor/mitele.py
index 9e8a8fc726107988bb8ca410a5120df03fd881cf..7b4581dc58415f508ca0d34d61a5cd96b0b08e31 100644
(file)
--- a/
youtube_dl/extractor/mitele.py
+++ b/
youtube_dl/extractor/mitele.py
@@
-1,21
+1,23
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
-from ..compat import compat_urllib_parse
+from ..compat import (
+ compat_urllib_parse_urlencode,
+ compat_urlparse,
+)
from ..utils import (
from ..utils import (
- encode_dict,
get_element_by_attribute,
int_or_none,
)
class MiTeleIE(InfoExtractor):
get_element_by_attribute,
int_or_none,
)
class MiTeleIE(InfoExtractor):
- IE_
NAME
= 'mitele.es'
- _VALID_URL = r'http://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
+ IE_
DESC
= 'mitele.es'
+ _VALID_URL = r'http
s?
://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
_TESTS = [{
'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',
_TESTS = [{
'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',
- 'md5': '
ace7635b2a0b286aaa37d3ff192d2a8a
',
+ 'md5': '
0ff1a13aebb35d9bc14081ff633dd324
',
'info_dict': {
'id': '0NF1jJnxS1Wu3pHrmvFyw2',
'display_id': 'programa-144',
'info_dict': {
'id': '0NF1jJnxS1Wu3pHrmvFyw2',
'display_id': 'programa-144',
@@
-34,6
+36,7
@@
class MiTeleIE(InfoExtractor):
config_url = self._search_regex(
r'data-config\s*=\s*"([^"]+)"', webpage, 'data config url')
config_url = self._search_regex(
r'data-config\s*=\s*"([^"]+)"', webpage, 'data config url')
+ config_url = compat_urlparse.urljoin(url, config_url)
config = self._download_json(
config_url, display_id, 'Downloading config JSON')
config = self._download_json(
config_url, display_id, 'Downloading config JSON')
@@
-56,7
+59,7
@@
class MiTeleIE(InfoExtractor):
'sta': '0',
}
media = self._download_json(
'sta': '0',
}
media = self._download_json(
- '%s/?%s' % (gat, compat_urllib_parse
.urlencode(encode_dict(token_data)).encode('utf-8'
)),
+ '%s/?%s' % (gat, compat_urllib_parse
_urlencode(token_data
)),
display_id, 'Downloading %s JSON' % location['loc'])
file_ = media.get('file')
if not file_:
display_id, 'Downloading %s JSON' % location['loc'])
file_ = media.get('file')
if not file_:
@@
-64,6
+67,7
@@
class MiTeleIE(InfoExtractor):
formats.extend(self._extract_f4m_formats(
file_ + '&hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
display_id, f4m_id=loc))
formats.extend(self._extract_f4m_formats(
file_ + '&hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
display_id, f4m_id=loc))
+ self._sort_formats(formats)
title = self._search_regex(
r'class="Destacado-text"[^>]*>\s*<strong>([^<]+)</strong>', webpage, 'title')
title = self._search_regex(
r'class="Destacado-text"[^>]*>\s*<strong>([^<]+)</strong>', webpage, 'title')