X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fard.py;h=7f0da8ab6d5b9f0e62f2af18c74c26185c505259;hb=2b9faf55427b73cb978ddd661c32a5cb313f9331;hp=7ee2ef46314d41ba08f96cacf834f63bcbd263ea;hpb=b4f23afbd1dd9ee924828a2ad41a2318f8d6323a;p=youtube-dl

diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py
index 7ee2ef463..7f0da8ab6 100644
--- a/youtube_dl/extractor/ard.py
+++ b/youtube_dl/extractor/ard.py
@@ -8,6 +8,8 @@ from ..utils import (
     determine_ext,
     ExtractorError,
     qualities,
+    compat_urllib_parse_urlparse,
+    compat_urllib_parse,
 )
 
 
@@ -44,7 +46,13 @@ class ARDIE(InfoExtractor):
         else:
             video_id = m.group('video_id')
 
-        webpage = self._download_webpage(url.encode('utf-8'), video_id)
+        urlp = compat_urllib_parse_urlparse(url)
+        url = urlp._replace(path=compat_urllib_parse.quote(urlp.path.encode('utf-8'))).geturl()
+
+        webpage = self._download_webpage(url, video_id)
+
+        if '>Der gewünschte Beitrag ist nicht mehr verfügbar.<' in webpage:
+            raise ExtractorError('Video %s is no longer available' % video_id, expected=True)
 
         title = self._html_search_regex(
             [r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',