aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-06-22 13:57:17 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-06-22 13:57:17 +0200
commit7df97fb59f7994c32ecf552ee9dfec6c6be3bb1e (patch)
treeb9a298359555fc33704000ab3e2cd92e7cbc84d6
parent17f3c40a31e6667bb7b18cbe7cf24e5728d7aabd (diff)
display a meaningful error message on rental videos (#359)
-rwxr-xr-xyoutube-dlbin40256 -> 40544 bytes
-rwxr-xr-xyoutube-dl.exebin3989217 -> 3989624 bytes
-rw-r--r--youtube_dl/InfoExtractors.py5
3 files changed, 5 insertions, 0 deletions
diff --git a/youtube-dl b/youtube-dl
index f65e97fd0..66e5ff537 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index 6d19ef5ea..984c92c42 100755
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
Binary files differ
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 40f96ad76..d02bd29f7 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -311,6 +311,11 @@ class YoutubeIE(InfoExtractor):
self._downloader.trouble(u'ERROR: "token" parameter not in video info for unknown reason')
return
+ # Check for "rental" videos
+ if 'ypc_video_rental_bar_text' in video_info and 'author' not in video_info:
+ self._downloader.trouble(u'ERROR: "rental" videos not supported')
+ return
+
# Start extracting information
self.report_information_extraction(video_id)