From e765f328057fcf340e580fcfb09ac257928fd295 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Wed, 10 Aug 2016 13:56:52 +0200 Subject: [PATCH] [netease] fix #1341, also do not create new directory when info_only --- src/you_get/extractors/netease.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/you_get/extractors/netease.py b/src/you_get/extractors/netease.py index 332d48ec..b37ee003 100644 --- a/src/you_get/extractors/netease.py +++ b/src/you_get/extractors/netease.py @@ -4,6 +4,7 @@ __all__ = ['netease_download'] from ..common import * +from ..util import fs from json import loads import hashlib import base64 @@ -28,10 +29,10 @@ def netease_cloud_music_download(url, output_dir='.', merge=True, info_only=Fals artist_name = j['album']['artists'][0]['name'] album_name = j['album']['name'] - new_dir = output_dir + '/' + "%s - %s" % (artist_name, album_name) - if not os.path.exists(new_dir): - os.mkdir(new_dir) + new_dir = output_dir + '/' + fs.legitimize("%s - %s" % (artist_name, album_name)) if not info_only: + if not os.path.exists(new_dir): + os.mkdir(new_dir) cover_url = j['album']['picUrl'] download_urls([cover_url], "cover", "jpg", 0, new_dir) @@ -46,10 +47,10 @@ def netease_cloud_music_download(url, output_dir='.', merge=True, info_only=Fals elif "playlist" in url: j = loads(get_content("http://music.163.com/api/playlist/detail?id=%s&csrf_token=" % rid, headers={"Referer": "http://music.163.com/"})) - new_dir = output_dir + '/' + j['result']['name'] - if not os.path.exists(new_dir): - os.mkdir(new_dir) + new_dir = output_dir + '/' + fs.legitimize(j['result']['name']) if not info_only: + if not os.path.exists(new_dir): + os.mkdir(new_dir) cover_url = j['result']['coverImgUrl'] download_urls([cover_url], "cover", "jpg", 0, new_dir) @@ -61,7 +62,7 @@ def netease_cloud_music_download(url, output_dir='.', merge=True, info_only=Fals netease_lyric_download(i, l["lrc"]["lyric"], output_dir=new_dir, info_only=info_only) except: pass - elif "song" in url: + elif "song" in url: j = loads(get_content("http://music.163.com/api/song/detail/?id=%s&ids=[%s]&csrf_token=" % (rid, rid), headers={"Referer": "http://music.163.com/"})) netease_song_download(j["songs"][0], output_dir=output_dir, info_only=info_only) try: # download lyrics