Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rai] fixes #12652 #27673

Merged
merged 4 commits into from
Jan 5, 2021
Merged

[rai] fixes #12652 #27673

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76468ba
[rai] extract ContentItem from iframes (fixes #12652)
nixxo Jan 5, 2021
7b500a8
[rai] improved regex and moved up in previous _search_regex
nixxo Jan 5, 2021
361c8f6
Update rai.py
dstftw Jan 5, 2021
ee0064c
Update rai.py
dstftw Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions youtube_dl/extractor/rai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,19 @@ class RaiIE(RaiBaseIE):
'params': {
'skip_download': True,
},
}, {
# ContentItem in iframe - fixes #12652
'url': 'http://www.presadiretta.rai.it/dl/portali/site/puntata/ContentItem-3ed19d13-26c2-46ff-a551-b10828262f1b.html',
'info_dict': {
'id': '1ad6dc64-444a-42a4-9bea-e5419ad2f5fd',
'ext': 'mp4',
'title': 'Partiti acchiappavoti - Presa diretta del 13/09/2015',
'description': 'md5:d291b03407ec505f95f27970c0b025f4',
'upload_date': '20150913',
},
'params': {
'skip_download': True,
},
}, {
# Direct MMS URL
'url': 'http://www.rai.it/dl/RaiTV/programmi/media/ContentItem-b63a4089-ac28-48cf-bca5-9f5b5bc46df5.html',
Expand Down Expand Up @@ -410,6 +423,11 @@ def _real_extract(self, url):
''' % self._UUID_RE,
webpage, 'content item id', default=None, group='id')

if not content_item_id:
content_item_id = self._search_regex(
r'/ContentItem-(?P<id>%s)\.html\?iframe' % self._UUID_RE,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add <iframe part to the regex and move this whole pattern to into previous _search_regex call.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7b500a8

webpage, 'content item id', default=None, group='id')

content_item_ids = set()
if content_item_id:
content_item_ids.add(content_item_id)
Expand Down