| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | # coding: utf-8 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | from __future__ import unicode_literals | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | from .common import InfoExtractor | 
					
						
							|  |  |  | from ..compat import compat_urllib_parse_unquote | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | from ..utils import int_or_none | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class XiamiBaseIE(InfoExtractor): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     _API_BASE_URL = 'http://www.xiami.com/song/playlist/cat/json/id' | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |     def _download_webpage(self, *args, **kwargs): | 
					
						
							|  |  |  |         webpage = super(XiamiBaseIE, self)._download_webpage(*args, **kwargs) | 
					
						
							|  |  |  |         if '>Xiami is currently not available in your country.<' in webpage: | 
					
						
							|  |  |  |             self.raise_geo_restricted('Xiami is currently not available in your country') | 
					
						
							| 
									
										
											  
											
												bug fix for extractor xiami.py
Before applying this patch, when downloading resources from xiami.com, it crashes with these:
Traceback (most recent call last):
  File "/home/phi/.local/bin/youtube-dl", line 11, in <module>
    sys.exit(main())
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/__init__.py", line 433, in main
    _real_main(argv)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/__init__.py", line 423, in _real_main
    retcode = ydl.download(all_urls)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/YoutubeDL.py", line 1786, in download
    url, force_generic_extractor=self.params.get('force_generic_extractor', False))
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/YoutubeDL.py", line 691, in extract_info
    ie_result = ie.extract(url)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 347, in extract
    return self._real_extract(url)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/xiami.py", line 116, in _real_extract
    return self._extract_tracks(self._match_id(url))[0]
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/xiami.py", line 43, in _extract_tracks
    '%s/%s%s' % (self._API_BASE_URL, item_id, '/type/%s' % typ if typ else ''), item_id)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 562, in _download_json
    json_string, video_id, transform_source=transform_source, fatal=fatal)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 568, in _parse_json
    return json.loads(json_string)
  File "/usr/lib/python3.5/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'NoneType'
