[extractor/tele5] Modified tele5 extractor to fix Issue #8501 #9792
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pukkandan
requested changes
Apr 26, 2024
Comment on lines
+46
to
+52
| try: | ||
| playables_json = self._search_regex( | ||
| r'window\.Playables\s*=\s*({.+?})\s*;', webpage, | ||
| 'playables info', default='{}', flags=re.DOTALL) | ||
| playables = self._parse_json(playables_json, track_id) | ||
| except re.error: | ||
| raise ExtractorError('Failed to extract playables information. The page structure may have changed.') |
There was a problem hiding this comment.
We might as well convert this to self._search_json since we are editing it
Comment on lines
+54
to
63
| if not playables or 'tracks' not in playables: | ||
| raise ExtractorError('No playable tracks found in the extracted information.') | ||
|
|
||
| title = ', '.join((a['name'] for a in track['artists'])) + ' - ' + track['name'] | ||
| if track['mix']: | ||
| track = next((t for t in playables['tracks'] if t['id'] == int(track_id)), None) | ||
| if not track: | ||
| raise ExtractorError(f'No track with ID {track_id} found.') | ||
|
|
||
| title = ', '.join(a['name'] for a in track['artists']) + ' - ' + track['name'] | ||
| if track.get('mix'): | ||
| title += ' (' + track['mix'] + ')' |
There was a problem hiding this comment.
Suggested change
| if not playables or 'tracks' not in playables: | |
| raise ExtractorError('No playable tracks found in the extracted information.') | |
| title = ', '.join((a['name'] for a in track['artists'])) + ' - ' + track['name'] | |
| if track['mix']: | |
| track = next((t for t in playables['tracks'] if t['id'] == int(track_id)), None) | |
| if not track: | |
| raise ExtractorError(f'No track with ID {track_id} found.') | |
| title = ', '.join(a['name'] for a in track['artists']) + ' - ' + track['name'] | |
| if track.get('mix'): | |
| title += ' (' + track['mix'] + ')' | |
| track = traverse_obj(playables, ('tracks', lambda _, t: t['id'] == int(track_id), {dict})) | |
| if not track: | |
| raise ExtractorError(f'No track with ID {track_id} found') | |
| title = join_nonempty( | |
| ', '.join(traverse_obj(track, ('artists', ..., 'name'))), | |
| track.get('name'), format_field(track, 'mix', '(%s)')) |
| @@ -503,6 +503,7 @@ | |||
| - **gem.cbc.ca**: [*cbcgem*](## "netrc machine") | |||
| - **gem.cbc.ca:live** | |||
| - **gem.cbc.ca:playlist** | |||
| - **generic**: Generic downloader that works on some sites | |||
Comment on lines
83
to
+89
| return { | ||
| 'id': compat_str(track.get('id')) or track_id, | ||
| 'display_id': track.get('slug') or display_id, | ||
| 'id': compat_str(track.get('id', track_id)), | ||
| 'display_id': track.get('slug', display_id), | ||
| 'title': title, | ||
| 'formats': formats, | ||
| 'thumbnails': images, | ||
| } | ||
| 'thumbnails': images | ||
| } |
pukkandan
reviewed
Apr 26, 2024
| @@ -1,17 +1,68 @@ | |||
| import re | |||
|
|
|||
| import requests | |||
There was a problem hiding this comment.
Do not use requests. All network access should go through the helper functions
pukkandan
requested changes
Apr 26, 2024
| if getattr(e, 'message', '') == 'Missing deviceId in context': | ||
| self.report_drm(video_id) | ||
| raise | ||
| content_regex = re.compile(r'https?://(?:www\.)?(?P<environment>[^.]+)\.de/(?P<parent_slug>[^/]+)/(?P<slug>[^/?#&]+)') |
| referer=url, | ||
| url='https://de-api.loma-cms.com/feloma/configurations/?environment={0}'.format(environment)) | ||
|
|
||
| site_info = cached_base.get('data').get('settings').get('site') |
pukkandan
added
site-bug
|
This is just a copy of #8501 with unrelated beatport changes added on top??? Pls explain Ignore above review until this is resolved |
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMPORTANT: PRs without the template will be CLOSED
Description of your pull request and other information
ADD DESCRIPTION HERE
Fixes #
Template
Before submitting a pull request make sure you have:
In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under Unlicense. Check all of the following options that apply:
What is the purpose of your pull request?