From 12539cb85b9289d4e4b8d6ad462ec99b2a4d1c94 Mon Sep 17 00:00:00 2001 From: Bastian Kern Date: Sun, 14 Mar 2021 14:16:53 +0100 Subject: [PATCH 1/4] Add language to media url --- youtube_dl/extractor/mtv.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index f5e30d22d..93c9dc5ac 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -140,6 +140,9 @@ class MTVServicesInfoExtractor(InfoExtractor): mediagen_url += '&' if '?' in mediagen_url else '?' mediagen_url += 'acceptMethods=' mediagen_url += 'hls' if use_hls else 'fms' + if (self._LANG): + mediagen_url += '&' if '?' in mediagen_url else '?' + mediagen_url += 'lang='+ self._LANG mediagen_doc = self._download_xml( mediagen_url, video_id, 'Downloading video urls', fatal=False) From eb22346541195dcff0e7673d8c4887eac7d006e7 Mon Sep 17 00:00:00 2001 From: Bastian Kern Date: Sun, 14 Mar 2021 14:42:21 +0100 Subject: [PATCH 2/4] Repair extractors for southpark.de --- youtube_dl/extractor/extractors.py | 1 + youtube_dl/extractor/southpark.py | 83 +++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 07a8af055..cdef01358 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1113,6 +1113,7 @@ from .soundgasm import ( from .southpark import ( SouthParkIE, SouthParkDeIE, + SouthParkDeEnIE, SouthParkDkIE, SouthParkEsIE, SouthParkNlIE diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index 0774da06e..e6f84d21c 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -54,42 +54,75 @@ class SouthParkEsIE(SouthParkIE): }] -class SouthParkDeIE(SouthParkIE): +class SouthParkDeIE(MTVServicesInfoExtractor): IE_NAME = 'southpark.de' - _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/(?:clips|alle-episoden|collections)/(?P.+?)(\?|#|$))' - _FEED_URL = 'http://www.southpark.de/feeds/video-player/mrss/' + _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/(?:videoclip|folgen|)/(?P.+?)(\?|#|$))' + _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/intl-mrss-player-feed' + _LANG = 'de' _TESTS = [{ - 'url': 'http://www.southpark.de/clips/uygssh/the-government-wont-respect-my-privacy#tab=featured', + # clip + 'url': 'https://www.southpark.de/videoclip/ct46op/south-park-zahnfee-cartman', 'info_dict': { - 'id': '85487c96-b3b9-4e39-9127-ad88583d9bf2', + 'id': 'e99d45ea-ed00-11e0-aca6-0026b9414f30', 'ext': 'mp4', - 'title': 'South Park|The Government Won\'t Respect My Privacy', - 'description': 'Cartman explains the benefits of "Shitter" to Stan, Kyle and Craig.', - 'timestamp': 1380160800, - 'upload_date': '20130926', + 'title': 'Zahnfee Cartman', + 'description': 'Cartman verkleidet sich als Zahnfee, um Butters unter dem Kissen liegenden Zahn zu stehlen. Cartman bekommt 4$ für diesen Zahn, was das Streben nach mehr Zähnen nährt' }, }, { - # non-ASCII characters in initial URL - 'url': 'http://www.southpark.de/alle-episoden/s18e09-hashtag-aufwärmen', + # episode + 'url': 'https://www.southpark.de/folgen/242csn/south-park-her-mit-dem-hirn-staffel-1-ep-7', 'info_dict': { - 'title': 'Hashtag „Aufwärmen“', - 'description': 'Kyle will mit seinem kleinen Bruder Ike Videospiele spielen. Als der nicht mehr mit ihm spielen will, hat Kyle Angst, dass er die Kids von heute nicht mehr versteht.', + 'id': '607115f3-496f-40c3-8647-2b0bcff486c0', + 'ext': 'mp4', + 'title': 'South Park | Pink Eye | E 0107 | HDSS0107X deu | Version: 634312 | Comedy Central S1', }, - 'playlist_count': 3, - }, { - # non-ASCII characters in redirect URL - 'url': 'http://www.southpark.de/alle-episoden/s18e09', - 'info_dict': { - 'title': 'Hashtag „Aufwärmen“', - 'description': 'Kyle will mit seinem kleinen Bruder Ike Videospiele spielen. Als der nicht mehr mit ihm spielen will, hat Kyle Angst, dass er die Kids von heute nicht mehr versteht.', - }, - 'playlist_count': 3, - }, { - 'url': 'http://www.southpark.de/collections/2476/superhero-showdown/1', - 'only_matching': True, }] + def _get_feed_query(self, uri): + return { + 'accountOverride': 'intl.mtvi.com', + 'arcEp': 'shared.southpark.gsa.de', + 'ep': '50c78199', + 'imageEp': 'shared.southpark.gsa.de', + 'clusterName' : 'EMEAA', + 'mgid': uri, + } + +class SouthParkDeEnIE(SouthParkIE): + IE_NAME = 'southpark.de:en' + _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/en/(?:video-clips|episodes|collections)/(?P.+?)(\?|#|$))' + _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/intl-mrss-player-feed' + + _TESTS = [{ + # clip + 'url': 'https://www.southpark.de/en/video-clips/ct46op/south-park-tooth-fairy-cartman', + 'info_dict': { + 'id': 'e99d45ea-ed00-11e0-aca6-0026b9414f30', + 'ext': 'mp4', + 'title': 'Tooth Fairy Cartman', + 'description': 'Cartman dresses up as the Tooth Fairy to steal Butters\' tooth from underneath his pillow. Cartman gets $4 for this tooth, feeding the drive for more teeth.', + }, + }, { + # episode + 'url': 'https://www.southpark.de/en/episodes/yy0vjs/south-park-the-pandemic-special-season-24-ep-1', + 'info_dict': { + 'id': 'f5fbd823-04bc-11eb-9b1b-0e40cf2fc285', + 'ext': 'mp4', + 'title': 'South Park', + 'description': 'Randy comes to terms with his role in the COVID-19 outbreak as the on-going pandemic presents continued challenges to the citizens of South Park.', + }, + }] + + def _get_feed_query(self, uri): + return { + 'accountOverride': 'intl.mtvi.com', + 'arcEp': 'shared.southpark.gsa.en', + 'ep': '20476225', + 'imageEp': 'shared.southpark.gsa.en', + 'clusterName' : 'EMEAA', + 'mgid': uri, + } class SouthParkNlIE(SouthParkIE): IE_NAME = 'southpark.nl' From 5e2839725fe33e586887db8486faa7425c722348 Mon Sep 17 00:00:00 2001 From: Bastian Kern Date: Sun, 14 Mar 2021 15:02:31 +0100 Subject: [PATCH 3/4] Add collections to southpark.de extractor --- youtube_dl/extractor/southpark.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index e6f84d21c..20fe634ee 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -56,7 +56,7 @@ class SouthParkEsIE(SouthParkIE): class SouthParkDeIE(MTVServicesInfoExtractor): IE_NAME = 'southpark.de' - _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/(?:videoclip|folgen|)/(?P.+?)(\?|#|$))' + _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/(?:videoclip|folgen|collections)/(?P.+?)(\?|#|$))' _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/intl-mrss-player-feed' _LANG = 'de' From 67d578b0761b2b8b2ae1acbc445191b551c4e6ef Mon Sep 17 00:00:00 2001 From: Bastian Kern Date: Sun, 14 Mar 2021 15:07:26 +0100 Subject: [PATCH 4/4] [southpark_de] Clean-up coding style --- youtube_dl/extractor/mtv.py | 2 +- youtube_dl/extractor/southpark.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index 93c9dc5ac..06290e49a 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -142,7 +142,7 @@ class MTVServicesInfoExtractor(InfoExtractor): mediagen_url += 'hls' if use_hls else 'fms' if (self._LANG): mediagen_url += '&' if '?' in mediagen_url else '?' - mediagen_url += 'lang='+ self._LANG + mediagen_url += 'lang=' + self._LANG mediagen_doc = self._download_xml( mediagen_url, video_id, 'Downloading video urls', fatal=False) diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index 20fe634ee..2d86588d7 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -85,10 +85,11 @@ class SouthParkDeIE(MTVServicesInfoExtractor): 'arcEp': 'shared.southpark.gsa.de', 'ep': '50c78199', 'imageEp': 'shared.southpark.gsa.de', - 'clusterName' : 'EMEAA', + 'clusterName': 'EMEAA', 'mgid': uri, } + class SouthParkDeEnIE(SouthParkIE): IE_NAME = 'southpark.de:en' _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.de/en/(?:video-clips|episodes|collections)/(?P.+?)(\?|#|$))' @@ -120,10 +121,11 @@ class SouthParkDeEnIE(SouthParkIE): 'arcEp': 'shared.southpark.gsa.en', 'ep': '20476225', 'imageEp': 'shared.southpark.gsa.en', - 'clusterName' : 'EMEAA', + 'clusterName': 'EMEAA', 'mgid': uri, } + class SouthParkNlIE(SouthParkIE): IE_NAME = 'southpark.nl' _VALID_URL = r'https?://(?:www\.)?(?Psouthpark\.nl/(?:clips|(?:full-)?episodes|collections)/(?P.+?)(\?|#|$))'