X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fslideshare.py;h=0b717a1e42b8dd2c3d8a88d602f001876cf99e03;hb=958d0b659b80d4493d045d4da82074ed68ed6c4e;hp=e7d776e7bd8bd3334ff0da1203cd91d52508a6ef;hpb=1cc79574fc5df21bf35dccf61eac0e9e75ed8d20;p=youtube-dl.git diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dl/extractor/slideshare.py index e7d776e7b..0b717a1e4 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'\$\.extend\(slideshare_object,\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 {