From 8277abfc42eccb56d92641e3f754262c2e506b08 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 20:35:07 +0100 Subject: [PATCH 01/10] [servus] url fix --- youtube_dl/extractor/servus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index e579d42cf..53fa024d4 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -7,7 +7,8 @@ from .common import InfoExtractor class ServusIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?servus\.com/(?:(?:at|de)/p/[^/]+|tv/videos)/(?P[aA]{2}-\w+|\d+-\d+)' + _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' + _TESTS = [{ 'url': 'https://www.servus.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', From 4d66696d77e0b0afccf9933a32f0fee27e4a6f5b Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 21:40:46 +0100 Subject: [PATCH 02/10] [servus] fix test --- youtube_dl/extractor/servus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index 53fa024d4..ec14a1dec 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -10,7 +10,7 @@ class ServusIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' _TESTS = [{ - 'url': 'https://www.servus.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', + 'url': 'https://www.servustv.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', 'info_dict': { 'id': 'AA-1T6VBU5PW1W12', From cc8fbe3ec807027e296de0cbe8213219351e79a5 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 23:45:42 +0100 Subject: [PATCH 03/10] [servus] --- youtube_dl/extractor/servus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index ec14a1dec..f0cdcdeea 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -20,13 +20,13 @@ class ServusIE(InfoExtractor): 'thumbnail': r're:^https?://.*\.jpg', } }, { - 'url': 'https://www.servus.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', + 'url': 'https://www.servustv.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', 'only_matching': True, }, { - 'url': 'https://www.servus.com/tv/videos/aa-1t6vbu5pw1w12/', + 'url': 'https://www.servustv.com/tv/videos/aa-1t6vbu5pw1w12/', 'only_matching': True, }, { - 'url': 'https://www.servus.com/tv/videos/1380889096408-1235196658/', + 'url': 'https://www.servustv.com/tv/videos/1380889096408-1235196658/', 'only_matching': True, }] From 08db49084034ae33540e72cc6a581ea55493550f Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 1 Jan 2020 09:37:51 +0100 Subject: [PATCH 04/10] [servus] --- youtube_dl/extractor/servus.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index f0cdcdeea..d44c0f6e3 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -8,7 +8,6 @@ from .common import InfoExtractor class ServusIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' - _TESTS = [{ 'url': 'https://www.servustv.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', From e401bdf1017a536e4e824b7644e1b427d2e944b1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 20:35:07 +0100 Subject: [PATCH 05/10] [servus] url fix --- youtube_dl/extractor/servus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index e579d42cf..53fa024d4 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -7,7 +7,8 @@ from .common import InfoExtractor class ServusIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?servus\.com/(?:(?:at|de)/p/[^/]+|tv/videos)/(?P[aA]{2}-\w+|\d+-\d+)' + _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' + _TESTS = [{ 'url': 'https://www.servus.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', From d2fb29479b99128e2f811857cf3615ce095181df Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 21:40:46 +0100 Subject: [PATCH 06/10] [servus] fix test --- youtube_dl/extractor/servus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index 53fa024d4..ec14a1dec 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -10,7 +10,7 @@ class ServusIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' _TESTS = [{ - 'url': 'https://www.servus.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', + 'url': 'https://www.servustv.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', 'info_dict': { 'id': 'AA-1T6VBU5PW1W12', From 700c6553b52449bc0c3a30ea0c4e8f3abf2c0238 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 31 Dec 2019 23:45:42 +0100 Subject: [PATCH 07/10] [servus] --- youtube_dl/extractor/servus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index ec14a1dec..f0cdcdeea 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -20,13 +20,13 @@ class ServusIE(InfoExtractor): 'thumbnail': r're:^https?://.*\.jpg', } }, { - 'url': 'https://www.servus.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', + 'url': 'https://www.servustv.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', 'only_matching': True, }, { - 'url': 'https://www.servus.com/tv/videos/aa-1t6vbu5pw1w12/', + 'url': 'https://www.servustv.com/tv/videos/aa-1t6vbu5pw1w12/', 'only_matching': True, }, { - 'url': 'https://www.servus.com/tv/videos/1380889096408-1235196658/', + 'url': 'https://www.servustv.com/tv/videos/1380889096408-1235196658/', 'only_matching': True, }] From 9b84545f67f301429a619628d2bc7fb08262c639 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 1 Jan 2020 09:37:51 +0100 Subject: [PATCH 08/10] [servus] --- youtube_dl/extractor/servus.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index f0cdcdeea..d44c0f6e3 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -8,7 +8,6 @@ from .common import InfoExtractor class ServusIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?servus(tv)?\.com/(?:(?:at|de)/p/[^/]+|videos)/(?P[aA]{2}-\w+|\d+-\d+)' - _TESTS = [{ 'url': 'https://www.servustv.com/de/p/Die-Gr%C3%BCnen-aus-Sicht-des-Volkes/AA-1T6VBU5PW1W12/', 'md5': '3e1dd16775aa8d5cbef23628cfffc1f4', From 4fa0a419e05a5f1f15ccb00ac2f43d7fe1afb7d6 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 1 Jan 2020 10:32:44 +0100 Subject: [PATCH 09/10] [servus] remove duplicate test --- youtube_dl/extractor/servus.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index d44c0f6e3..741957705 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -21,9 +21,6 @@ class ServusIE(InfoExtractor): }, { 'url': 'https://www.servustv.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', 'only_matching': True, - }, { - 'url': 'https://www.servustv.com/tv/videos/aa-1t6vbu5pw1w12/', - 'only_matching': True, }, { 'url': 'https://www.servustv.com/tv/videos/1380889096408-1235196658/', 'only_matching': True, From ee6abfe662276de9fdab41923e67148e97e89ef8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 1 Jan 2020 10:47:05 +0100 Subject: [PATCH 10/10] [servus] remove unused test --- youtube_dl/extractor/servus.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index 741957705..660b27e6f 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -21,9 +21,6 @@ class ServusIE(InfoExtractor): }, { 'url': 'https://www.servustv.com/at/p/Wie-das-Leben-beginnt/1309984137314-381415152/', 'only_matching': True, - }, { - 'url': 'https://www.servustv.com/tv/videos/1380889096408-1235196658/', - 'only_matching': True, }] def _real_extract(self, url):