R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor change

Browse Source
This commit is contained in:
2017-08-24 15:57:25 +10:00
parent 1f0ee406bc
commit d25dd25df4
2 changed files with 1364 additions and 1358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/ximalaya.py
View File

@ -1,6 +1,5 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
import re import re
@ -78,6 +77,14 @@ class XimalayaAlbumIE(XimalayaBaseIE):
_VALID_URL = r'http://www\.ximalaya\.com/[0-9]+/album/(?P<id>[0-9]+)' _VALID_URL = r'http://www\.ximalaya\.com/[0-9]+/album/(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://www.ximalaya.com/10936615/album/7651313',
'info_dict': {
'id': '7651313',
'title': '晓说2017',
},
}]
def next_page(self, url): def next_page(self, url):
webpage = self._download_webpage(url, self._match_id(url)) webpage = self._download_webpage(url, self._match_id(url))
@ -114,7 +121,6 @@ class XimalayaAlbumIE(XimalayaBaseIE):
webpage) webpage)
# next page # next page
# r'<a href="(.*)" data-page="[0-9]+" class="pagingBar_page" hashlink="" unencode="" rel="next">'
next_page_url = self._search_regex( next_page_url = self._search_regex(
r'<a href=\'([0-9a-zA-Z\/?=/]+)\' data-page=\'[0-9]+\' class=\'pagingBar_page\' hashlink=\'\' unencode rel=\'next\'', webpage, r'<a href=\'([0-9a-zA-Z\/?=/]+)\' data-page=\'[0-9]+\' class=\'pagingBar_page\' hashlink=\'\' unencode rel=\'next\'', webpage,
'next page URL', default=None) 'next page URL', default=None)
@ -128,4 +134,4 @@ class XimalayaAlbumIE(XimalayaBaseIE):
for track in entries: for track in entries:
ret.append(self._extract_track(track)) ret.append(self._extract_track(track))
return self.playlist_result(ret) return self.playlist_result(ret, album_id, album_name)