aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Lalinský <lukas@oxygene.sk>2015-10-19 20:53:27 +0200
committerLukáš Lalinský <lukas@oxygene.sk>2015-10-19 20:53:27 +0200
commit0be30bafa42dbfa99644a9eb7fefa5cebb70f121 (patch)
treeec394895cd2e7135ec10ef80842d6d62c1132946
parent7b091c370c0f187545df8b1b1cc990fcf95df108 (diff)
[vidme] Stream URL fallback, better error message for suspended videos
-rw-r--r--youtube_dl/extractor/vidme.py37
1 files changed, 35 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index 382517a4a..393970a12 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -97,6 +97,31 @@ class VidmeIE(InfoExtractor):
# nsfw, user-disabled
'url': 'https://vid.me/dzGJ',
'only_matching': True,
+ }, {
+ # suspended
+ 'url': 'https://vid.me/Ox3G',
+ 'only_matching': True,
+ }, {
+ # no formats in the API response
+ 'url': 'https://vid.me/e5g',
+ 'info_dict': {
+ 'id': 'e5g',
+ 'ext': 'mp4',
+ 'title': 'e5g',
+ 'thumbnail': 're:^https?://.*\.jpg',
+ 'timestamp': 1401480195,
+ 'upload_date': '20140530',
+ 'uploader': None,
+ 'uploader_id': None,
+ 'age_limit': 0,
+ 'duration': 483,
+ 'view_count': int,
+ 'like_count': int,
+ 'comment_count': int,
+ },
+ 'params': {
+ 'skip_download': True,
+ },
}]
def _real_extract(self, url):
@@ -118,7 +143,7 @@ class VidmeIE(InfoExtractor):
video = response['video']
- if video.get('state') == 'user-disabled':
+ if video.get('state') in ('user-disabled', 'suspended'):
raise ExtractorError(
'Vidme said: This video has been suspended either due to a copyright claim, '
'or for violating the terms of use.',
@@ -131,6 +156,14 @@ class VidmeIE(InfoExtractor):
'height': int_or_none(f.get('height')),
'preference': 0 if f.get('type', '').endswith('clip') else 1,
} for f in video.get('formats', []) if f.get('uri')]
+
+ if not formats and video.get('complete_url'):
+ formats.append({
+ 'url': video.get('complete_url'),
+ 'width': int_or_none(video.get('width')),
+ 'height': int_or_none(video.get('height')),
+ })
+
self._sort_formats(formats)
title = video['title']
@@ -147,7 +180,7 @@ class VidmeIE(InfoExtractor):
return {
'id': video_id,
- 'title': title,
+ 'title': title or video_id,
'description': description,
'thumbnail': thumbnail,
'uploader': uploader,