2013-11-28 05:47:20 +01:00
|
|
|
# coding: utf-8
|
2014-02-24 07:47:47 +01:00
|
|
|
from __future__ import unicode_literals
|
2013-11-28 05:47:20 +01:00
|
|
|
|
2013-06-23 20:24:07 +02:00
|
|
|
import re
|
|
|
|
|
|
|
|
from .common import InfoExtractor
|
2017-01-04 22:05:27 +01:00
|
|
|
from ..compat import compat_str
|
2013-06-23 20:24:07 +02:00
|
|
|
from ..utils import (
|
2015-12-28 17:49:59 +01:00
|
|
|
determine_ext,
|
2017-01-04 22:05:27 +01:00
|
|
|
int_or_none,
|
|
|
|
NO_DEFAULT,
|
|
|
|
orderedSet,
|
|
|
|
parse_codecs,
|
|
|
|
qualities,
|
|
|
|
try_get,
|
|
|
|
unified_timestamp,
|
|
|
|
update_url_query,
|
2018-07-21 14:08:28 +02:00
|
|
|
url_or_none,
|
2017-01-04 22:05:27 +01:00
|
|
|
urljoin,
|
2013-06-23 20:24:07 +02:00
|
|
|
)
|
2013-09-28 15:43:34 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
|
|
|
|
class ZDFBaseIE(InfoExtractor):
|
2017-02-13 19:00:06 +01:00
|
|
|
def _call_api(self, url, player, referrer, video_id, item):
|
2017-01-04 22:05:27 +01:00
|
|
|
return self._download_json(
|
2017-02-13 19:00:06 +01:00
|
|
|
url, video_id, 'Downloading JSON %s' % item,
|
2017-01-04 22:05:27 +01:00
|
|
|
headers={
|
|
|
|
'Referer': referrer,
|
|
|
|
'Api-Auth': 'Bearer %s' % player['apiToken'],
|
|
|
|
})
|
|
|
|
|
|
|
|
def _extract_player(self, webpage, video_id, fatal=True):
|
|
|
|
return self._parse_json(
|
|
|
|
self._search_regex(
|
|
|
|
r'(?s)data-zdfplayer-jsb=(["\'])(?P<json>{.+?})\1', webpage,
|
|
|
|
'player JSON', default='{}' if not fatal else NO_DEFAULT,
|
|
|
|
group='json'),
|
|
|
|
video_id)
|
|
|
|
|
|
|
|
|
|
|
|
class ZDFIE(ZDFBaseIE):
|
|
|
|
_VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?]+)\.html'
|
|
|
|
_QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh')
|
2019-09-18 20:11:52 +02:00
|
|
|
_GEO_COUNTRIES = ['DE']
|
2013-11-28 05:47:20 +01:00
|
|
|
|
2015-12-28 17:49:59 +01:00
|
|
|
_TESTS = [{
|
2018-02-21 15:57:34 +01:00
|
|
|
'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html',
|
2014-02-24 07:47:47 +01:00
|
|
|
'info_dict': {
|
2018-02-21 15:57:34 +01:00
|
|
|
'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
|
2016-10-29 14:06:07 +02:00
|
|
|
'ext': 'mp4',
|
2018-02-21 15:57:34 +01:00
|
|
|
'title': 'Die Magie der Farben (2/2)',
|
|
|
|
'description': 'md5:a89da10c928c6235401066b60a6d5c1a',
|
|
|
|
'duration': 2615,
|
|
|
|
'timestamp': 1465021200,
|
|
|
|
'upload_date': '20160604',
|
|
|
|
},
|
|
|
|
}, {
|
|
|
|
'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html',
|
|
|
|
'only_matching': True,
|
2017-01-04 22:05:27 +01:00
|
|
|
}, {
|
|
|
|
'url': 'https://www.zdf.de/filme/taunuskrimi/die-lebenden-und-die-toten-1---ein-taunuskrimi-100.html',
|
|
|
|
'only_matching': True,
|
|
|
|
}, {
|
|
|
|
'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html',
|
|
|
|
'only_matching': True,
|
2015-12-28 17:49:59 +01:00
|
|
|
}]
|
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
@staticmethod
|
|
|
|
def _extract_subtitles(src):
|
|
|
|
subtitles = {}
|
|
|
|
for caption in try_get(src, lambda x: x['captions'], list) or []:
|
2018-07-21 14:08:28 +02:00
|
|
|
subtitle_url = url_or_none(caption.get('uri'))
|
|
|
|
if subtitle_url:
|
2017-01-04 22:05:27 +01:00
|
|
|
lang = caption.get('language', 'deu')
|
|
|
|
subtitles.setdefault(lang, []).append({
|
|
|
|
'url': subtitle_url,
|
|
|
|
})
|
|
|
|
return subtitles
|
|
|
|
|
|
|
|
def _extract_format(self, video_id, formats, format_urls, meta):
|
2018-07-21 14:08:28 +02:00
|
|
|
format_url = url_or_none(meta.get('url'))
|
|
|
|
if not format_url:
|
2017-01-04 22:05:27 +01:00
|
|
|
return
|
|
|
|
if format_url in format_urls:
|
|
|
|
return
|
|
|
|
format_urls.add(format_url)
|
|
|
|
mime_type = meta.get('mimeType')
|
|
|
|
ext = determine_ext(format_url)
|
|
|
|
if mime_type == 'application/x-mpegURL' or ext == 'm3u8':
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
|
|
|
format_url, video_id, 'mp4', m3u8_id='hls',
|
|
|
|
entry_protocol='m3u8_native', fatal=False))
|
|
|
|
elif mime_type == 'application/f4m+xml' or ext == 'f4m':
|
|
|
|
formats.extend(self._extract_f4m_formats(
|
|
|
|
update_url_query(format_url, {'hdcore': '3.7.0'}), video_id, f4m_id='hds', fatal=False))
|
|
|
|
else:
|
|
|
|
f = parse_codecs(meta.get('mimeCodec'))
|
|
|
|
format_id = ['http']
|
|
|
|
for p in (meta.get('type'), meta.get('quality')):
|
|
|
|
if p and isinstance(p, compat_str):
|
|
|
|
format_id.append(p)
|
|
|
|
f.update({
|
|
|
|
'url': format_url,
|
|
|
|
'format_id': '-'.join(format_id),
|
|
|
|
'format_note': meta.get('quality'),
|
|
|
|
'language': meta.get('language'),
|
|
|
|
'quality': qualities(self._QUALITIES)(meta.get('quality')),
|
|
|
|
'preference': -10,
|
|
|
|
})
|
|
|
|
formats.append(f)
|
|
|
|
|
2017-02-13 19:00:06 +01:00
|
|
|
def _extract_entry(self, url, player, content, video_id):
|
2017-01-04 22:05:27 +01:00
|
|
|
title = content.get('title') or content['teaserHeadline']
|
|
|
|
|
|
|
|
t = content['mainVideoContent']['http://zdf.de/rels/target']
|
|
|
|
|
|
|
|
ptmd_path = t.get('http://zdf.de/rels/streams/ptmd')
|
|
|
|
|
|
|
|
if not ptmd_path:
|
|
|
|
ptmd_path = t[
|
|
|
|
'http://zdf.de/rels/streams/ptmd-template'].replace(
|
|
|
|
'{playerId}', 'portal')
|
|
|
|
|
2017-02-13 19:00:06 +01:00
|
|
|
ptmd = self._call_api(
|
|
|
|
urljoin(url, ptmd_path), player, url, video_id, 'metadata')
|
2017-01-04 22:05:27 +01:00
|
|
|
|
2015-12-28 17:49:59 +01:00
|
|
|
formats = []
|
2017-01-04 22:05:27 +01:00
|
|
|
track_uris = set()
|
|
|
|
for p in ptmd['priorityList']:
|
|
|
|
formitaeten = p.get('formitaeten')
|
|
|
|
if not isinstance(formitaeten, list):
|
2015-12-28 17:49:59 +01:00
|
|
|
continue
|
2017-01-04 22:05:27 +01:00
|
|
|
for f in formitaeten:
|
|
|
|
f_qualities = f.get('qualities')
|
|
|
|
if not isinstance(f_qualities, list):
|
|
|
|
continue
|
|
|
|
for quality in f_qualities:
|
|
|
|
tracks = try_get(quality, lambda x: x['audio']['tracks'], list)
|
|
|
|
if not tracks:
|
|
|
|
continue
|
|
|
|
for track in tracks:
|
|
|
|
self._extract_format(
|
|
|
|
video_id, formats, track_uris, {
|
|
|
|
'url': track.get('uri'),
|
|
|
|
'type': f.get('type'),
|
|
|
|
'mimeType': f.get('mimeType'),
|
|
|
|
'quality': quality.get('quality'),
|
|
|
|
'language': track.get('language'),
|
|
|
|
})
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
thumbnails = []
|
|
|
|
layouts = try_get(
|
|
|
|
content, lambda x: x['teaserImageRef']['layouts'], dict)
|
|
|
|
if layouts:
|
|
|
|
for layout_key, layout_url in layouts.items():
|
2018-07-21 14:08:28 +02:00
|
|
|
layout_url = url_or_none(layout_url)
|
|
|
|
if not layout_url:
|
2017-01-04 22:05:27 +01:00
|
|
|
continue
|
|
|
|
thumbnail = {
|
|
|
|
'url': layout_url,
|
|
|
|
'format_id': layout_key,
|
|
|
|
}
|
|
|
|
mobj = re.search(r'(?P<width>\d+)x(?P<height>\d+)', layout_key)
|
|
|
|
if mobj:
|
|
|
|
thumbnail.update({
|
|
|
|
'width': int(mobj.group('width')),
|
|
|
|
'height': int(mobj.group('height')),
|
|
|
|
})
|
|
|
|
thumbnails.append(thumbnail)
|
2015-12-28 17:49:59 +01:00
|
|
|
|
|
|
|
return {
|
2017-01-04 22:05:27 +01:00
|
|
|
'id': video_id,
|
|
|
|
'title': title,
|
|
|
|
'description': content.get('leadParagraph') or content.get('teasertext'),
|
|
|
|
'duration': int_or_none(t.get('duration')),
|
|
|
|
'timestamp': unified_timestamp(content.get('editorialDate')),
|
|
|
|
'thumbnails': thumbnails,
|
|
|
|
'subtitles': self._extract_subtitles(ptmd),
|
2015-12-28 17:49:59 +01:00
|
|
|
'formats': formats,
|
|
|
|
}
|
2013-06-23 20:24:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
def _extract_regular(self, url, player, video_id):
|
2017-02-13 19:00:06 +01:00
|
|
|
content = self._call_api(
|
|
|
|
player['content'], player, url, video_id, 'content')
|
|
|
|
return self._extract_entry(player['content'], player, content, video_id)
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
def _extract_mobile(self, video_id):
|
|
|
|
document = self._download_json(
|
|
|
|
'https://zdf-cdn.live.cellular.de/mediathekV2/document/%s' % video_id,
|
|
|
|
video_id)['document']
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
title = document['titel']
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
formats = []
|
|
|
|
format_urls = set()
|
|
|
|
for f in document['formitaeten']:
|
|
|
|
self._extract_format(video_id, formats, format_urls, f)
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
thumbnails = []
|
|
|
|
teaser_bild = document.get('teaserBild')
|
|
|
|
if isinstance(teaser_bild, dict):
|
|
|
|
for thumbnail_key, thumbnail in teaser_bild.items():
|
|
|
|
thumbnail_url = try_get(
|
|
|
|
thumbnail, lambda x: x['url'], compat_str)
|
|
|
|
if thumbnail_url:
|
|
|
|
thumbnails.append({
|
|
|
|
'url': thumbnail_url,
|
|
|
|
'id': thumbnail_key,
|
|
|
|
'width': int_or_none(thumbnail.get('width')),
|
|
|
|
'height': int_or_none(thumbnail.get('height')),
|
|
|
|
})
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
return {
|
|
|
|
'id': video_id,
|
|
|
|
'title': title,
|
|
|
|
'description': document.get('beschreibung'),
|
|
|
|
'duration': int_or_none(document.get('length')),
|
|
|
|
'timestamp': unified_timestamp(try_get(
|
|
|
|
document, lambda x: x['meta']['editorialDate'], compat_str)),
|
|
|
|
'thumbnails': thumbnails,
|
|
|
|
'subtitles': self._extract_subtitles(document),
|
|
|
|
'formats': formats,
|
|
|
|
}
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
def _real_extract(self, url):
|
|
|
|
video_id = self._match_id(url)
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
webpage = self._download_webpage(url, video_id, fatal=False)
|
|
|
|
if webpage:
|
|
|
|
player = self._extract_player(webpage, url, fatal=False)
|
|
|
|
if player:
|
|
|
|
return self._extract_regular(url, player, video_id)
|
2016-10-29 14:06:07 +02:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
return self._extract_mobile(video_id)
|
2016-10-29 14:06:07 +02:00
|
|
|
|
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
class ZDFChannelIE(ZDFBaseIE):
|
|
|
|
_VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
|
2015-12-24 15:44:49 +01:00
|
|
|
_TESTS = [{
|
2017-01-04 22:05:27 +01:00
|
|
|
'url': 'https://www.zdf.de/sport/das-aktuelle-sportstudio',
|
2014-12-10 17:29:03 +01:00
|
|
|
'info_dict': {
|
2017-01-04 22:05:27 +01:00
|
|
|
'id': 'das-aktuelle-sportstudio',
|
|
|
|
'title': 'das aktuelle sportstudio | ZDF',
|
2014-12-10 17:29:03 +01:00
|
|
|
},
|
pull changes from remote master (#190)
* [scrippsnetworks] Add new extractor(closes #19857)(closes #22981)
* [teachable] Improve locked lessons detection (#23528)
* [teachable] Fail with error message if no video URL found
* [extractors] add missing import for ScrippsNetworksIE
* [brightcove] cache brightcove player policy keys
* [prosiebensat1] improve geo restriction handling(closes #23571)
* [soundcloud] automatically update client id on failing requests
* [spankbang] Fix extraction (closes #23307, closes #23423, closes #23444)
* [spankbang] Improve removed video detection (#23423)
* [brightcove] update policy key on failing requests
* [pornhub] Fix extraction and add support for m3u8 formats (closes #22749, closes #23082)
* [pornhub] Improve locked videos detection (closes #22449, closes #22780)
* [brightcove] invalidate policy key cache on failing requests
* [soundcloud] fix client id extraction for non fatal requests
* [ChangeLog] Actualize
[ci skip]
* [devscripts/create-github-release] Switch to using PAT for authentication
Basic authentication will be deprecated soon
* release 2020.01.01
* [redtube] Detect private videos (#23518)
* [vice] improve extraction(closes #23631)
* [devscripts/create-github-release] Remove unused import
* [wistia] improve format extraction and extract subtitles(closes #22590)
* [nrktv:seriebase] Fix extraction (closes #23625) (#23537)
* [discovery] fix anonymous token extraction(closes #23650)
* [scrippsnetworks] add support for www.discovery.com videos
* [scrippsnetworks] correct test case URL
* [dctp] fix format extraction(closes #23656)
* [pandatv] Remove extractor (#23630)
* [naver] improve extraction
- improve geo-restriction handling
- extract automatic captions
- extract uploader metadata
- extract VLive HLS formats
* [naver] improve metadata extraction
* [cloudflarestream] improve extraction
- add support for bytehighway.net domain
- add support for signed URLs
- extract thumbnail
* [cloudflarestream] import embed URL extraction
* [lego] fix extraction and extract subtitle(closes #23687)
* [safari] Fix kaltura session extraction (closes #23679) (#23670)
* [orf:fm4] Fix extraction (#23599)
* [orf:radio] Clean description and improve extraction
* [twitter] add support for promo_video_website cards(closes #23711)
* [vodplatform] add support for embed.kwikmotion.com domain
* [ndr:base:embed] Improve thumbnails extraction (closes #23731)
* [canvas] Add support for new API endpoint and update tests (closes #17680, closes #18629)
* [travis] Add flake8 job (#23720)
* [yourporn] Fix extraction (closes #21645, closes #22255, closes #23459)
* [ChangeLog] Actualize
[ci skip]
* release 2020.01.15
* [soundcloud] Restore previews extraction (closes #23739)
* [orf:tvthek] Improve geo restricted videos detection (closes #23741)
* [zype] improve extraction
- extract subtitles(closes #21258)
- support URLs with alternative keys/tokens(#21258)
- extract more metadata
* [americastestkitchen] fix extraction
* [nbc] add support for nbc multi network URLs(closes #23049)
* [ard] improve extraction(closes #23761)
- simplify extraction
- extract age limit and series
- bypass geo-restriction
* [ivi:compilation] Fix entries extraction (closes #23770)
* [24video] Add support for 24video.vip (closes #23753)
* [businessinsider] Fix jwplatform id extraction (closes #22929) (#22954)
* [ard] add a missing condition
* [azmedien] fix extraction(closes #23783)
* [voicerepublic] fix extraction
* [stretchinternet] fix extraction(closes #4319)
* [youtube] Fix sigfunc name extraction (closes #23819)
* [ChangeLog] Actualize
[ci skip]
* release 2020.01.24
* [soundcloud] imporve private playlist/set tracks extraction
https://github.com/ytdl-org/youtube-dl/issues/3707#issuecomment-577873539
* [svt] fix article extraction(closes #22897)(closes #22919)
* [svt] fix series extraction(closes #22297)
* [viewlift] improve extraction
- fix extraction(closes #23851)
- add add support for authentication
- add support for more domains
* [vimeo] fix album extraction(closes #23864)
* [tva] Relax _VALID_URL (closes #23903)
* [tv5mondeplus] Fix extraction (closes #23907, closes #23911)
* [twitch:stream] Lowercase channel id for stream request (closes #23917)
* [sportdeutschland] Update to new sportdeutschland API
They switched to SSL, but under a different host AND path...
Remove the old test cases because these videos have become unavailable.
* [popcorntimes] Add extractor (closes #23949)
* [thisoldhouse] fix extraction(closes #23951)
* [toggle] Add support for mewatch.sg (closes #23895) (#23930)
* [compat] Introduce compat_realpath (refs #23991)
* [update] Fix updating via symlinks (closes #23991)
* [nytimes] improve format sorting(closes #24010)
* [abc:iview] Support 720p (#22907) (#22921)
* [nova:embed] Fix extraction (closes #23672)
* [nova:embed] Improve (closes #23690)
* [nova] Improve extraction (refs #23690)
* [jpopsuki] Remove extractor (closes #23858)
* [YoutubeDL] Fix playlist entry indexing with --playlist-items (closes #10591, closes #10622)
* [test_YoutubeDL] Fix get_ids
* [test_YoutubeDL] Add tests for #10591 (closes #23873)
* [24video] Add support for porn.24video.net (closes #23779, closes #23784)
* [npr] Add support for streams (closes #24042)
* [ChangeLog] Actualize
[ci skip]
* release 2020.02.16
* [tv2dk:bornholm:play] Fix extraction (#24076)
* [imdb] Fix extraction (closes #23443)
* [wistia] Add support for multiple generic embeds (closes #8347, closes #11385)
* [teachable] Add support for multiple videos per lecture (closes #24101)
* [pornhd] Fix extraction (closes #24128)
* [options] Remove duplicate short option -v for --version (#24162)
* [extractor/common] Convert ISM manifest to unicode before processing on python 2 (#24152)
* [YoutubeDL] Force redirect URL to unicode on python 2
* Remove no longer needed compat_str around geturl
* [youjizz] Fix extraction (closes #24181)
* [test_subtitles] Remove obsolete test
* [zdf:channel] Fix tests
* [zapiks] Fix test
* [xtube] Fix metadata extraction (closes #21073, closes #22455)
* [xtube:user] Fix test
* [telecinco] Fix extraction (refs #24195)
* [telecinco] Add support for article opening videos
* [franceculture] Fix extraction (closes #24204)
* [xhamster] Fix extraction (closes #24205)
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.01
* [vimeo] Fix subtitles URLs (#24209)
* [servus] Add support for new URL schema (closes #23475, closes #23583, closes #24142)
* [youtube:playlist] Fix tests (closes #23872) (#23885)
* [peertube] Improve extraction
* [peertube] Fix issues and improve extraction (closes #23657)
* [pornhub] Improve title extraction (closes #24184)
* [vimeo] fix showcase password protected video extraction(closes #24224)
* [youtube] Fix age-gated videos support without login (closes #24248)
* [youtube] Fix tests
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.06
* [nhk] update API version(closes #24270)
* [youtube] Improve extraction in 429 error conditions (closes #24283)
* [youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283)
* [youtube] Remove outdated code
Additional get_video_info requests don't seem to provide any extra itags any longer
* [README.md] Clarify 429 error
* [pornhub] Add support for pornhubpremium.com (#24288)
* [utils] Add support for cookies with spaces used instead of tabs
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.08
* Revert "[utils] Add support for cookies with spaces used instead of tabs"
According to [1] TABs must be used as separators between fields.
Files produces by some tools with spaces as separators are considered
malformed.
1. https://curl.haxx.se/docs/http-cookies.html
This reverts commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [nhk] Relax _VALID_URL (#24329)
* [nhk] Remove obsolete rtmp formats (closes #24329)
* [nhk] Update m3u8 URL and use native hls (#24329)
* [ndr] Fix extraction (closes #24326)
* [xtube] Fix formats extraction (closes #24348)
* [xtube] Fix typo
* [hellporno] Fix extraction (closes #24399)
* [cbc:watch] Add support for authentication
* [cbc:watch] Fix authenticated device token caching (closes #19160)
* [soundcloud] fix download url extraction(closes #24394)
* [limelight] remove disabled API requests(closes #24255)
* [bilibili] Add support for new URL schema with BV ids (closes #24439, closes #24442)
* [bilibili] Add support for player.bilibili.com (closes #24402)
* [teachable] Extract chapter metadata (closes #24421)
* [generic] Look for teachable embeds before wistia
* [teachable] Update upskillcourses domain
New version does not use teachable platform any longer
* [teachable] Update gns3 domain
* [teachable] Update test
* [ChangeLog] Actualize
[ci skip]
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.24
* [spankwire] Fix extraction (closes #18924, closes #20648)
* [spankwire] Add support for generic embeds (refs #24633)
* [youporn] Add support form generic embeds
* [mofosex] Add support for generic embeds (closes #24633)
* [tele5] Fix extraction (closes #24553)
* [extractor/common] Skip malformed ISM manifest XMLs while extracting ISM formats (#24667)
* [tv4] Fix ISM formats extraction (closes #24667)
* [twitch:clips] Extend _VALID_URL (closes #24290) (#24642)
* [motherless] Fix extraction (closes #24699)
* [nova:embed] Fix extraction (closes #24700)
* [youtube] Skip broken multifeed videos (closes #24711)
* [soundcloud] Extract AAC format
* [soundcloud] Improve AAC format extraction (closes #19173, closes #24708)
* [thisoldhouse] Fix video id extraction (closes #24548)
Added support for:
with of without "www."
and either ".chorus.build" or ".com"
It now validated correctly on older URL's
```
<iframe src="https://thisoldhouse.chorus.build/videos/zype/5e33baec27d2e50001d5f52f
```
and newer ones
```
<iframe src="https://www.thisoldhouse.com/videos/zype/5e2b70e95216cc0001615120
```
* [thisoldhouse] Improve video id extraction (closes #24549)
* [youtube] Fix DRM videos detection (refs #24736)
* [options] Clarify doc on --exec command (closes #19087) (#24883)
* [prosiebensat1] Improve extraction and remove 7tv.de support (#24948)
* [prosiebensat1] Extract series metadata
* [tenplay] Relax _VALID_URL (closes #25001)
* [tvplay] fix Viafree extraction(closes #15189)(closes #24473)(closes #24789)
* [yahoo] fix GYAO Player extraction and relax title URL regex(closes #24178)(closes #24778)
* [youtube] Use redirected video id if any (closes #25063)
* [youtube] Improve player id extraction and add tests
* [extractor/common] Extract multiple JSON-LD entries
* [crunchyroll] Fix and improve extraction (closes #25096, closes #25060)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.03
* [puhutv] Remove no longer available HTTP formats (closes #25124)
* [utils] Improve cookie files support
+ Add support for UTF-8 in cookie files
* Skip malformed cookie file entries instead of crashing (invalid entry len, invalid expires at)
* [dailymotion] Fix typo
* [compat] Introduce compat_cookiejar_Cookie
* [extractor/common] Use compat_cookiejar_Cookie for _set_cookie (closes #23256, closes #24776)
To always ensure cookie name and value are bytestrings on python 2.
* [orf] Add support for more radio stations (closes #24938) (#24968)
* [uol] fix extraction(closes #22007)
* [downloader/http] Finish downloading once received data length matches expected
Always do this if possible, i.e. if Content-Length or expected length is known, not only in test.
This will save unnecessary last extra loop trying to read 0 bytes.
* [downloader/http] Request last data block of exact remaining size
Always request last data block of exact size remaining to download if possible not the current block size.
* [iprima] Improve extraction (closes #25138)
* [youtube] Improve signature cipher extraction (closes #25188)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.08
* [spike] fix Bellator mgid extraction(closes #25195)
* [bbccouk] PEP8
* [mailru] Fix extraction (closes #24530) (#25239)
* [README.md] flake8 HTTPS URL (#25230)
* [youtube] Add support for yewtu.be (#25226)
* [soundcloud] reduce API playlist page limit(closes #25274)
* [vimeo] improve format extraction and sorting(closes #25285)
* [redtube] Improve title extraction (#25208)
* [indavideo] Switch to HTTPS for API request (#25191)
* [utils] Fix file permissions in write_json_file (closes #12471) (#25122)
* [redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321)
* [ard] Improve _VALID_URL (closes #25134) (#25198)
* [giantbomb] Extend _VALID_URL (#25222)
* [postprocessor/ffmpeg] Embed series metadata with --add-metadata
* [youtube] Add support for more invidious instances (#25417)
* [ard:beta] Extend _VALID_URL (closes #25405)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.29
* [jwplatform] Improve embeds extraction (closes #25467)
* [periscope] Fix untitled broadcasts (#25482)
* [twitter:broadcast] Add untitled periscope broadcast test
* [malltv] Add support for sk.mall.tv (#25445)
* [brightcove] Fix subtitles extraction (closes #25540)
* [brightcove] Sort imports
* [twitch] Pass v5 accept header and fix thumbnails extraction (closes #25531)
* [twitch:stream] Fix extraction (closes #25528)
* [twitch:stream] Expect 400 and 410 HTTP errors from API
* [tele5] Prefer jwplatform over nexx (closes #25533)
* [jwplatform] Add support for bypass geo restriction
* [tele5] Bypass geo restriction
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.06
* [kaltura] Add support for multiple embeds on a webpage (closes #25523)
* [youtube] Extract chapters from JSON (closes #24819)
* [facebook] Support single-video ID links
I stumbled upon this at https://www.facebook.com/bwfbadminton/posts/10157127020046316 . No idea how prevalent it is yet.
* [youtube] Fix playlist and feed extraction (closes #25675)
* [youtube] Fix thumbnails extraction and remove uploader id extraction warning (closes #25676)
* [youtube] Fix upload date extraction
* [youtube] Improve view count extraction
* [youtube] Fix uploader id and uploader URL extraction
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.16
* [youtube] Fix categories and improve tags extraction
* [youtube] Force old layout (closes #25682, closes #25683, closes #25680, closes #25686)
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.16.1
* [brightcove] Improve embed detection (closes #25674)
* [bellmedia] add support for cp24.com clip URLs(closes #25764)
* [youtube:playlists] Extend _VALID_URL (closes #25810)
* [youtube] Prevent excess HTTP 301 (#25786)
* [wistia] Restrict embed regex (closes #25969)
* [youtube] Improve description extraction (closes #25937) (#25980)
* [youtube] Fix sigfunc name extraction (closes #26134, closes #26135, closes #26136, closes #26137)
* [ChangeLog] Actualize
[ci skip]
* release 2020.07.28
* [xhamster] Extend _VALID_URL (closes #25789) (#25804)
* [xhamster] Fix extraction (closes #26157) (#26254)
* [xhamster] Extend _VALID_URL (closes #25927)
Co-authored-by: Remita Amine <remitamine@gmail.com>
Co-authored-by: Sergey M․ <dstftw@gmail.com>
Co-authored-by: nmeum <soeren+github@soeren-tempel.net>
Co-authored-by: Roxedus <me@roxedus.dev>
Co-authored-by: Singwai Chan <c.singwai@gmail.com>
Co-authored-by: cdarlint <cdarlint@users.noreply.github.com>
Co-authored-by: Johannes N <31795504+jonolt@users.noreply.github.com>
Co-authored-by: jnozsc <jnozsc@gmail.com>
Co-authored-by: Moritz Patelscheck <moritz.patelscheck@campus.tu-berlin.de>
Co-authored-by: PB <3854688+uno20001@users.noreply.github.com>
Co-authored-by: Philipp Hagemeister <phihag@phihag.de>
Co-authored-by: Xaver Hellauer <software@hellauer.bayern>
Co-authored-by: d2au <d2au.dev@gmail.com>
Co-authored-by: Jan 'Yenda' Trmal <jtrmal@gmail.com>
Co-authored-by: jxu <7989982+jxu@users.noreply.github.com>
Co-authored-by: Martin Ström <name@my-domain.se>
Co-authored-by: The Hatsune Daishi <nao20010128@gmail.com>
Co-authored-by: tsia <github@tsia.de>
Co-authored-by: 3risian <59593325+3risian@users.noreply.github.com>
Co-authored-by: Tristan Waddington <tristan.waddington@gmail.com>
Co-authored-by: Devon Meunier <devon.meunier@gmail.com>
Co-authored-by: Felix Stupp <felix.stupp@outlook.com>
Co-authored-by: tom <tomster954@gmail.com>
Co-authored-by: AndrewMBL <62922222+AndrewMBL@users.noreply.github.com>
Co-authored-by: willbeaufoy <will@willbeaufoy.net>
Co-authored-by: Philipp Stehle <anderschwiedu@googlemail.com>
Co-authored-by: hh0rva1h <61889859+hh0rva1h@users.noreply.github.com>
Co-authored-by: comsomisha <shmelev1996@mail.ru>
Co-authored-by: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com>
Co-authored-by: Juan Francisco Cantero Hurtado <iam@juanfra.info>
Co-authored-by: Dave Loyall <dave@the-good-guys.net>
Co-authored-by: tlsssl <63866177+tlsssl@users.noreply.github.com>
Co-authored-by: Rob <ankenyr@gmail.com>
Co-authored-by: Michael Klein <github@a98shuttle.de>
Co-authored-by: JordanWeatherby <47519158+JordanWeatherby@users.noreply.github.com>
Co-authored-by: striker.sh <19488257+strikersh@users.noreply.github.com>
Co-authored-by: Matej Dujava <mdujava@gmail.com>
Co-authored-by: Glenn Slayden <5589855+glenn-slayden@users.noreply.github.com>
Co-authored-by: MRWITEK <mrvvitek@gmail.com>
Co-authored-by: JChris246 <43832407+JChris246@users.noreply.github.com>
Co-authored-by: TheRealDude2 <the.real.dude@gmx.de>
2020-08-25 16:53:34 +02:00
|
|
|
'playlist_mincount': 23,
|
2015-12-24 15:44:49 +01:00
|
|
|
}, {
|
2017-01-04 22:05:27 +01:00
|
|
|
'url': 'https://www.zdf.de/dokumentation/planet-e',
|
|
|
|
'info_dict': {
|
|
|
|
'id': 'planet-e',
|
|
|
|
'title': 'planet e.',
|
|
|
|
},
|
pull changes from remote master (#190)
* [scrippsnetworks] Add new extractor(closes #19857)(closes #22981)
* [teachable] Improve locked lessons detection (#23528)
* [teachable] Fail with error message if no video URL found
* [extractors] add missing import for ScrippsNetworksIE
* [brightcove] cache brightcove player policy keys
* [prosiebensat1] improve geo restriction handling(closes #23571)
* [soundcloud] automatically update client id on failing requests
* [spankbang] Fix extraction (closes #23307, closes #23423, closes #23444)
* [spankbang] Improve removed video detection (#23423)
* [brightcove] update policy key on failing requests
* [pornhub] Fix extraction and add support for m3u8 formats (closes #22749, closes #23082)
* [pornhub] Improve locked videos detection (closes #22449, closes #22780)
* [brightcove] invalidate policy key cache on failing requests
* [soundcloud] fix client id extraction for non fatal requests
* [ChangeLog] Actualize
[ci skip]
* [devscripts/create-github-release] Switch to using PAT for authentication
Basic authentication will be deprecated soon
* release 2020.01.01
* [redtube] Detect private videos (#23518)
* [vice] improve extraction(closes #23631)
* [devscripts/create-github-release] Remove unused import
* [wistia] improve format extraction and extract subtitles(closes #22590)
* [nrktv:seriebase] Fix extraction (closes #23625) (#23537)
* [discovery] fix anonymous token extraction(closes #23650)
* [scrippsnetworks] add support for www.discovery.com videos
* [scrippsnetworks] correct test case URL
* [dctp] fix format extraction(closes #23656)
* [pandatv] Remove extractor (#23630)
* [naver] improve extraction
- improve geo-restriction handling
- extract automatic captions
- extract uploader metadata
- extract VLive HLS formats
* [naver] improve metadata extraction
* [cloudflarestream] improve extraction
- add support for bytehighway.net domain
- add support for signed URLs
- extract thumbnail
* [cloudflarestream] import embed URL extraction
* [lego] fix extraction and extract subtitle(closes #23687)
* [safari] Fix kaltura session extraction (closes #23679) (#23670)
* [orf:fm4] Fix extraction (#23599)
* [orf:radio] Clean description and improve extraction
* [twitter] add support for promo_video_website cards(closes #23711)
* [vodplatform] add support for embed.kwikmotion.com domain
* [ndr:base:embed] Improve thumbnails extraction (closes #23731)
* [canvas] Add support for new API endpoint and update tests (closes #17680, closes #18629)
* [travis] Add flake8 job (#23720)
* [yourporn] Fix extraction (closes #21645, closes #22255, closes #23459)
* [ChangeLog] Actualize
[ci skip]
* release 2020.01.15
* [soundcloud] Restore previews extraction (closes #23739)
* [orf:tvthek] Improve geo restricted videos detection (closes #23741)
* [zype] improve extraction
- extract subtitles(closes #21258)
- support URLs with alternative keys/tokens(#21258)
- extract more metadata
* [americastestkitchen] fix extraction
* [nbc] add support for nbc multi network URLs(closes #23049)
* [ard] improve extraction(closes #23761)
- simplify extraction
- extract age limit and series
- bypass geo-restriction
* [ivi:compilation] Fix entries extraction (closes #23770)
* [24video] Add support for 24video.vip (closes #23753)
* [businessinsider] Fix jwplatform id extraction (closes #22929) (#22954)
* [ard] add a missing condition
* [azmedien] fix extraction(closes #23783)
* [voicerepublic] fix extraction
* [stretchinternet] fix extraction(closes #4319)
* [youtube] Fix sigfunc name extraction (closes #23819)
* [ChangeLog] Actualize
[ci skip]
* release 2020.01.24
* [soundcloud] imporve private playlist/set tracks extraction
https://github.com/ytdl-org/youtube-dl/issues/3707#issuecomment-577873539
* [svt] fix article extraction(closes #22897)(closes #22919)
* [svt] fix series extraction(closes #22297)
* [viewlift] improve extraction
- fix extraction(closes #23851)
- add add support for authentication
- add support for more domains
* [vimeo] fix album extraction(closes #23864)
* [tva] Relax _VALID_URL (closes #23903)
* [tv5mondeplus] Fix extraction (closes #23907, closes #23911)
* [twitch:stream] Lowercase channel id for stream request (closes #23917)
* [sportdeutschland] Update to new sportdeutschland API
They switched to SSL, but under a different host AND path...
Remove the old test cases because these videos have become unavailable.
* [popcorntimes] Add extractor (closes #23949)
* [thisoldhouse] fix extraction(closes #23951)
* [toggle] Add support for mewatch.sg (closes #23895) (#23930)
* [compat] Introduce compat_realpath (refs #23991)
* [update] Fix updating via symlinks (closes #23991)
* [nytimes] improve format sorting(closes #24010)
* [abc:iview] Support 720p (#22907) (#22921)
* [nova:embed] Fix extraction (closes #23672)
* [nova:embed] Improve (closes #23690)
* [nova] Improve extraction (refs #23690)
* [jpopsuki] Remove extractor (closes #23858)
* [YoutubeDL] Fix playlist entry indexing with --playlist-items (closes #10591, closes #10622)
* [test_YoutubeDL] Fix get_ids
* [test_YoutubeDL] Add tests for #10591 (closes #23873)
* [24video] Add support for porn.24video.net (closes #23779, closes #23784)
* [npr] Add support for streams (closes #24042)
* [ChangeLog] Actualize
[ci skip]
* release 2020.02.16
* [tv2dk:bornholm:play] Fix extraction (#24076)
* [imdb] Fix extraction (closes #23443)
* [wistia] Add support for multiple generic embeds (closes #8347, closes #11385)
* [teachable] Add support for multiple videos per lecture (closes #24101)
* [pornhd] Fix extraction (closes #24128)
* [options] Remove duplicate short option -v for --version (#24162)
* [extractor/common] Convert ISM manifest to unicode before processing on python 2 (#24152)
* [YoutubeDL] Force redirect URL to unicode on python 2
* Remove no longer needed compat_str around geturl
* [youjizz] Fix extraction (closes #24181)
* [test_subtitles] Remove obsolete test
* [zdf:channel] Fix tests
* [zapiks] Fix test
* [xtube] Fix metadata extraction (closes #21073, closes #22455)
* [xtube:user] Fix test
* [telecinco] Fix extraction (refs #24195)
* [telecinco] Add support for article opening videos
* [franceculture] Fix extraction (closes #24204)
* [xhamster] Fix extraction (closes #24205)
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.01
* [vimeo] Fix subtitles URLs (#24209)
* [servus] Add support for new URL schema (closes #23475, closes #23583, closes #24142)
* [youtube:playlist] Fix tests (closes #23872) (#23885)
* [peertube] Improve extraction
* [peertube] Fix issues and improve extraction (closes #23657)
* [pornhub] Improve title extraction (closes #24184)
* [vimeo] fix showcase password protected video extraction(closes #24224)
* [youtube] Fix age-gated videos support without login (closes #24248)
* [youtube] Fix tests
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.06
* [nhk] update API version(closes #24270)
* [youtube] Improve extraction in 429 error conditions (closes #24283)
* [youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283)
* [youtube] Remove outdated code
Additional get_video_info requests don't seem to provide any extra itags any longer
* [README.md] Clarify 429 error
* [pornhub] Add support for pornhubpremium.com (#24288)
* [utils] Add support for cookies with spaces used instead of tabs
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.08
* Revert "[utils] Add support for cookies with spaces used instead of tabs"
According to [1] TABs must be used as separators between fields.
Files produces by some tools with spaces as separators are considered
malformed.
1. https://curl.haxx.se/docs/http-cookies.html
This reverts commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [nhk] Relax _VALID_URL (#24329)
* [nhk] Remove obsolete rtmp formats (closes #24329)
* [nhk] Update m3u8 URL and use native hls (#24329)
* [ndr] Fix extraction (closes #24326)
* [xtube] Fix formats extraction (closes #24348)
* [xtube] Fix typo
* [hellporno] Fix extraction (closes #24399)
* [cbc:watch] Add support for authentication
* [cbc:watch] Fix authenticated device token caching (closes #19160)
* [soundcloud] fix download url extraction(closes #24394)
* [limelight] remove disabled API requests(closes #24255)
* [bilibili] Add support for new URL schema with BV ids (closes #24439, closes #24442)
* [bilibili] Add support for player.bilibili.com (closes #24402)
* [teachable] Extract chapter metadata (closes #24421)
* [generic] Look for teachable embeds before wistia
* [teachable] Update upskillcourses domain
New version does not use teachable platform any longer
* [teachable] Update gns3 domain
* [teachable] Update test
* [ChangeLog] Actualize
[ci skip]
* [ChangeLog] Actualize
[ci skip]
* release 2020.03.24
* [spankwire] Fix extraction (closes #18924, closes #20648)
* [spankwire] Add support for generic embeds (refs #24633)
* [youporn] Add support form generic embeds
* [mofosex] Add support for generic embeds (closes #24633)
* [tele5] Fix extraction (closes #24553)
* [extractor/common] Skip malformed ISM manifest XMLs while extracting ISM formats (#24667)
* [tv4] Fix ISM formats extraction (closes #24667)
* [twitch:clips] Extend _VALID_URL (closes #24290) (#24642)
* [motherless] Fix extraction (closes #24699)
* [nova:embed] Fix extraction (closes #24700)
* [youtube] Skip broken multifeed videos (closes #24711)
* [soundcloud] Extract AAC format
* [soundcloud] Improve AAC format extraction (closes #19173, closes #24708)
* [thisoldhouse] Fix video id extraction (closes #24548)
Added support for:
with of without "www."
and either ".chorus.build" or ".com"
It now validated correctly on older URL's
```
<iframe src="https://thisoldhouse.chorus.build/videos/zype/5e33baec27d2e50001d5f52f
```
and newer ones
```
<iframe src="https://www.thisoldhouse.com/videos/zype/5e2b70e95216cc0001615120
```
* [thisoldhouse] Improve video id extraction (closes #24549)
* [youtube] Fix DRM videos detection (refs #24736)
* [options] Clarify doc on --exec command (closes #19087) (#24883)
* [prosiebensat1] Improve extraction and remove 7tv.de support (#24948)
* [prosiebensat1] Extract series metadata
* [tenplay] Relax _VALID_URL (closes #25001)
* [tvplay] fix Viafree extraction(closes #15189)(closes #24473)(closes #24789)
* [yahoo] fix GYAO Player extraction and relax title URL regex(closes #24178)(closes #24778)
* [youtube] Use redirected video id if any (closes #25063)
* [youtube] Improve player id extraction and add tests
* [extractor/common] Extract multiple JSON-LD entries
* [crunchyroll] Fix and improve extraction (closes #25096, closes #25060)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.03
* [puhutv] Remove no longer available HTTP formats (closes #25124)
* [utils] Improve cookie files support
+ Add support for UTF-8 in cookie files
* Skip malformed cookie file entries instead of crashing (invalid entry len, invalid expires at)
* [dailymotion] Fix typo
* [compat] Introduce compat_cookiejar_Cookie
* [extractor/common] Use compat_cookiejar_Cookie for _set_cookie (closes #23256, closes #24776)
To always ensure cookie name and value are bytestrings on python 2.
* [orf] Add support for more radio stations (closes #24938) (#24968)
* [uol] fix extraction(closes #22007)
* [downloader/http] Finish downloading once received data length matches expected
Always do this if possible, i.e. if Content-Length or expected length is known, not only in test.
This will save unnecessary last extra loop trying to read 0 bytes.
* [downloader/http] Request last data block of exact remaining size
Always request last data block of exact size remaining to download if possible not the current block size.
* [iprima] Improve extraction (closes #25138)
* [youtube] Improve signature cipher extraction (closes #25188)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.08
* [spike] fix Bellator mgid extraction(closes #25195)
* [bbccouk] PEP8
* [mailru] Fix extraction (closes #24530) (#25239)
* [README.md] flake8 HTTPS URL (#25230)
* [youtube] Add support for yewtu.be (#25226)
* [soundcloud] reduce API playlist page limit(closes #25274)
* [vimeo] improve format extraction and sorting(closes #25285)
* [redtube] Improve title extraction (#25208)
* [indavideo] Switch to HTTPS for API request (#25191)
* [utils] Fix file permissions in write_json_file (closes #12471) (#25122)
* [redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321)
* [ard] Improve _VALID_URL (closes #25134) (#25198)
* [giantbomb] Extend _VALID_URL (#25222)
* [postprocessor/ffmpeg] Embed series metadata with --add-metadata
* [youtube] Add support for more invidious instances (#25417)
* [ard:beta] Extend _VALID_URL (closes #25405)
* [ChangeLog] Actualize
[ci skip]
* release 2020.05.29
* [jwplatform] Improve embeds extraction (closes #25467)
* [periscope] Fix untitled broadcasts (#25482)
* [twitter:broadcast] Add untitled periscope broadcast test
* [malltv] Add support for sk.mall.tv (#25445)
* [brightcove] Fix subtitles extraction (closes #25540)
* [brightcove] Sort imports
* [twitch] Pass v5 accept header and fix thumbnails extraction (closes #25531)
* [twitch:stream] Fix extraction (closes #25528)
* [twitch:stream] Expect 400 and 410 HTTP errors from API
* [tele5] Prefer jwplatform over nexx (closes #25533)
* [jwplatform] Add support for bypass geo restriction
* [tele5] Bypass geo restriction
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.06
* [kaltura] Add support for multiple embeds on a webpage (closes #25523)
* [youtube] Extract chapters from JSON (closes #24819)
* [facebook] Support single-video ID links
I stumbled upon this at https://www.facebook.com/bwfbadminton/posts/10157127020046316 . No idea how prevalent it is yet.
* [youtube] Fix playlist and feed extraction (closes #25675)
* [youtube] Fix thumbnails extraction and remove uploader id extraction warning (closes #25676)
* [youtube] Fix upload date extraction
* [youtube] Improve view count extraction
* [youtube] Fix uploader id and uploader URL extraction
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.16
* [youtube] Fix categories and improve tags extraction
* [youtube] Force old layout (closes #25682, closes #25683, closes #25680, closes #25686)
* [ChangeLog] Actualize
[ci skip]
* release 2020.06.16.1
* [brightcove] Improve embed detection (closes #25674)
* [bellmedia] add support for cp24.com clip URLs(closes #25764)
* [youtube:playlists] Extend _VALID_URL (closes #25810)
* [youtube] Prevent excess HTTP 301 (#25786)
* [wistia] Restrict embed regex (closes #25969)
* [youtube] Improve description extraction (closes #25937) (#25980)
* [youtube] Fix sigfunc name extraction (closes #26134, closes #26135, closes #26136, closes #26137)
* [ChangeLog] Actualize
[ci skip]
* release 2020.07.28
* [xhamster] Extend _VALID_URL (closes #25789) (#25804)
* [xhamster] Fix extraction (closes #26157) (#26254)
* [xhamster] Extend _VALID_URL (closes #25927)
Co-authored-by: Remita Amine <remitamine@gmail.com>
Co-authored-by: Sergey M․ <dstftw@gmail.com>
Co-authored-by: nmeum <soeren+github@soeren-tempel.net>
Co-authored-by: Roxedus <me@roxedus.dev>
Co-authored-by: Singwai Chan <c.singwai@gmail.com>
Co-authored-by: cdarlint <cdarlint@users.noreply.github.com>
Co-authored-by: Johannes N <31795504+jonolt@users.noreply.github.com>
Co-authored-by: jnozsc <jnozsc@gmail.com>
Co-authored-by: Moritz Patelscheck <moritz.patelscheck@campus.tu-berlin.de>
Co-authored-by: PB <3854688+uno20001@users.noreply.github.com>
Co-authored-by: Philipp Hagemeister <phihag@phihag.de>
Co-authored-by: Xaver Hellauer <software@hellauer.bayern>
Co-authored-by: d2au <d2au.dev@gmail.com>
Co-authored-by: Jan 'Yenda' Trmal <jtrmal@gmail.com>
Co-authored-by: jxu <7989982+jxu@users.noreply.github.com>
Co-authored-by: Martin Ström <name@my-domain.se>
Co-authored-by: The Hatsune Daishi <nao20010128@gmail.com>
Co-authored-by: tsia <github@tsia.de>
Co-authored-by: 3risian <59593325+3risian@users.noreply.github.com>
Co-authored-by: Tristan Waddington <tristan.waddington@gmail.com>
Co-authored-by: Devon Meunier <devon.meunier@gmail.com>
Co-authored-by: Felix Stupp <felix.stupp@outlook.com>
Co-authored-by: tom <tomster954@gmail.com>
Co-authored-by: AndrewMBL <62922222+AndrewMBL@users.noreply.github.com>
Co-authored-by: willbeaufoy <will@willbeaufoy.net>
Co-authored-by: Philipp Stehle <anderschwiedu@googlemail.com>
Co-authored-by: hh0rva1h <61889859+hh0rva1h@users.noreply.github.com>
Co-authored-by: comsomisha <shmelev1996@mail.ru>
Co-authored-by: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com>
Co-authored-by: Juan Francisco Cantero Hurtado <iam@juanfra.info>
Co-authored-by: Dave Loyall <dave@the-good-guys.net>
Co-authored-by: tlsssl <63866177+tlsssl@users.noreply.github.com>
Co-authored-by: Rob <ankenyr@gmail.com>
Co-authored-by: Michael Klein <github@a98shuttle.de>
Co-authored-by: JordanWeatherby <47519158+JordanWeatherby@users.noreply.github.com>
Co-authored-by: striker.sh <19488257+strikersh@users.noreply.github.com>
Co-authored-by: Matej Dujava <mdujava@gmail.com>
Co-authored-by: Glenn Slayden <5589855+glenn-slayden@users.noreply.github.com>
Co-authored-by: MRWITEK <mrvvitek@gmail.com>
Co-authored-by: JChris246 <43832407+JChris246@users.noreply.github.com>
Co-authored-by: TheRealDude2 <the.real.dude@gmx.de>
2020-08-25 16:53:34 +02:00
|
|
|
'playlist_mincount': 50,
|
2015-12-24 15:44:49 +01:00
|
|
|
}, {
|
2017-01-04 22:05:27 +01:00
|
|
|
'url': 'https://www.zdf.de/filme/taunuskrimi/',
|
2015-12-24 15:44:49 +01:00
|
|
|
'only_matching': True,
|
|
|
|
}]
|
2017-01-04 22:05:27 +01:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def suitable(cls, url):
|
|
|
|
return False if ZDFIE.suitable(url) else super(ZDFChannelIE, cls).suitable(url)
|
2014-12-11 17:07:59 +01:00
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
channel_id = self._match_id(url)
|
2014-12-10 17:29:03 +01:00
|
|
|
|
2017-01-04 22:05:27 +01:00
|
|
|
webpage = self._download_webpage(url, channel_id)
|
|
|
|
|
|
|
|
entries = [
|
|
|
|
self.url_result(item_url, ie=ZDFIE.ie_key())
|
|
|
|
for item_url in orderedSet(re.findall(
|
|
|
|
r'data-plusbar-url=["\'](http.+?\.html)', webpage))]
|
|
|
|
|
|
|
|
return self.playlist_result(
|
|
|
|
entries, channel_id, self._og_search_title(webpage, fatal=False))
|
|
|
|
|
2017-01-02 13:08:07 +01:00
|
|
|
r"""
|
2017-01-04 22:05:27 +01:00
|
|
|
player = self._extract_player(webpage, channel_id)
|
|
|
|
|
|
|
|
channel_id = self._search_regex(
|
|
|
|
r'docId\s*:\s*(["\'])(?P<id>(?!\1).+?)\1', webpage,
|
|
|
|
'channel id', group='id')
|
|
|
|
|
|
|
|
channel = self._call_api(
|
|
|
|
'https://api.zdf.de/content/documents/%s.json' % channel_id,
|
|
|
|
player, url, channel_id)
|
|
|
|
|
|
|
|
items = []
|
|
|
|
for module in channel['module']:
|
|
|
|
for teaser in try_get(module, lambda x: x['teaser'], list) or []:
|
|
|
|
t = try_get(
|
|
|
|
teaser, lambda x: x['http://zdf.de/rels/target'], dict)
|
|
|
|
if not t:
|
|
|
|
continue
|
|
|
|
items.extend(try_get(
|
|
|
|
t,
|
|
|
|
lambda x: x['resultsWithVideo']['http://zdf.de/rels/search/results'],
|
|
|
|
list) or [])
|
|
|
|
items.extend(try_get(
|
|
|
|
module,
|
|
|
|
lambda x: x['filterRef']['resultsWithVideo']['http://zdf.de/rels/search/results'],
|
|
|
|
list) or [])
|
|
|
|
|
|
|
|
entries = []
|
|
|
|
entry_urls = set()
|
|
|
|
for item in items:
|
|
|
|
t = try_get(item, lambda x: x['http://zdf.de/rels/target'], dict)
|
|
|
|
if not t:
|
|
|
|
continue
|
|
|
|
sharing_url = t.get('http://zdf.de/rels/sharing-url')
|
|
|
|
if not sharing_url or not isinstance(sharing_url, compat_str):
|
|
|
|
continue
|
|
|
|
if sharing_url in entry_urls:
|
|
|
|
continue
|
|
|
|
entry_urls.add(sharing_url)
|
|
|
|
entries.append(self.url_result(
|
|
|
|
sharing_url, ie=ZDFIE.ie_key(), video_id=t.get('id')))
|
|
|
|
|
|
|
|
return self.playlist_result(entries, channel_id, channel.get('title'))
|
|
|
|
"""
|