summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2021-03-14 09:26:54 +0700
committerSergey M․ <dstftw@gmail.com>2021-03-14 09:26:54 +0700
commit1860d0f41cf50b1a0876174c4e1ee7adbbd4a0f3 (patch)
treeba85fa69ce58110762384b9b7c6d207270b0c70d
parent60845121ca2f49172e7cd941c0cb43363cb86e46 (diff)
downloadyoutube-dl-1860d0f41cf50b1a0876174c4e1ee7adbbd4a0f3.tar.gz
youtube-dl-1860d0f41cf50b1a0876174c4e1ee7adbbd4a0f3.tar.xz
youtube-dl-1860d0f41cf50b1a0876174c4e1ee7adbbd4a0f3.zip
[southpark] Fix extraction and add support for southparkstudios.com (closes #26763, closes #28413)
-rw-r--r--youtube_dl/extractor/southpark.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py
index da75a43a7..0774da06e 100644
--- a/youtube_dl/extractor/southpark.py
+++ b/youtube_dl/extractor/southpark.py
@@ -6,9 +6,9 @@ from .mtv import MTVServicesInfoExtractor
 
 class SouthParkIE(MTVServicesInfoExtractor):
     IE_NAME = 'southpark.cc.com'
-    _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.cc\.com/(?:clips|(?:full-)?episodes|collections)/(?P<id>.+?)(\?|#|$))'
+    _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark(?:\.cc|studios)\.com/(?:clips|(?:full-)?episodes|collections)/(?P<id>.+?)(\?|#|$))'
 
-    _FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss'
+    _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/intl-mrss-player-feed'
 
     _TESTS = [{
         'url': 'http://southpark.cc.com/clips/104437/bat-daded#tab=featured',
@@ -23,8 +23,20 @@ class SouthParkIE(MTVServicesInfoExtractor):
     }, {
         'url': 'http://southpark.cc.com/collections/7758/fan-favorites/1',
         'only_matching': True,
+    }, {
+        'url': 'https://www.southparkstudios.com/episodes/h4o269/south-park-stunning-and-brave-season-19-ep-1',
+        'only_matching': True,
     }]
 
+    def _get_feed_query(self, uri):
+        return {
+            'accountOverride': 'intl.mtvi.com',
+            'arcEp': 'shared.southpark.global',
+            'ep': '90877963',
+            'imageEp': 'shared.southpark.global',
+            'mgid': uri,
+        }
+
 
 class SouthParkEsIE(SouthParkIE):
     IE_NAME = 'southpark.cc.com:español'