Merge 6f271423e8 into 176fc2cb00

[YouTube] Avoid early crash if webpage can't be read
* see issue #33013
2025-01-27 13:50:11 +09:00 · 2024-12-31 18:36:36 +01:00 · 2024-12-31 14:51:29 +00:00 · 2024-10-20 14:38:03 +02:00 · 2024-10-20 13:41:53 +02:00 · 2024-10-20 12:37:48 +02:00
3 changed files with 323 additions and 704 deletions
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@ -848,14 +848,13 @@ from .nowness import (
 from .noz import NozIE
 from .npo import (
    AndereTijdenIE,
+    BNNVaraIE,
    NPOIE,
-    NPOLiveIE,
-    NPORadioIE,
-    NPORadioFragmentIE,
+    ONIE,
    SchoolTVIE,
    HetKlokhuisIE,
    VPROIE,
-    WNLIE,
+    ZAPPIE,
 )
 from .npr import NprIE
 from .nrk import (
--- a/youtube_dl/extractor/npo.py
+++ b/youtube_dl/extractor/npo.py
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@ -1951,7 +1951,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
            pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}

            player_url = self._extract_player_url(webpage)
-            ytcfg = self._extract_ytcfg(video_id, webpage)
+            ytcfg = self._extract_ytcfg(video_id, webpage or '')
            sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)
            if sts:
                pb_context['signatureTimestamp'] = sts
