aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--youtube_dl/extractor/nick.py1
-rw-r--r--youtube_dl/extractor/southpark.py34
-rw-r--r--youtube_dl/extractor/spike.py4
-rw-r--r--youtube_dl/extractor/tvland.py55
4 files changed, 44 insertions, 50 deletions
diff --git a/youtube_dl/extractor/nick.py b/youtube_dl/extractor/nick.py
index 4935002d0..9c54846e1 100644
--- a/youtube_dl/extractor/nick.py
+++ b/youtube_dl/extractor/nick.py
@@ -7,6 +7,7 @@ from ..utils import update_url_query
class NickIE(MTVServicesInfoExtractor):
+ # None of videos on the website are still alive?
IE_NAME = 'nick.com'
_VALID_URL = r'https?://(?:www\.)?nick(?:jr)?\.com/(?:videos/clip|[^/]+/videos)/(?P<id>[^/?#.]+)'
_FEED_URL = 'http://udat.mtvnservices.com/service1/dispatch.htm'
diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py
index 87b650468..a147f7db1 100644
--- a/youtube_dl/extractor/southpark.py
+++ b/youtube_dl/extractor/southpark.py
@@ -17,6 +17,8 @@ class SouthParkIE(MTVServicesInfoExtractor):
'ext': 'mp4',
'title': 'South Park|Bat Daded',
'description': 'Randy disqualifies South Park by getting into a fight with Bat Dad.',
+ 'timestamp': 1112760000,
+ 'upload_date': '20050406',
},
}]
@@ -28,6 +30,10 @@ class SouthParkEsIE(SouthParkIE):
_TESTS = [{
'url': 'http://southpark.cc.com/episodios-en-espanol/s01e01-cartman-consigue-una-sonda-anal#source=351c1323-0b96-402d-a8b9-40d01b2e9bde&position=1&sort=!airdate',
+ 'info_dict': {
+ 'title': 'Cartman Consigue Una Sonda Anal',
+ 'description': 'Cartman Consigue Una Sonda Anal',
+ },
'playlist_count': 4,
}]
@@ -42,17 +48,27 @@ class SouthParkDeIE(SouthParkIE):
'info_dict': {
'id': '85487c96-b3b9-4e39-9127-ad88583d9bf2',
'ext': 'mp4',
- 'title': 'The Government Won\'t Respect My Privacy',
+ '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',
},
}, {
# non-ASCII characters in initial URL
'url': 'http://www.southpark.de/alle-episoden/s18e09-hashtag-aufwärmen',
- 'playlist_count': 4,
+ '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,
}, {
# non-ASCII characters in redirect URL
'url': 'http://www.southpark.de/alle-episoden/s18e09',
- 'playlist_count': 4,
+ '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,
}]
@@ -63,7 +79,11 @@ class SouthParkNlIE(SouthParkIE):
_TESTS = [{
'url': 'http://www.southpark.nl/full-episodes/s18e06-freemium-isnt-free',
- 'playlist_count': 4,
+ 'info_dict': {
+ 'title': 'Freemium Isn\'t Free',
+ 'description': 'Stan is addicted to the new Terrance and Phillip mobile game.',
+ },
+ 'playlist_mincount': 3,
}]
@@ -74,5 +94,9 @@ class SouthParkDkIE(SouthParkIE):
_TESTS = [{
'url': 'http://www.southparkstudios.dk/full-episodes/s18e07-grounded-vindaloop',
- 'playlist_count': 4,
+ 'info_dict': {
+ 'title': 'Grounded Vindaloop',
+ 'description': 'Butters is convinced he\'s living in a virtual reality.',
+ },
+ 'playlist_mincount': 3,
}]
diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py
index 63ea7718b..218785ee4 100644
--- a/youtube_dl/extractor/spike.py
+++ b/youtube_dl/extractor/spike.py
@@ -11,8 +11,10 @@ class SpikeIE(MTVServicesInfoExtractor):
'info_dict': {
'id': 'b9c8221a-4e50-479a-b86d-3333323e38ba',
'ext': 'mp4',
- 'title': 'Auction Hunters|Can Allen Ride A Hundred Year-Old Motorcycle?',
+ 'title': 'Auction Hunters|December 27, 2013|4|414|Can Allen Ride A Hundred Year-Old Motorcycle?',
'description': 'md5:fbed7e82ed5fad493615b3094a9499cb',
+ 'timestamp': 1388120400,
+ 'upload_date': '20131227',
},
}, {
'url': 'http://www.spike.com/video-clips/lhtu8m/',
diff --git a/youtube_dl/extractor/tvland.py b/youtube_dl/extractor/tvland.py
index b73279dec..cb76a2a58 100644
--- a/youtube_dl/extractor/tvland.py
+++ b/youtube_dl/extractor/tvland.py
@@ -9,56 +9,23 @@ class TVLandIE(MTVServicesInfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tvland\.com/(?:video-clips|episodes)/(?P<id>[^/?#.]+)'
_FEED_URL = 'http://www.tvland.com/feeds/mrss/'
_TESTS = [{
+ # Geo-restricted. Without a proxy metadata are still there. With a
+ # proxy it redirects to http://m.tvland.com/app/
'url': 'http://www.tvland.com/episodes/hqhps2/everybody-loves-raymond-the-invasion-ep-048',
- 'playlist': [
- {
- 'md5': '227e9723b9669c05bf51098b10287aa7',
- 'info_dict': {
- 'id': 'bcbd3a83-3aca-4dca-809b-f78a87dcccdd',
- 'ext': 'mp4',
- 'title': 'Everybody Loves Raymond|Everybody Loves Raymond 048 HD, Part 1 of 5',
- }
- },
- {
- 'md5': '9fa2b764ec0e8194fb3ebb01a83df88b',
- 'info_dict': {
- 'id': 'f4279548-6e13-40dd-92e8-860d27289197',
- 'ext': 'mp4',
- 'title': 'Everybody Loves Raymond|Everybody Loves Raymond 048 HD, Part 2 of 5',
- }
- },
- {
- 'md5': 'fde4c3bccd7cc7e3576b338734153cec',
- 'info_dict': {
- 'id': '664e4a38-53ef-4115-9bc9-d0f789ec6334',
- 'ext': 'mp4',
- 'title': 'Everybody Loves Raymond|Everybody Loves Raymond 048 HD, Part 3 of 5',
- }
- },
- {
- 'md5': '247f6780cda6891f2e49b8ae2b10e017',
- 'info_dict': {
- 'id': '9146ecf5-b15a-4d78-879c-6679b77f4960',
- 'ext': 'mp4',
- 'title': 'Everybody Loves Raymond|Everybody Loves Raymond 048 HD, Part 4 of 5',
- }
- },
- {
- 'md5': 'fd269f33256e47bad5eb6c40de089ff6',
- 'info_dict': {
- 'id': '04334a2e-9a47-4214-a8c2-ae5792e2fab7',
- 'ext': 'mp4',
- 'title': 'Everybody Loves Raymond|Everybody Loves Raymond 048 HD, Part 5 of 5',
- }
- }
- ],
+ 'info_dict': {
+ 'description': 'md5:80973e81b916a324e05c14a3fb506d29',
+ 'title': 'The Invasion',
+ },
+ 'playlist': [],
}, {
'url': 'http://www.tvland.com/video-clips/zea2ev/younger-younger--hilary-duff---little-lies',
'md5': 'e2c6389401cf485df26c79c247b08713',
'info_dict': {
'id': 'b8697515-4bbe-4e01-83d5-fa705ce5fa88',
'ext': 'mp4',
- 'title': 'Younger|Younger: Hilary Duff - Little Lies',
- 'description': 'md5:7d192f56ca8d958645c83f0de8ef0269'
+ 'title': 'Younger|December 28, 2015|2|NO-EPISODE#|Younger: Hilary Duff - Little Lies',
+ 'description': 'md5:7d192f56ca8d958645c83f0de8ef0269',
+ 'upload_date': '20151228',
+ 'timestamp': 1451289600,
},
}]
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-05 09:20:15 +0000