From: Sergey M․ Date: Wed, 23 Apr 2014 12:42:34 +0000 (+0700) Subject: [dailymotion] Fix user playlist extraction X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4b10aadffc120b0b6ee8f150f1f319e1cce853a7;p=youtube-dl [dailymotion] Fix user playlist extraction --- diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index c759b9889..55216201f 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -11,8 +11,8 @@ from ..utils import ( orderedSet, str_to_int, int_or_none, - ExtractorError, + unescapeHTML, ) class DailymotionBaseInfoExtractor(InfoExtractor): @@ -188,7 +188,7 @@ class DailymotionPlaylistIE(DailymotionBaseInfoExtractor): webpage = self._download_webpage(request, id, u'Downloading page %s' % pagenum) - video_ids.extend(re.findall(r'data-id="(.+?)"', webpage)) + video_ids.extend(re.findall(r'data-xid="(.+?)"', webpage)) if re.search(self._MORE_PAGES_INDICATOR, webpage) is None: break @@ -217,9 +217,9 @@ class DailymotionUserIE(DailymotionPlaylistIE): mobj = re.match(self._VALID_URL, url) user = mobj.group('user') webpage = self._download_webpage(url, user) - full_user = self._html_search_regex( - r'(.*?)' % re.escape(user), + webpage, u'user', flags=re.DOTALL)) return { '_type': 'playlist',