(.+?)<', html).group(1).decode('utf8') + collect_name = re.search(r'
(.+?)<', html).group(1) d = collect_name - dir_ = os.path.join(os.getcwd().decode('utf8'), d) + dir_ = os.path.join(os.getcwdu(), d) self.dir_ = modificate_file_name_for_wget(dir_) - song_ids = re.findall('/song/(\d+)" title', html) amount_songs = unicode(len(song_ids)) song_ids = song_ids[args.from_ - 1:] print(s % (2, 97, u'\n>> ' + amount_songs + u' 首歌曲将要下载.')) \
@@ -641,9 +1002,9 @@ def download_artist_albums(self):
ii = 1
album_ids = []
while True:
- html = ss.get(
- url_artist_albums % (self.artist_id, str(ii))).content
- t = re.findall(r'/album/(\d+)"', html)
+ html = self._request(
+ url_artist_albums % (self.artist_id, str(ii))).text
+ t = re.findall(r'/album/(\w+)"', html)
if album_ids == t: break
album_ids = t
if album_ids:
@@ -658,13 +1019,12 @@ def download_artist_albums(self):
ii += 1
def download_artist_top_20_songs(self):
- html = ss.get(url_artist_top_song % self.artist_id).content
- song_ids = re.findall(r'/song/(.+?)" title', html)
+ html = self._request(url_artist_top_song % self.artist_id).text
+ song_ids = re.findall(r'/music/send/id/(\d+)', html)
artist_name = re.search(
- r'<p><a href="/index.cgi/contrast/https://github.com/artist/\d+">(.+?)<', html - ).group(1).decode('utf8', 'ignore') + r'<p><a href="/index.cgi/contrast/https://github.com/artist/\w+">(.+?)<', html).group(1) d = modificate_text(artist_name + u' - top 20') - dir_ = os.path.join(os.getcwd().decode('utf8'), d) + dir_ = os.path.join(os.getcwdu(), d) self.dir_ = modificate_file_name_for_wget(dir_) amount_songs = unicode(len(song_ids)) print(s % (2, 97, u'\n>> ' + amount_songs + u' 首歌曲将要下载.')) \
@@ -678,20 +1038,18 @@ def download_artist_top_20_songs(self):
n += 1
def download_artist_radio(self):
- html = ss.get(url_artist_top_song % self.artist_id).content
+ html = self._request(url_artist_top_song % self.artist_id).text
artist_name = re.search(
- r'<p><a href="/index.cgi/contrast/https://github.com/artist/\d+">(.+?)<', html - ).group(1).decode('utf8', 'ignore') - + r'<p><a href="/index.cgi/contrast/https://github.com/artist/\w+">(.+?)<', html).group(1) d = modificate_text(artist_name + u' - radio') - dir_ = os.path.join(os.getcwd().decode('utf8'), d) + dir_ = os.path.join(os.getcwdu(), d) self.dir_ = modificate_file_name_for_wget(dir_) url_artist_radio = "http://www.xiami.com/radio/xml/type/5/id/%s" \ % self.artist_id n = 1 while True: - xml = ss.get(url_artist_radio).content + xml = self._request(url_artist_radio).text song_ids = re.findall(r'<song_id>(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -701,13 +1059,13 @@ def download_artist_radio(self):
n += 1
def download_user_songs(self, url, desc):
- dir_ = os.path.join(os.getcwd().decode('utf8'),
+ dir_ = os.path.join(os.getcwdu(),
u'虾米用户 %s %s' % (self.user_id, desc))
self.dir_ = modificate_file_name_for_wget(dir_)
ii = 1
n = 1
while True:
- html = ss.get(url % (self.user_id, str(ii))).content
+ 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:
@@ -722,11 +1080,11 @@ def download_user_songs(self, url, desc):
def download_user_shares(self, url_shares):
d = modificate_text(u'%s 的分享' % self.user_id)
- dir_ = os.path.join(os.getcwd().decode('utf8'), d)
+ dir_ = os.path.join(os.getcwdu(), d)
self.dir_ = modificate_file_name_for_wget(dir_)
page = 1
while True:
- html = ss.get(url_shares % page).content
+ html = self._request(url_shares % page).text
shares = re.findall(r'play.*\(\'\d+\'\)', html)
for share in shares:
if 'album' in share:
@@ -738,13 +1096,32 @@ def download_user_shares(self, url_shares):
if not shares: break
page += 1
+ def download_ranking_songs(self, url, tp):
+ d = modificate_text(u'%s 的试听排行 - %s' % (self.user_id, tp))
+ dir_ = os.path.join(os.getcwdu(), d)
+ self.dir_ = modificate_file_name_for_wget(dir_)
+ page = 1
+ n = 1
+ while True:
+ html = self._request(url + '/page/' + str(page)).text
+ song_ids = re.findall(r"play\('(\d+)'", html)
+ if not song_ids:
+ break
+ for song_id in song_ids:
+ songs = self.get_song(song_id)
+ self.download(songs, n=n)
+ self.html = ''
+ self.disc_description_archives = {}
+ n += 1
+ page += 1
+
def download_user_radio(self, url_rndsongs):
d = modificate_text(u'%s 的虾米推荐' % self.user_id)
- dir_ = os.path.join(os.getcwd().decode('utf8'), d)
+ dir_ = os.path.join(os.getcwdu(), d)
self.dir_ = modificate_file_name_for_wget(dir_)
n = 1
while True:
- xml = ss.get(url_rndsongs % self.user_id).content
+ xml = self._request(url_rndsongs % self.user_id).text
song_ids = re.findall(r'<song_id>(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -754,19 +1131,16 @@ 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' \
- % self.chart_id).content
- title = re.search(
- r'<title>(.+?)', html
- ).group(1).decode('utf8', 'ignore')
+ 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.getcwd().decode('utf8'), d)
+ 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_)
- ).content
+ % (self.chart_id, type_)).text
song_ids = re.findall(r'/song/(\d+)', html)
n = 1
for i in song_ids:
@@ -777,19 +1151,17 @@ def download_chart(self, type_):
n += 1
def download_genre(self, url_genre):
- html = ss.get(url_genre % (self.genre_id, 1)).content
+ html = self._request(url_genre % (self.genre_id, 1)).text
if '/gid/' in url_genre:
t = re.search(
r'/genre/detail/gid/%s".+?title="(.+?)"' \
- % self.genre_id, html
- ).group(1).decode('utf8', 'ignore')
+ % self.genre_id, html).group(1)
elif '/sid/' in url_genre:
t = re.search(
r'/genre/detail/sid/%s" title="(.+?)"' \
- % self.genre_id, html
- ).group(1).decode('utf8', 'ignore')
+ % self.genre_id, html).group(1)
d = modificate_text(u'%s - 代表曲目 - xiami' % t)
- dir_ = os.path.join(os.getcwd().decode('utf8'), d)
+ dir_ = os.path.join(os.getcwdu(), d)
self.dir_ = modificate_file_name_for_wget(dir_)
n = 1
@@ -803,32 +1175,30 @@ def download_genre(self, url_genre):
self.html = ''
self.disc_description_archives = {}
n += 1
- html = ss.get(url_genre % (self.chart_id, page)).content
+ 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)).content
+ html = self._request(url_genre % (self.genre_id, 1)).text
if '/gid/' in url_genre:
t = re.search(
r'/genre/detail/gid/%s".+?title="(.+?)"' \
- % self.genre_id, html
- ).group(1).decode('utf8', 'ignore')
+ % self.genre_id, html).group(1)
url_genre_radio = "http://www.xiami.com/radio/xml/type/12/id/%s" \
% self.genre_id
elif '/sid/' in url_genre:
t = re.search(
r'/genre/detail/sid/%s" title="(.+?)"' \
- % self.genre_id, html
- ).group(1).decode('utf8', 'ignore')
+ % self.genre_id, html).group(1)
url_genre_radio = "http://www.xiami.com/radio/xml/type/13/id/%s" \
% self.genre_id
d = modificate_text(u'%s - radio - xiami' % t)
- dir_ = os.path.join(os.getcwd().decode('utf8'), d)
+ dir_ = os.path.join(os.getcwdu(), d)
self.dir_ = modificate_file_name_for_wget(dir_)
n = 1
while True:
- xml = ss.get(url_genre_radio).content
+ xml = self._request(url_genre_radio).text
song_ids = re.findall(r'
(\d+)', xml)
for i in song_ids:
songs = self.get_song(i)
@@ -837,44 +1207,80 @@ def download_genre_radio(self, url_genre):
self.disc_description_archives = {}
n += 1
- def display_infos(self, i, nn, n):
- print '\n ----------------'
- print '>>', n, '/', nn
- print '>>', s % (2, 94, i['file_name'])
- print '>>', s % (2, 95, i['album_name'])
- print '>>', 'http://www.xiami.com/song/%s' % i['song_id']
- print '>>', 'http://www.xiami.com/album/%s' % i['album_id']
+ def hack_luoo(self, url):
+ # parse luoo.net
+ theaders = headers
+ theaders.pop('Referer')
+ r = requests.get(url)
+ if not r.ok:
+ return None
+ cn = r.content
+ songs_info = re.findall(r'(.+?)
\s+'
+ r'(?:Artist:|艺人:)(.+?)
\s+'
+ r'(?:Album:|专辑:)(.+?)
', cn)
+
+ # search song at xiami
+ 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.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
if i['durl_is_H'] == 'h':
- print '>>', s % (1, 97, 'MP3-Quality:'), s % (1, 91, 'High')
+ print s % (1, 97, 'MP3-Quality:'), s % (1, 92, 'High')
else:
- print '>>', s % (1, 97, 'MP3-Quality:'), s % (1, 91, 'Low')
- print ''
+ print s % (1, 97, 'MP3-Quality:'), s % (1, 91, 'Low')
+ print '—' * int(os.popen('tput cols').read())
def get_mp3_quality(self, durl):
- if 'm3.file.xiami.com' in durl or 'm6.file.xiami.com' in durl:
+ if 'm3.file.xiami.com' in durl \
+ or 'm6.file.xiami.com' in durl \
+ or '_h.mp3' in durl \
+ or 'm320.xiami.net' in durl:
return 'h'
else:
return 'l'
def play(self, songs, nn=u'1', n=1):
+ if args.play == 2:
+ 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)
+ self.display_infos(i, nn, n, durl)
n = int(n) + 1
cmd = 'mpv --really-quiet ' \
'--cache 8146 ' \
'--user-agent "%s" ' \
- '--http-header-fields="Referer:http://img.xiami.com\
- /static/swf/seiya/1.4/player.swf?v=%s" ' \
+ '--http-header-fields "Referer: http://img.xiami.com' \
+ '/static/swf/seiya/1.4/player.swf?v=%s",' \
+ '"Cookie: %s" ' \
'"%s"' \
- % (headers['User-Agent'], int(time.time()*1000), durl)
+ % (headers['User-Agent'], int(time.time()*1000), cookies, durl)
os.system(cmd)
timeout = 1
ii, _, _ = select.select([sys.stdin], [], [], timeout)
@@ -883,16 +1289,17 @@ def play(self, songs, nn=u'1', n=1):
else:
pass
- def download(self, songs, amount_songs=u'1', n=None):
+ def download(self, songs, amount_songs=u'1', n=1):
dir_ = modificate_file_name_for_wget(self.dir_)
- cwd = os.getcwd().decode('utf8')
+ cwd = os.getcwd()
if dir_ != cwd:
if not os.path.exists(dir_):
os.mkdir(dir_)
+
ii = 1
for i in songs:
- num = random.randint(0, 100) % 7
+ num = random.randint(0, 100) % 8
col = s % (2, num + 90, i['file_name'])
t = modificate_file_name_for_wget(i['file_name'])
file_name = os.path.join(dir_, t)
@@ -927,14 +1334,16 @@ def download(self, songs, amount_songs=u'1', n=None):
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('`', '\`')
- cmd = 'wget -c -T 5 -nv ' \
+ quiet = ' -q' if args.quiet else ' -nv'
+ cmd = 'wget -c%s ' \
'-U "%s" ' \
- '--header "Referer:http://img.xiami.com\
- /static/swf/seiya/1.4/player.swf?v=%s" ' \
+ '--header "Referer:http://img.xiami.com' \
+ '/static/swf/seiya/1.4/player.swf?v=%s" ' \
+ '--header "Cookie: member_auth=%s" ' \
'-O "%s.tmp" %s' \
- % (headers['User-Agent'], int(time.time()*1000),
- 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.
@@ -961,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
@@ -973,30 +1382,41 @@ 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:
+ user_id = re.search(r'/u/(\d+)', url).group(1)
+ print s % (1, 97, u'\n ++ save user:'), \
+ 'http://www.xiami.com/u/' + user_id
+ result = self._save_do(user_id, 1, tags)
+
else:
+ result = -1
print(s % (2, 91, u' 请正确输入虾米网址.'))
if result == 0:
@@ -1013,10 +1433,12 @@ def main(argv):
p = argparse.ArgumentParser(description='downloading any xiami.com')
p.add_argument('xxx', type=str, nargs='*', \
help='命令对象.')
- p.add_argument('-p', '--play', action='store_true', \
+ p.add_argument('-p', '--play', action='count', \
help='play with mpv')
p.add_argument('-l', '--low', action='store_true', \
help='low mp3')
+ p.add_argument('-q', '--quiet', action='store_true', \
+ help='quiet for download')
p.add_argument('-f', '--from_', action='store', \
default=1, type=int, \
help='从第几个开始下载,eg: -f 42')
@@ -1031,32 +1453,34 @@ def main(argv):
comd = argv[1]
xxx = args.xxx
- if comd == 'login' or comd == 'g' \
- or comd == 'logintaobao' or comd == 'gt':
+ if comd == 'login' or comd == 'g':
+ # or comd == 'logintaobao' or comd == 'gt':
+ # taobao has updated login algorithms which is hard to hack
+ # so remove it.
if len(xxx) < 1:
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:
- email = xxx[0]
- password = getpass(s % (1, 97, ' password: '))
+ # for add_member_auth
+ 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\n \
- logintaobao\n \
- logintaobao username\n \
- logintaobao username 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.')
@@ -1067,9 +1491,14 @@ def main(argv):
g = open(cookie_file, 'w')
g.close()
- elif comd == 'd' or comd == 'download' \
- or comd == 'p' or comd == 'play':
- if comd == 'p' or comd == 'play': args.play = True
+ elif comd == 'd' or comd == 'download':
+ urls = xxx
+ x = xiami()
+ x.init()
+ x.url_parser(urls)
+
+ elif comd == 'p' or comd == 'play':
+ if not args.play: args.play = 1
urls = xxx
x = xiami()
x.init()
diff --git a/yunpan.360.cn.py b/yunpan.360.cn.py
index 55ede34..807cdc4 100755
--- a/yunpan.360.cn.py
+++ b/yunpan.360.cn.py
@@ -228,7 +228,7 @@ def download(infos):
if os.path.exists(infos['file']):
return 0
- num = random.randint(0, 7) % 7
+ num = random.randint(0, 7) % 8
col = s % (2, num + 90, infos['file'])
infos['nn'] = infos['nn'] if infos.get('nn') else 1
infos['total_file'] = infos['total_file'] if infos.get('total_file') else 1