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

Jump to bottom

[bbc] Get all available formats, deprioritize audio description #1717

Merged
merged 2 commits into from
Nov 19, 2021
Merged

[bbc] Get all available formats, deprioritize audio description #1717

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3d630
[bbc] Get all available formats, deprioritize audio description
qtlunya Nov 19, 2021
db670b9
[bbc] Address review comments
qtlunya Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 15 additions & 4 deletions yt_dlp/extractor/bbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import itertools
import json
import re
from collections import defaultdict

from .common import InfoExtractor
from ..compat import (
Expand Down Expand Up @@ -451,9 +452,10 @@ def _download_playlist(self, playlist_id):
playlist = self._download_json(
'http://www.bbc.co.uk/programmes/%s/playlist.json' % playlist_id,
playlist_id, 'Downloading playlist JSON')
formats = []
subtitles = defaultdict(list)
0xallie marked this conversation as resolved.
Show resolved Hide resolved

version = playlist.get('defaultAvailableVersion')
if version:
for version in playlist.get('allAvailableVersions', []):
smp_config = version['smpConfig']
title = smp_config['title']
description = smp_config['summary']
Expand All @@ -463,8 +465,17 @@ def _download_playlist(self, playlist_id):
continue
programme_id = item.get('vpid')
duration = int_or_none(item.get('duration'))
formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles
version_formats, version_subtitles = self._download_media_selector(programme_id)
types = version['types']
for f in version_formats:
f['format_note'] = ', '.join(types)
if any('AudioDescribed' in x for x in types):
f['preference'] = -10
0xallie marked this conversation as resolved.
Show resolved Hide resolved
formats += version_formats
for tag, subformats in (version_subtitles or {}).items():
subtitles[tag] += subformats

return programme_id, title, description, duration, formats, subtitles
except ExtractorError as ee:
if not (isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 404):
raise
Expand Down