projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add itags 256 and 258
[youtube-dl]
/
youtube_dl
/
extractor
/
rai.py
diff --git
a/youtube_dl/extractor/rai.py
b/youtube_dl/extractor/rai.py
index f2679591bc8a0ddea46aafe8d4e6dc64cfcf7c20..e36ce1aa1940deafd5a633bec814e7462008c3b1 100644
(file)
--- a/
youtube_dl/extractor/rai.py
+++ b/
youtube_dl/extractor/rai.py
@@
-18,7
+18,7
@@
from ..utils import (
class RaiTVIE(InfoExtractor):
class RaiTVIE(InfoExtractor):
- _VALID_URL = r'http://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/(?:[^/]+/)+media/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/(?:[^/]+/)+media/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
_TESTS = [
{
'url': 'http://www.rai.tv/dl/RaiTV/programmi/media/ContentItem-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
_TESTS = [
{
'url': 'http://www.rai.tv/dl/RaiTV/programmi/media/ContentItem-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
@@
-107,7
+107,8
@@
class RaiTVIE(InfoExtractor):
return xml.replace(' tag elementi', '').replace('>/', '</')
relinker = self._download_xml(
return xml.replace(' tag elementi', '').replace('>/', '</')
relinker = self._download_xml(
- media['mediaUri'] + '&output=43', video_id, transform_source=fix_xml)
+ media['mediaUri'] + '&output=43',
+ video_id, transform_source=fix_xml)
has_subtitle = False
has_subtitle = False
@@
-117,8
+118,8
@@
class RaiTVIE(InfoExtractor):
content_type = xpath_text(element, 'content-type')
if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
content_type = xpath_text(element, 'content-type')
if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
- media_url, video_id, 'mp4', 'm3u8_native',
m3u8_id='hls',
- fatal=False))
+ media_url, video_id, 'mp4', 'm3u8_native',
+
m3u8_id='hls',
fatal=False))
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
media_url + '?hdcore=3.7.0&plugin=aasp-3.7.0.39.44',
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
media_url + '?hdcore=3.7.0&plugin=aasp-3.7.0.39.44',
@@
-174,7
+175,7
@@
class RaiTVIE(InfoExtractor):
class RaiIE(InfoExtractor):
class RaiIE(InfoExtractor):
- _VALID_URL = r'http://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
_TESTS = [
{
'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',
_TESTS = [
{
'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',