summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-04-18 06:21:46 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-04-18 06:21:46 +0200
commitbfdf4692955b3ea300b8f6ae30b8b69127922f7e (patch)
treec24406903605d55cbcfb68aa127bda33126133bd
parent32c96387c1837103b5cdde4b4c39b9653f2e0181 (diff)
downloadyoutube-dl-bfdf4692955b3ea300b8f6ae30b8b69127922f7e.tar.gz
youtube-dl-bfdf4692955b3ea300b8f6ae30b8b69127922f7e.tar.xz
youtube-dl-bfdf4692955b3ea300b8f6ae30b8b69127922f7e.zip
Fix FunnyOrDie extraction for a special video (#789)
-rwxr-xr-xyoutube_dl/InfoExtractors.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 306d96774..cf31970ef 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3704,7 +3704,9 @@ class FunnyOrDieIE(InfoExtractor):
 
         m = re.search(r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", webpage, flags=re.DOTALL)
         if not m:
-            self._downloader.trouble(u'Cannot find video title')
+            m = re.search(r'<title>(?P<title>[^<]+?)</title>', webpage)
+            if not m:
+                self._downloader.trouble(u'Cannot find video title')
         title = clean_html(m.group('title'))
 
         m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage)