Skip to content

Commit

Permalink
[ie/youtube] Fix heatmap extraction (#8299)
Browse files Browse the repository at this point in the history
Closes #8189
Authored by: bashonly
  • Loading branch information
bashonly committed Oct 7, 2023
1 parent 792f1e6 commit 03e85ea
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions yt_dlp/extractor/youtube.py
Expand Up @@ -3292,16 +3292,15 @@ def _extract_chapters_from_engagement_panel(self, data, duration):
chapter_time, chapter_title, duration)
for contents in content_list)), [])

def _extract_heatmap_from_player_overlay(self, data):
content_list = traverse_obj(data, (
'playerOverlays', 'playerOverlayRenderer', 'decoratedPlayerBarRenderer', 'decoratedPlayerBarRenderer', 'playerBar',
'multiMarkersPlayerBarRenderer', 'markersMap', ..., 'value', 'heatmap', 'heatmapRenderer', 'heatMarkers', {list}))
return next(filter(None, (
traverse_obj(contents, (..., 'heatMarkerRenderer', {
'start_time': ('timeRangeStartMillis', {functools.partial(float_or_none, scale=1000)}),
'end_time': {lambda x: (x['timeRangeStartMillis'] + x['markerDurationMillis']) / 1000},
'value': ('heatMarkerIntensityScoreNormalized', {float_or_none}),
})) for contents in content_list)), None)
def _extract_heatmap(self, data):
return traverse_obj(data, (
'frameworkUpdates', 'entityBatchUpdate', 'mutations',
lambda _, v: v['payload']['macroMarkersListEntity']['markersList']['markerType'] == 'MARKER_TYPE_HEATMAP',
'payload', 'macroMarkersListEntity', 'markersList', 'markers', ..., {
'start_time': ('startMillis', {functools.partial(float_or_none, scale=1000)}),
'end_time': {lambda x: (int(x['startMillis']) + int(x['durationMillis'])) / 1000},
'value': ('intensityScoreNormalized', {float_or_none}),
})) or None

def _extract_comment(self, comment_renderer, parent=None):
comment_id = comment_renderer.get('commentId')
Expand Down Expand Up @@ -4435,7 +4434,7 @@ def process_language(container, base_url, lang_code, sub_name, query):
or self._extract_chapters_from_description(video_description, duration)
or None)

info['heatmap'] = self._extract_heatmap_from_player_overlay(initial_data)
info['heatmap'] = self._extract_heatmap(initial_data)

contents = traverse_obj(
initial_data, ('contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents'),
Expand Down

0 comments on commit 03e85ea

Please sign in to comment.