This patch solves exactly this problem.
											
										 
											2016-08-14 02:18:59 +08:00
										 |  |  |         return webpage | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     def _extract_track(self, track, track_id=None): | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |         track_name = track.get('songName') or track.get('name') or track['subName'] | 
					
						
							|  |  |  |         artist = track.get('artist') or track.get('artist_name') or track.get('singers') | 
					
						
							|  |  |  |         title = '%s - %s' % (artist, track_name) if artist else track_name | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |         track_url = self._decrypt(track['location']) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         subtitles = {} | 
					
						
							|  |  |  |         lyrics_url = track.get('lyric_url') or track.get('lyric') | 
					
						
							|  |  |  |         if lyrics_url and lyrics_url.startswith('http'): | 
					
						
							|  |  |  |             subtitles['origin'] = [{'url': lyrics_url}] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         return { | 
					
						
							|  |  |  |             'id': track.get('song_id') or track_id, | 
					
						
							|  |  |  |             'url': track_url, | 
					
						
							|  |  |  |             'title': title, | 
					
						
							|  |  |  |             'thumbnail': track.get('pic') or track.get('album_pic'), | 
					
						
							|  |  |  |             'duration': int_or_none(track.get('length')), | 
					
						
							|  |  |  |             'creator': track.get('artist', '').split(';')[0], | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |             'track': track_name, | 
					
						
							|  |  |  |             'track_number': int_or_none(track.get('track')), | 
					
						
							|  |  |  |             'album': track.get('album_name') or track.get('title'), | 
					
						
							|  |  |  |             'artist': artist, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |             'subtitles': subtitles, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-11-29 20:36:55 +01:00
										 |  |  |     def _extract_tracks(self, item_id, referer, typ=None): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |         playlist = self._download_json( | 
					
						
							| 
									
										
										
										
											2017-11-29 20:36:55 +01:00
										 |  |  |             '%s/%s%s' % (self._API_BASE_URL, item_id, '/type/%s' % typ if typ else ''), | 
					
						
							|  |  |  |             item_id, headers={ | 
					
						
							|  |  |  |                 'Referer': referer, | 
					
						
							|  |  |  |             }) | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |         return [ | 
					
						
							|  |  |  |             self._extract_track(track, item_id) | 
					
						
							|  |  |  |             for track in playlist['data']['trackList']] | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     @staticmethod | 
					
						
							|  |  |  |     def _decrypt(origin): | 
					
						
							|  |  |  |         n = int(origin[0]) | 
					
						
							|  |  |  |         origin = origin[1:] | 
					
						
							|  |  |  |         short_lenth = len(origin) // n | 
					
						
							|  |  |  |         long_num = len(origin) - short_lenth * n | 
					
						
							|  |  |  |         l = tuple() | 
					
						
							|  |  |  |         for i in range(0, n): | 
					
						
							|  |  |  |             length = short_lenth | 
					
						
							|  |  |  |             if i < long_num: | 
					
						
							|  |  |  |                 length += 1 | 
					
						
							|  |  |  |             l += (origin[0:length], ) | 
					
						
							|  |  |  |             origin = origin[length:] | 
					
						
							|  |  |  |         ans = '' | 
					
						
							|  |  |  |         for i in range(0, short_lenth + 1): | 
					
						
							|  |  |  |             for j in range(0, n): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |                 if len(l[j]) > i: | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |                     ans += l[j][i] | 
					
						
							|  |  |  |         return compat_urllib_parse_unquote(ans).replace('^', '0') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | class XiamiSongIE(XiamiBaseIE): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     IE_NAME = 'xiami:song' | 
					
						
							|  |  |  |     IE_DESC = '虾米音乐' | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     _VALID_URL = r'https?://(?:www\.)?xiami\.com/song/(?P<id>[^/?#&]+)' | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     _TESTS = [{ | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/song/1775610518', | 
					
						
							|  |  |  |         'md5': '521dd6bea40fd5c9c69f913c232cb57e', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '1775610518', | 
					
						
							|  |  |  |             'ext': 'mp3', | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |             'title': 'HONNE - Woman', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |             'thumbnail': r're:http://img\.xiami\.net/images/album/.*\.jpg', | 
					
						
							|  |  |  |             'duration': 265, | 
					
						
							|  |  |  |             'creator': 'HONNE', | 
					
						
							|  |  |  |             'track': 'Woman', | 
					
						
							|  |  |  |             'album': 'Woman', | 
					
						
							|  |  |  |             'artist': 'HONNE', | 
					
						
							|  |  |  |             'subtitles': { | 
					
						
							|  |  |  |                 'origin': [{ | 
					
						
							|  |  |  |                     'ext': 'lrc', | 
					
						
							|  |  |  |                 }], | 
					
						
							|  |  |  |             }, | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |         }, | 
					
						
							|  |  |  |         'skip': 'Georestricted', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/song/1775256504', | 
					
						
							|  |  |  |         'md5': '932a3abd45c6aa2b1fdbe028fcb4c4fc', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '1775256504', | 
					
						
							|  |  |  |             'ext': 'mp3', | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |             'title': '戴荃 - 悟空', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |             'thumbnail': r're:http://img\.xiami\.net/images/album/.*\.jpg', | 
					
						
							|  |  |  |             'duration': 200, | 
					
						
							|  |  |  |             'creator': '戴荃', | 
					
						
							|  |  |  |             'track': '悟空', | 
					
						
							|  |  |  |             'album': '悟空', | 
					
						
							|  |  |  |             'artist': '戴荃', | 
					
						
							|  |  |  |             'subtitles': { | 
					
						
							|  |  |  |                 'origin': [{ | 
					
						
							|  |  |  |                     'ext': 'lrc', | 
					
						
							|  |  |  |                 }], | 
					
						
							|  |  |  |             }, | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |         }, | 
					
						
							|  |  |  |         'skip': 'Georestricted', | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/song/1775953850', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '1775953850', | 
					
						
							|  |  |  |             'ext': 'mp3', | 
					
						
							|  |  |  |             'title': 'До Скону - Чума Пожирает Землю', | 
					
						
							|  |  |  |             'thumbnail': r're:http://img\.xiami\.net/images/album/.*\.jpg', | 
					
						
							|  |  |  |             'duration': 683, | 
					
						
							|  |  |  |             'creator': 'До Скону', | 
					
						
							|  |  |  |             'track': 'Чума Пожирает Землю', | 
					
						
							|  |  |  |             'track_number': 7, | 
					
						
							|  |  |  |             'album': 'Ад', | 
					
						
							|  |  |  |             'artist': 'До Скону', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'params': { | 
					
						
							|  |  |  |             'skip_download': True, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/song/xLHGwgd07a1', | 
					
						
							|  |  |  |         'only_matching': True, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     }] | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def _real_extract(self, url): | 
					
						
							| 
									
										
										
										
											2017-11-29 20:36:55 +01:00
										 |  |  |         return self._extract_tracks(self._match_id(url), url)[0] | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | class XiamiPlaylistBaseIE(XiamiBaseIE): | 
					
						
							|  |  |  |     def _real_extract(self, url): | 
					
						
							|  |  |  |         item_id = self._match_id(url) | 
					
						
							| 
									
										
										
										
											2017-11-29 20:36:55 +01:00
										 |  |  |         return self.playlist_result(self._extract_tracks(item_id, url, self._TYPE), item_id) | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class XiamiAlbumIE(XiamiPlaylistBaseIE): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     IE_NAME = 'xiami:album' | 
					
						
							|  |  |  |     IE_DESC = '虾米音乐 - 专辑' | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     _VALID_URL = r'https?://(?:www\.)?xiami\.com/album/(?P<id>[^/?#&]+)' | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     _TYPE = '1' | 
					
						
							|  |  |  |     _TESTS = [{ | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/album/2100300444', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '2100300444', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |         }, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |         'playlist_count': 10, | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |         'skip': 'Georestricted', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/album/512288?spm=a1z1s.6843761.1110925389.6.hhE9p9', | 
					
						
							|  |  |  |         'only_matching': True, | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/album/URVDji2a506', | 
					
						
							|  |  |  |         'only_matching': True, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     }] | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | class XiamiArtistIE(XiamiPlaylistBaseIE): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     IE_NAME = 'xiami:artist' | 
					
						
							|  |  |  |     IE_DESC = '虾米音乐 - 歌手' | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     _VALID_URL = r'https?://(?:www\.)?xiami\.com/artist/(?P<id>[^/?#&]+)' | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     _TYPE = '2' | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     _TESTS = [{ | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |         'url': 'http://www.xiami.com/artist/2132?spm=0.0.0.0.dKaScp', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '2132', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'playlist_count': 20, | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |         'skip': 'Georestricted', | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     }, { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/artist/bC5Tk2K6eb99', | 
					
						
							|  |  |  |         'only_matching': True, | 
					
						
							|  |  |  |     }] | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  | class XiamiCollectionIE(XiamiPlaylistBaseIE): | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     IE_NAME = 'xiami:collection' | 
					
						
							|  |  |  |     IE_DESC = '虾米音乐 - 精选集' | 
					
						
							| 
									
										
										
										
											2017-01-16 23:31:50 +07:00
										 |  |  |     _VALID_URL = r'https?://(?:www\.)?xiami\.com/collect/(?P<id>[^/?#&]+)' | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |     _TYPE = '3' | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     _TEST = { | 
					
						
							|  |  |  |         'url': 'http://www.xiami.com/collect/156527391?spm=a1z1s.2943601.6856193.12.4jpBnr', | 
					
						
							|  |  |  |         'info_dict': { | 
					
						
							|  |  |  |             'id': '156527391', | 
					
						
							|  |  |  |         }, | 
					
						
							| 
									
										
										
										
											2016-04-30 21:50:23 +06:00
										 |  |  |         'playlist_mincount': 29, | 
					
						
							| 
									
										
										
										
											2016-05-03 16:19:20 +08:00
										 |  |  |         'skip': 'Georestricted', | 
					
						
							| 
									
										
										
										
											2016-04-30 21:32:54 +08:00
										 |  |  |     } |