X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fscreencast.py;h=ed9de964841e52c1e5753556d6b9e53339ba23c3;hb=6334794f2a8cc289bbb1e23c493fddcc7e488b00;hp=d5111c6293d70abbcd45ba90bc6b87986346731e;hpb=83cedc1cf224206adf513f5bdd5f5ce915d67933;p=youtube-dl
diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py
index d5111c629..ed9de9648 100644
--- a/youtube_dl/extractor/screencast.py
+++ b/youtube_dl/extractor/screencast.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
@@ -34,7 +34,7 @@ class ScreencastIE(InfoExtractor):
'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
}
}, {
- 'url': 'http://screencast.com/t/aAB3iowa',
+ 'url': 'http://www.screencast.com/t/aAB3iowa',
'md5': 'dedb2734ed00c9755761ccaee88527cd',
'info_dict': {
'id': 'aAB3iowa',
@@ -53,8 +53,10 @@ class ScreencastIE(InfoExtractor):
'description': 'md5:7b9f393bc92af02326a5c5889639eab0',
'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
}
- },
- ]
+ }, {
+ 'url': 'http://screencast.com/t/aAB3iowa',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -94,8 +96,9 @@ class ScreencastIE(InfoExtractor):
title = self._og_search_title(webpage, default=None)
if title is None:
title = self._html_search_regex(
- [r'Title: ([^<]*)',
- r'class="tabSeperator">>(.*?)<'],
+ [r'Title: ([^<]+)',
+ r'class="tabSeperator">>(.+?)<',
+ r'([^<]+)'],
webpage, 'title')
thumbnail = self._og_search_thumbnail(webpage)
description = self._og_search_description(webpage, default=None)