X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fscreencast.py;h=62a6a8337ccf5d247a38be29cf93b5b72f36dfd7;hb=4c76aa06665621c7689938afd7bbdbc797b5c7ea;hp=d5111c6293d70abbcd45ba90bc6b87986346731e;hpb=83cedc1cf224206adf513f5bdd5f5ce915d67933;p=youtube-dl
diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py
index d5111c629..62a6a8337 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
@@ -21,7 +21,7 @@ class ScreencastIE(InfoExtractor):
'ext': 'm4v',
'title': 'Color Measurement with Ocean Optics Spectrometers',
'description': 'md5:240369cde69d8bed61349a199c5fb153',
- 'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+ 'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
}
}, {
'url': 'http://www.screencast.com/t/V2uXehPJa1ZI',
@@ -31,17 +31,17 @@ class ScreencastIE(InfoExtractor):
'ext': 'mov',
'title': 'The Amadeus Spectrometer',
'description': 're:^In this video, our friends at.*To learn more about Amadeus, visit',
- 'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+ 'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
}
}, {
- 'url': 'http://screencast.com/t/aAB3iowa',
+ 'url': 'http://www.screencast.com/t/aAB3iowa',
'md5': 'dedb2734ed00c9755761ccaee88527cd',
'info_dict': {
'id': 'aAB3iowa',
'ext': 'mp4',
'title': 'Google Earth Export',
'description': 'Provides a demo of a CommunityViz export to Google Earth, one of the 3D viewing options.',
- 'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+ 'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
}
}, {
'url': 'http://www.screencast.com/t/X3ddTrYh',
@@ -51,10 +51,12 @@ class ScreencastIE(InfoExtractor):
'ext': 'wmv',
'title': 'Toolkit 6 User Group Webinar (2014-03-04) - Default Judgment and First Impression',
'description': 'md5:7b9f393bc92af02326a5c5889639eab0',
- 'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+ 'thumbnail': r'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)