(.+?)<', html).group(1)
d = modificate_text(artist_name + u' - top 20')
@@ -759,7 +1038,7 @@ def download_artist_top_20_songs(self):
n += 1
def download_artist_radio(self):
- html = ss.get(url_artist_top_song % self.artist_id).text
+ html = self._request(url_artist_top_song % self.artist_id).text
artist_name = re.search(
r'(.+?)<', html).group(1)
d = modificate_text(artist_name + u' - radio')
@@ -770,7 +1049,7 @@ def download_artist_radio(self):
% self.artist_id
n = 1
while True:
- xml = ss.get(url_artist_radio).text
+ xml = self._request(url_artist_radio).text
song_ids = re.findall(r'(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -786,7 +1065,7 @@ def download_user_songs(self, url, desc):
ii = 1
n = 1
while True:
- html = ss.get(url % (self.user_id, str(ii))).text
+ html = self._request(url % (self.user_id, str(ii))).text
song_ids = re.findall(r'/song/(.+?)"', html)
if song_ids:
for i in song_ids:
@@ -805,7 +1084,7 @@ def download_user_shares(self, url_shares):
self.dir_ = modificate_file_name_for_wget(dir_)
page = 1
while True:
- html = ss.get(url_shares % page).text
+ html = self._request(url_shares % page).text
shares = re.findall(r'play.*\(\'\d+\'\)', html)
for share in shares:
if 'album' in share:
@@ -824,7 +1103,7 @@ def download_ranking_songs(self, url, tp):
page = 1
n = 1
while True:
- html = ss.get(url + '/page/' + str(page)).text
+ html = self._request(url + '/page/' + str(page)).text
song_ids = re.findall(r"play\('(\d+)'", html)
if not song_ids:
break
@@ -842,7 +1121,7 @@ def download_user_radio(self, url_rndsongs):
self.dir_ = modificate_file_name_for_wget(dir_)
n = 1
while True:
- xml = ss.get(url_rndsongs % self.user_id).text
+ xml = self._request(url_rndsongs % self.user_id).text
song_ids = re.findall(r'(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -852,14 +1131,14 @@ def download_user_radio(self, url_rndsongs):
n += 1
def download_chart(self, type_):
- html = ss.get('http://www.xiami.com/chart/index/c/%s' \
+ html = self._request('http://www.xiami.com/chart/index/c/%s' \
% self.chart_id).text
title = re.search(r'(.+?)', html).group(1)
d = modificate_text(title)
dir_ = os.path.join(os.getcwdu(), d)
self.dir_ = modificate_file_name_for_wget(dir_)
- html = ss.get(
+ html = self._request(
'http://www.xiami.com/chart/data?c=%s&limit=200&type=%s' \
% (self.chart_id, type_)).text
song_ids = re.findall(r'/song/(\d+)', html)
@@ -872,7 +1151,7 @@ def download_chart(self, type_):
n += 1
def download_genre(self, url_genre):
- html = ss.get(url_genre % (self.genre_id, 1)).text
+ html = self._request(url_genre % (self.genre_id, 1)).text
if '/gid/' in url_genre:
t = re.search(
r'/genre/detail/gid/%s".+?title="(.+?)"' \
@@ -896,11 +1175,11 @@ def download_genre(self, url_genre):
self.html = ''
self.disc_description_archives = {}
n += 1
- html = ss.get(url_genre % (self.chart_id, page)).text
+ html = self._request(url_genre % (self.chart_id, page)).text
page += 1
def download_genre_radio(self, url_genre):
- html = ss.get(url_genre % (self.genre_id, 1)).text
+ html = self._request(url_genre % (self.genre_id, 1)).text
if '/gid/' in url_genre:
t = re.search(
r'/genre/detail/gid/%s".+?title="(.+?)"' \
@@ -919,7 +1198,7 @@ def download_genre_radio(self, url_genre):
n = 1
while True:
- xml = ss.get(url_genre_radio).text
+ xml = self._request(url_genre_radio).text
song_ids = re.findall(r'(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -941,21 +1220,25 @@ def hack_luoo(self, url):
r'(?:Album:|专辑：)(.+?)
', cn)
# search song at xiami
- for info in songs_info:
- url = 'http://www.xiami.com/web/search-songs?key=%s' \
- % urllib.quote(' '.join(info))
- r = ss.get(url)
- j = r.json()
- if not r.ok or not j:
- print s % (1, 93, ' !! no find:'), ' - '.join(info)
+ for name, artist, album in songs_info:
+ name = name.strip()
+ artist = artist.strip()
+ album = album.strip()
+
+ songs = self._api.search_songs(name + ' ' + artist)
+ if not songs:
+ print s % (1, 93, ' !! no find:'), ' - '.join([name, artist, album])
continue
- self.song_id = j[0]['id']
- self.download_song()
+
+ self.make_file_name(songs[0])
+ self.download(songs[:1], n=1)
def display_infos(self, i, nn, n, durl):
+ length = datetime.datetime.fromtimestamp(i['length']).strftime('%M:%S')
print n, '/', nn
print s % (2, 94, i['file_name'])
print s % (2, 95, i['album_name'])
+ print s % (2, 93, length)
print 'http://www.xiami.com/song/%s' % i['song_id']
print 'http://www.xiami.com/album/%s' % i['album_id']
print durl
@@ -976,14 +1259,16 @@ def get_mp3_quality(self, durl):
def play(self, songs, nn=u'1', n=1):
if args.play == 2:
- songs = sorted(songs, key=lambda k: k['song_played'], reverse=True)
+ songs = sorted(songs, key=lambda k: k['play_count'], reverse=True)
+
for i in songs:
- self.record(i['song_id'])
+ self.record(i['song_id'], i['album_id'])
durl = self.get_durl(i['song_id'])
if not durl:
print s % (2, 91, ' !! Error: can\'t get durl'), i['song_name']
continue
+ cookies = '; '.join(['%s=%s' % (k, v) for k, v in ss.cookies.items()])
mp3_quality = self.get_mp3_quality(durl)
i['durl_is_H'] = mp3_quality
self.display_infos(i, nn, n, durl)
@@ -993,12 +1278,9 @@ def play(self, songs, nn=u'1', n=1):
'--user-agent "%s" ' \
'--http-header-fields "Referer: http://img.xiami.com' \
'/static/swf/seiya/1.4/player.swf?v=%s",' \
- '"Cookie: member_auth=%s" ' \
+ '"Cookie: %s" ' \
'"%s"' \
- % (headers['User-Agent'],
- int(time.time()*1000),
- ss.cookies.get('member_auth'),
- durl)
+ % (headers['User-Agent'], int(time.time()*1000), cookies, durl)
os.system(cmd)
timeout = 1
ii, _, _ = select.select([sys.stdin], [], [], timeout)
@@ -1014,6 +1296,7 @@ def download(self, songs, amount_songs=u'1', n=1):
if not os.path.exists(dir_):
os.mkdir(dir_)
+
ii = 1
for i in songs:
num = random.randint(0, 100) % 8
@@ -1051,6 +1334,7 @@ def download(self, songs, amount_songs=u'1', n=1):
else:
print ' |--', s % (1, 97, 'MP3-Quality:'), s % (1, 91, 'Low')
+ cookies = '; '.join(['%s=%s' % (k, v) for k, v in ss.cookies.items()])
file_name_for_wget = file_name.replace('`', '\`')
quiet = ' -q' if args.quiet else ' -nv'
cmd = 'wget -c%s ' \
@@ -1059,11 +1343,7 @@ def download(self, songs, amount_songs=u'1', n=1):
'/static/swf/seiya/1.4/player.swf?v=%s" ' \
'--header "Cookie: member_auth=%s" ' \
'-O "%s.tmp" %s' \
- % (quiet, headers['User-Agent'],
- int(time.time()*1000),
- ss.cookies.get('member_auth'),
- file_name_for_wget,
- durl)
+ % (quiet, headers['User-Agent'], int(time.time()*1000), cookies, file_name_for_wget, durl)
cmd = cmd.encode('utf8')
status = os.system(cmd)
if status != 0: # other http-errors, such as 302.
@@ -1090,8 +1370,8 @@ def _save_do(self, id_, type, tags):
"shareTo": "all",
"_xiamitoken": ss.cookies['_xiamitoken'],
}
- url = 'http://www.xiami.com/ajax/addtag'
- r = ss.post(url, data=data)
+ url = 'https://www.xiami.com/ajax/addtag'
+ r = self._request(url, data=data, method='POST')
j = r.json()
if j['status'] == 'ok':
return 0
@@ -1102,27 +1382,31 @@ def save(self, urls):
tags = args.tags
for url in urls:
if '/collect/' in url:
- collect_id = re.search(r'/collect/(\d+)', url).group(1)
+ collect_id = re.search(r'/collect/(\w+)', url).group(1)
print s % (1, 97, u'\n ++ save collect:'), \
'http://www.xiami.com/song/collect/' + collect_id
result = self._save_do(collect_id, 4, tags)
elif '/album/' in url:
- album_id = re.search(r'/album/(\d+)', url).group(1)
+ album_id = re.search(r'/album/(\w+)', url).group(1)
+ album = self._api.album(album_id)
+ album_id = album[0].album_id
print s % (1, 97, u'\n ++ save album:'), \
- 'http://www.xiami.com/album/' + album_id
+ 'http://www.xiami.com/album/' + str(album_id)
result = self._save_do(album_id, 5, tags)
elif '/artist/' in url:
- artist_id = re.search(r'/artist/(\d+)', url).group(1)
+ artist_id = re.search(r'/artist/(\w+)', url).group(1)
print s % (1, 97, u'\n ++ save artist:'), \
'http://www.xiami.com/artist/' + artist_id
result = self._save_do(artist_id, 6, tags)
elif '/song/' in url:
- song_id = re.search(r'/song/(\d+)', url).group(1)
+ song_id = re.search(r'/song/(\w+)', url).group(1)
+ song = self._api.song(song_id)
+ song_id = song.song_id
print s % (1, 97, u'\n ++ save song:'), \
- 'http://www.xiami.com/song/' + song_id
+ 'http://www.xiami.com/song/' + str(song_id)
result = self._save_do(song_id, 3, tags)
elif '/u/' in url:
@@ -1177,30 +1461,26 @@ def main(argv):
email = raw_input(s % (1, 97, ' username: ') \
if comd == 'logintaobao' or comd == 'gt' \
else s % (1, 97, ' email: '))
- password = getpass(s % (1, 97, ' password: '))
+ cookies = getpass(s % (1, 97, ' cookies: '))
elif len(xxx) == 1:
# for add_member_auth
- if '@' not in xxx[0]:
- x = xiami()
- x.add_member_auth(xxx[0])
- x.check_login()
- return
-
- email = xxx[0]
- password = getpass(s % (1, 97, ' password: '))
+ if '; ' in xxx[0]:
+ email = None
+ cookies = xxx[0]
+ else:
+ email = xxx[0]
+ cookies = getpass(s % (1, 97, ' cookies: '))
elif len(xxx) == 2:
email = xxx[0]
- password = xxx[1]
+ cookies = xxx[1]
else:
- print s % (1, 91,
- ' login\n login email\n \
- login email password')
+ msg = ('login: \n'
+ 'login cookies')
+ print s % (1, 91, msg)
+ return
x = xiami()
- if comd == 'logintaobao' or comd == 'gt':
- x.login_taobao(email, password)
- else:
- x.login(email, password)
+ x.add_cookies(cookies)
is_signin = x.check_login()
if is_signin:
print s % (1, 92, ' ++ login succeeds.')