display a meaningful error message on rental videos (#359)

diff --git a/youtube-dl b/youtube-dl
index f65e97fd077d46b2c6535f32a65b32dd50639a74..66e5ff53701f8b9f324d558e52d34ea06b6e6fbd 100755 (executable)
Binary files a/youtube-dl and b/youtube-dl differ

diff --git a/youtube-dl.exe b/youtube-dl.exe
index 6d19ef5eacdf67d3618ce9e7b623481712abbe2e..984c92c42194f2384926427fa6112f30222ac1e2 100755 (executable)
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 40f96ad76590bc732c4d5c422d1d839fe6eb9986..d02bd29f74d79abd2f194bcf60bab81e2319fa8a 100644 (file)
--- 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)