Author	SHA1	Message	Date
Bart Broere	a110d8ea33	Merge `6f271423e8` into `176fc2cb00`	2024-12-31 18:36:36 +01:00
dirkf	176fc2cb00	[YouTube] Avoid early crash if webpage can't be read * see issue #33013	2024-12-31 14:51:29 +00:00
Bart Broere	6f271423e8	Update tests	2024-10-20 14:38:03 +02:00
Bart Broere	75266ce4ed	Fix old metadata reference	2024-10-20 13:41:53 +02:00
Bart Broere	817e2e5938	Fix some missing imports	2024-10-20 12:37:48 +02:00
Bart Broere	0e1a0cfa03	Apply some more PR feedback	2024-10-20 12:28:10 +02:00
Bart Broere	7f1c09bea1	Use _sort_formats util	2024-10-20 12:11:30 +02:00
Bart Broere	c3026dd70c	Apply suggestion from PR	2024-10-20 12:08:50 +02:00
Bart Broere	41157b2b49	Move GraphQL query into separate variable	2024-10-20 12:00:44 +02:00
Bart Broere	c748eca829	Automatically obtain NextJS buildId and change item to video-item	2024-10-20 11:49:09 +02:00
Bart Broere	6de650f51f	Use traverse_obj in another place as well	2024-09-21 20:08:53 +00:00
Bart Broere	bf91db4846	Use suggested util	2024-09-21 20:04:50 +00:00
Bart Broere	ad6ee6fdd2	Commit two suggestions from the PR Co-authored-by: dirkf <fieldhouse@gmx.net>	2024-09-21 21:58:53 +02:00
Bart Broere	179c8b06b6	Merge branch 'ytdl-org:master' into fix-npo-support	2024-09-11 19:17:00 +02:00
Bart Broere	a60972e253	Fix indent from suggestion	2024-03-15 13:02:56 +01:00
Bart Broere	007bbeacd7	Remove afspelen and trailing slashes with one regex Co-authored-by: dirkf <fieldhouse@gmx.net>	2024-03-14 13:41:01 +01:00
Bart Broere	4c90b2f587	Adhere to code style Co-authored-by: dirkf <fieldhouse@gmx.net>	2024-03-14 13:39:59 +01:00
Bart Broere	bc86c5f73b	Make regex more specific and remove redundant .*	2024-03-14 13:37:41 +01:00
Bart Broere	ad64f3751e	Improve regex Co-authored-by: Roy <git@rvsit.nl>	2024-03-14 13:34:33 +01:00
Bart Broere	d4250c8703	Merge branch 'ytdl-org:master' into fix-npo-support	2024-03-12 20:46:16 +01:00
Bart Broere	58d7a00e3f	Resolve some of the pull request feedback	2024-03-11 14:14:38 +01:00
Bart Broere	4398f6832f	Fix zapp extractor	2024-03-11 13:40:23 +01:00
Bart Broere	1ca4e686a3	Add an MD5	2024-03-10 17:04:00 +01:00
Bart Broere	28624cfe09	Work work	2024-03-10 16:57:31 +01:00
Bart Broere	c08f29f45b	Update unit tests	2024-03-10 16:27:40 +01:00
Bart Broere	0ab79c37ae	Reusable code for two NTR sites	2024-03-07 16:23:09 +01:00
Bart Broere	0cbcd1aec6	Make diff better	2024-03-06 12:55:51 +01:00
Bart Broere	159f825edd	Add scaffolding for last few extractors and change order so the PR diff looks nice	2024-03-06 12:53:37 +01:00
Bart Broere	681b39032a	Fix flake8 and better error reporting	2024-03-06 12:32:34 +01:00
Bart Broere	4b24e5f00d	Re-add SchoolTV	2024-03-06 12:22:27 +01:00
Bart Broere	3b3d73cbe6	Use program-detail endpoint and remove a test	2024-03-06 11:52:08 +01:00
Bart Broere	d426a92a60	Encoding suggestion from PR	2024-03-05 14:11:49 +01:00
Bart Broere	d36d50fe5c	Re-add Zapp	2024-03-05 14:04:03 +01:00
Bart Broere	eb6e396bfb	First version of a VPRO regex	2024-03-05 13:55:59 +01:00
Bart Broere	28ba01f1cc	Add Ongehoord Nederland and test URL for BNNVARA	2024-03-05 13:43:56 +01:00
Bart Broere	4fc423845e	Fix lint	2024-03-05 12:49:22 +01:00
Bart Broere	34b5b20107	Refactor into reusable method	2024-03-03 17:47:15 +01:00
Bart Broere	8b1a7d9a7c	Use provided util	2024-03-01 16:23:19 +01:00
Bart Broere	f9e59b0c49	Add the possibility to add 'hls' later	2024-03-01 15:28:14 +01:00
Bart Broere	fb7b7179ff	Speculate about other ways of getting productId	2024-03-01 15:08:10 +01:00
Bart Broere	0dc7d954cb	Comply with coding conventions a bit more	2024-03-01 15:05:30 +01:00
Bart Broere	21eb4513e0	Convert the description into code	2024-03-01 14:12:51 +01:00
Bart Broere	29724e7b07	Delete all broken extractors Re-implementing these is quicker for the cases where that's even still possible	2024-03-01 13:24:48 +01:00
Bart Broere	577368116b	Fix token URL	2024-03-01 13:15:52 +01:00
Bart Broere	da3d1f4321	Add notes on new npo.nl site	2024-03-01 10:36:03 +01:00
Bart Broere	f76d58c71f	Skip a test	2024-02-26 13:18:36 +01:00
Bart Broere	c409a8c54b	Merge branch 'ytdl-org:master' into fix-npo-support	2024-02-25 09:42:26 +01:00
dirkf	0c7261db90	Update npo.py * simplify comment * force CI	2023-04-06 01:51:02 +01:00
Bart Broere	632897860b	Accept suggestions on PR; comply with conventions Co-authored-by: dirkf <fieldhouse@gmx.net>	2023-04-03 09:50:21 +02:00
Bart Broere	9e1acb2527	Fix flake8	2023-03-31 12:56:18 +02:00
Bart Broere	fb2b4e2894	Add line comment	2023-03-31 12:46:05 +02:00
Bart Broere	b4776f2e36	Import from compat	2023-03-31 12:39:11 +02:00
Bart Broere	3b31478dfd	Fix support for NPO downloads	2023-03-31 12:30:22 +02:00