X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fslideshare.py;h=9f79ff5c1b66d2bf37369a6009a914043493b407;hb=ef249a2cd7a7cfbd92a030cb72e238ba4ad52604;hp=e7d776e7bd8bd3334ff0da1203cd91d52508a6ef;hpb=d5524947b560c1d0e1dfa2ef7f1969efe07866fa;p=youtube-dl diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dl/extractor/slideshare.py index e7d776e7b..9f79ff5c1 100644 --- a/youtube_dl/extractor/slideshare.py +++ b/youtube_dl/extractor/slideshare.py @@ -30,7 +30,7 @@ class SlideshareIE(InfoExtractor): page_title = mobj.group('title') webpage = self._download_webpage(url, page_title) slideshare_obj = self._search_regex( - r'var slideshare_object = ({.*?}); var user_info =', + r'var\s+slideshare_object\s*=\s*({.*?});\s*var\s+user_info\s*=', webpage, 'slideshare object') info = json.loads(slideshare_obj) if info['slideshow']['type'] != 'video': @@ -41,7 +41,7 @@ class SlideshareIE(InfoExtractor): ext = info['jsplayer']['video_extension'] video_url = compat_urlparse.urljoin(bucket, doc + '-SD.' + ext) description = self._html_search_regex( - r']*>(.*?)

', webpage, + r'(?s)]+itemprop="description"[^>]*>(.+?)

', webpage, 'description', fatal=False) return {