From 181112c218115871aee992615d7db77f6ffa1db8 Mon Sep 17 00:00:00 2001 From: DataGhost Date: Fri, 27 May 2022 23:34:14 +0200 Subject: [PATCH 01/10] Fixed all recent videos downloading with .m3u8 extension --- youtube_dl/extractor/dumpert.py | 1 + 1 file changed, 1 insertion(+) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index d9d9afdec..a73cd85a9 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -50,6 +50,7 @@ class DumpertIE(InfoExtractor): 'url': uri, 'format_id': version, 'quality': quality(version), + 'ext': 'mp4', }) self._sort_formats(formats) From d5e9a95cce6588679ca201b2f98352f2ccac8545 Mon Sep 17 00:00:00 2001 From: DataGhost Date: Sat, 28 May 2022 00:20:39 +0200 Subject: [PATCH 02/10] Added test case for 'm3u8-video' --- youtube_dl/extractor/dumpert.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index a73cd85a9..c2414e65b 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -29,6 +29,16 @@ class DumpertIE(InfoExtractor): }, { 'url': 'http://legacy.dumpert.nl/embed/6675421/dc440fe7', 'only_matching': True, + }, { + 'url': 'https://www.dumpert.nl/item/100031688_b317a185', + 'md5': '98bece7add22c2645eb3906e6d55318b', + 'info_dict': { + 'id': '100031688/b317a185', + 'ext': 'mp4', + 'title': 'Epic schijnbeweging', + 'description': '

Die zag je niet eh

', + 'thumbnail': r're:^https?://.*\.(?:jpg|png)$', + }, }] def _real_extract(self, url): From bb4d3baa6759247f5ae374505cc96dd00b5da44b Mon Sep 17 00:00:00 2001 From: DataGhost Date: Sat, 28 May 2022 00:21:29 +0200 Subject: [PATCH 03/10] Updated URL regex and tests to include new URLs valid since the new site layout --- youtube_dl/extractor/dumpert.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index c2414e65b..4eebcdc23 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -9,7 +9,7 @@ from ..utils import ( class DumpertIE(InfoExtractor): - _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl/(?:mediabase|embed|item)/(?P[0-9]+[/_][0-9a-zA-Z]+)' + _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:/(?:mediabase|embed|item)/|(?:/toppers|/latest|/?)\?selectedId=)(?P[0-9]+[/_][0-9a-zA-Z]+)' _TESTS = [{ 'url': 'https://www.dumpert.nl/item/6646981_951bc60f', 'md5': '1b9318d7d5054e7dcb9dc7654f21d643', @@ -39,6 +39,15 @@ class DumpertIE(InfoExtractor): 'description': '

Die zag je niet eh

', 'thumbnail': r're:^https?://.*\.(?:jpg|png)$', }, + }, { + 'url': 'https://www.dumpert.nl/toppers?selectedId=100031688_b317a185', + 'only_matching': True, + }, { + 'url': 'https://www.dumpert.nl/latest?selectedId=100031688_b317a185', + 'only_matching': True, + }, { + 'url': 'https://www.dumpert.nl/?selectedId=100031688_b317a185', + 'only_matching': True, }] def _real_extract(self, url): From 71e630eebfcab3962dbf8523af9dc2628ab8119d Mon Sep 17 00:00:00 2001 From: DataGhost Date: Mon, 30 May 2022 11:39:50 +0200 Subject: [PATCH 04/10] Changed m3u8 format handling --- youtube_dl/extractor/dumpert.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 4eebcdc23..4faf824c8 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( + determine_ext, int_or_none, qualities, ) @@ -65,12 +66,17 @@ class DumpertIE(InfoExtractor): if not uri: continue version = variant.get('version') - formats.append({ - 'url': uri, - 'format_id': version, - 'quality': quality(version), - 'ext': 'mp4', - }) + ext = determine_ext(uri) + if ext == 'm3u8': + formats.extend(self._extract_m3u8_formats( + uri, video_id, ext='mp4', m3u8_id=format_id)) + else: + formats.append({ + 'url': uri, + 'format_id': version, + }) + for format in formats: + format['quality'] = quality(format['format_id']) self._sort_formats(formats) thumbnails = [] From edfcc50a7c78a03feb8a99e6e38f5396441ea165 Mon Sep 17 00:00:00 2001 From: DataGhost Date: Mon, 30 May 2022 11:40:10 +0200 Subject: [PATCH 05/10] Added 1080p format to qualities --- youtube_dl/extractor/dumpert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 4faf824c8..ea92602a8 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -59,7 +59,7 @@ class DumpertIE(InfoExtractor): title = item['title'] media = next(m for m in item['media'] if m.get('mediatype') == 'VIDEO') - quality = qualities(['flv', 'mobile', 'tablet', '720p']) + quality = qualities(['flv', 'mobile', 'tablet', '720p', '1080p']) formats = [] for variant in media.get('variants', []): uri = variant.get('uri') From 7784d3c37ecb20b3aff157878b1a6c758b4529ac Mon Sep 17 00:00:00 2001 From: DataGhost Date: Mon, 30 May 2022 11:46:41 +0200 Subject: [PATCH 06/10] Fixed wrong variable name that shouldn't have been there --- youtube_dl/extractor/dumpert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index ea92602a8..6f49b3d15 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -69,7 +69,7 @@ class DumpertIE(InfoExtractor): ext = determine_ext(uri) if ext == 'm3u8': formats.extend(self._extract_m3u8_formats( - uri, video_id, ext='mp4', m3u8_id=format_id)) + uri, video_id, ext='mp4', m3u8_id=version)) else: formats.append({ 'url': uri, From 60bbab10223b13de11c30f0437aaacc175132870 Mon Sep 17 00:00:00 2001 From: DataGhost Date: Mon, 30 May 2022 15:10:04 +0200 Subject: [PATCH 07/10] Changed quality parameter to preference to accodomate sorting the m3u8 streams --- youtube_dl/extractor/dumpert.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 6f49b3d15..7a42273ba 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -66,17 +66,17 @@ class DumpertIE(InfoExtractor): if not uri: continue version = variant.get('version') + preference = quality(version) ext = determine_ext(uri) if ext == 'm3u8': formats.extend(self._extract_m3u8_formats( - uri, video_id, ext='mp4', m3u8_id=version)) + uri, video_id, ext='mp4', preference=preference)) else: formats.append({ 'url': uri, 'format_id': version, + 'preference': preference, }) - for format in formats: - format['quality'] = quality(format['format_id']) self._sort_formats(formats) thumbnails = [] From a7de6d54ede320999aa69d199ce3c7882edca27d Mon Sep 17 00:00:00 2001 From: DataGhost Date: Mon, 30 May 2022 15:39:32 +0200 Subject: [PATCH 08/10] Changed to m3u8_native entry protocol and adjusted md5 accordingly --- youtube_dl/extractor/dumpert.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 7a42273ba..9b8735d75 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -32,7 +32,7 @@ class DumpertIE(InfoExtractor): 'only_matching': True, }, { 'url': 'https://www.dumpert.nl/item/100031688_b317a185', - 'md5': '98bece7add22c2645eb3906e6d55318b', + 'md5': '34a0c10c91d281141b959b27ee862b8f', 'info_dict': { 'id': '100031688/b317a185', 'ext': 'mp4', @@ -70,7 +70,8 @@ class DumpertIE(InfoExtractor): ext = determine_ext(uri) if ext == 'm3u8': formats.extend(self._extract_m3u8_formats( - uri, video_id, ext='mp4', preference=preference)) + uri, video_id, ext='mp4', entry_protocol='m3u8_native', + preference=preference)) else: formats.append({ 'url': uri, From ca23ea311f020f4dd2ae91a5cf8bc3785f9f57e2 Mon Sep 17 00:00:00 2001 From: dirkf Date: Thu, 26 Jan 2023 17:09:06 +0000 Subject: [PATCH 09/10] Update URL pattern Force CI tests --- youtube_dl/extractor/dumpert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 9b8735d75..2e850f994 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -10,7 +10,7 @@ from ..utils import ( class DumpertIE(InfoExtractor): - _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:/(?:mediabase|embed|item)/|(?:/toppers|/latest|/?)\?selectedId=)(?P[0-9]+[/_][0-9a-zA-Z]+)' + _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:/(?:mediabase|embed|item)/|(?:/toppers|/latest)?/?)\?selectedId=)(?P[0-9]+[/_][0-9a-zA-Z]+)' _TESTS = [{ 'url': 'https://www.dumpert.nl/item/6646981_951bc60f', 'md5': '1b9318d7d5054e7dcb9dc7654f21d643', From a712000b9b18c0530168e5549199c61560db99b3 Mon Sep 17 00:00:00 2001 From: dirkf Date: Thu, 26 Jan 2023 17:12:21 +0000 Subject: [PATCH 10/10] Oh come on! --- youtube_dl/extractor/dumpert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index 2e850f994..9d97ff4a1 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -10,7 +10,7 @@ from ..utils import ( class DumpertIE(InfoExtractor): - _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:/(?:mediabase|embed|item)/|(?:/toppers|/latest)?/?)\?selectedId=)(?P[0-9]+[/_][0-9a-zA-Z]+)' + _VALID_URL = r'(?Phttps?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:/(?:mediabase|embed|item)/|(?:/toppers|/latest)?/?\?selectedId=)(?P[0-9]+[/_][0-9a-zA-Z]+)' _TESTS = [{ 'url': 'https://www.dumpert.nl/item/6646981_951bc60f', 'md5': '1b9318d7d5054e7dcb9dc7654f21d643',