logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: 4b10aadffc120b0b6ee8f150f1f319e1cce853a7
parent 5bec574859e6cb0fc0a92a837174306f9a0c023c
Author: Sergey M․ <dstftw@gmail.com>
Date:   Wed, 23 Apr 2014 19:42:34 +0700

[dailymotion] Fix user playlist extraction

Diffstat:

Myoutube_dl/extractor/dailymotion.py10+++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 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'<a class="label" href="/%s".*?>(.*?)</' % re.escape(user), - webpage, u'user', flags=re.DOTALL) + full_user = unescapeHTML(self._html_search_regex( + r'<a class="nav-image" title="([^"]+)" href="/%s">' % re.escape(user), + webpage, u'user', flags=re.DOTALL)) return { '_type': 'playlist',