projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bilibili] Fix video downloading (closes #13001)
[youtube-dl]
/
youtube_dl
/
extractor
/
southpark.py
diff --git
a/youtube_dl/extractor/southpark.py
b/youtube_dl/extractor/southpark.py
index a147f7db19a11c27df55f783f1faf965af8bf644..d8ce416fc7d1a9ec2e3561752890d916f2bcf93a 100644
(file)
--- a/
youtube_dl/extractor/southpark.py
+++ b/
youtube_dl/extractor/southpark.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
from .mtv import MTVServicesInfoExtractor
from __future__ import unicode_literals
from .mtv import MTVServicesInfoExtractor
@@
-6,7
+6,7
@@
from .mtv import MTVServicesInfoExtractor
class SouthParkIE(MTVServicesInfoExtractor):
IE_NAME = 'southpark.cc.com'
class SouthParkIE(MTVServicesInfoExtractor):
IE_NAME = 'southpark.cc.com'
- _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.cc\.com/(?:clips|
full-
episodes)/(?P<id>.+?)(\?|#|$))'
+ _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.cc\.com/(?:clips|
(?:full-)?
episodes)/(?P<id>.+?)(\?|#|$))'
_FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss'
_FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss'
@@
-35,6
+35,7
@@
class SouthParkEsIE(SouthParkIE):
'description': 'Cartman Consigue Una Sonda Anal',
},
'playlist_count': 4,
'description': 'Cartman Consigue Una Sonda Anal',
},
'playlist_count': 4,
+ 'skip': 'Geo-restricted',
}]
}]
@@
-74,7
+75,7
@@
class SouthParkDeIE(SouthParkIE):
class SouthParkNlIE(SouthParkIE):
IE_NAME = 'southpark.nl'
class SouthParkNlIE(SouthParkIE):
IE_NAME = 'southpark.nl'
- _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.nl/(?:clips|
full-
episodes)/(?P<id>.+?)(\?|#|$))'
+ _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.nl/(?:clips|
(?:full-)?
episodes)/(?P<id>.+?)(\?|#|$))'
_FEED_URL = 'http://www.southpark.nl/feeds/video-player/mrss/'
_TESTS = [{
_FEED_URL = 'http://www.southpark.nl/feeds/video-player/mrss/'
_TESTS = [{