From 7531713b473e48ca28adbfac0d3a3f2f9adf72eb Mon Sep 17 00:00:00 2001 From: Surya Oktafendri Date: Sat, 7 Apr 2018 11:26:28 +0700 Subject: [PATCH 1/3] [generic] Add Share-Videos.se embeds detection (Fixes #16089) --- youtube_dl/extractor/generic.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index cf64398e3..46de34e4c 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1967,6 +1967,16 @@ class GenericIE(InfoExtractor): 'params': { 'skip_download': True, }, + }, + { + 'url': 'http://share-videos.se/auto/video/83645793?uid=13', + 'md5': 'b68d276de422ab07ee1d49388103f457', + 'info_dict': { + 'id': '83645793', + 'title': 'Lock up and get excited', + 'thumbnail': r're:^https?://.*\.jpg(\?.*)?$', + 'ext': 'mp4' + } } # { # # TODO: find another test @@ -2978,6 +2988,14 @@ class GenericIE(InfoExtractor): merged[k] = v return merged + # Look for Share-Videos.se embeds + sharevideosse_urls = [m.group('url') for m in re.finditer( + r']+?src=(["\']+)(?Phttps?://embed\.share-videos\.se/auto/embed/[^"\']+)\1', + webpage)] + if sharevideosse_urls: + return self.playlist_from_matches( + sharevideosse_urls, video_id, video_title) + # Look for HTML5 media entries = self._parse_html5_media_entries(url, webpage, video_id, m3u8_id='hls') if entries: From 752bfbc1fa210ad7b1354adc5e055047fe699c47 Mon Sep 17 00:00:00 2001 From: Surya Oktafendri Date: Sat, 7 Apr 2018 22:52:42 +0700 Subject: [PATCH 2/3] [generic] Fix regex for share-videos.se embeds detection --- youtube_dl/extractor/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 46de34e4c..f81b3818f 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2990,7 +2990,7 @@ class GenericIE(InfoExtractor): # Look for Share-Videos.se embeds sharevideosse_urls = [m.group('url') for m in re.finditer( - r']+?src=(["\']+)(?Phttps?://embed\.share-videos\.se/auto/embed/[^"\']+)\1', + r']+?src\s*=\s*(["\'])(?Phttps?://embed\.share-videos\.se/auto/embed/\d+\?.+)\1', webpage)] if sharevideosse_urls: return self.playlist_from_matches( From 83f05714a0881cc7968547ec2c412c6b00dbc379 Mon Sep 17 00:00:00 2001 From: Surya Oktafendri Date: Sun, 8 Apr 2018 15:23:12 +0700 Subject: [PATCH 3/3] [generic] Non-greedy regex for share-videos.se embeds detection --- youtube_dl/extractor/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index f81b3818f..4b210da72 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2990,7 +2990,7 @@ class GenericIE(InfoExtractor): # Look for Share-Videos.se embeds sharevideosse_urls = [m.group('url') for m in re.finditer( - r']+?src\s*=\s*(["\'])(?Phttps?://embed\.share-videos\.se/auto/embed/\d+\?.+)\1', + r']+?src\s*=\s*(["\'])(?Phttps?://embed\.share-videos\.se/auto/embed/\d+.+?)\1', webpage)] if sharevideosse_urls: return self.playlist_from_matches(