From e872f1e6a4e3c9716225cad5e62f2437fd84a8db Mon Sep 17 00:00:00 2001 From: thomas-art <60135827+thomas-art@users.noreply.github.com> Date: Wed, 27 Apr 2022 11:53:20 +0800 Subject: [PATCH] Update download.py --- cloudmusic/download.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/cloudmusic/download.py b/cloudmusic/download.py index 3f6893b..9807105 100644 --- a/cloudmusic/download.py +++ b/cloudmusic/download.py @@ -1,9 +1,9 @@ from . import musicObj - -import urllib import os +import urllib import threadpool import time +import sys @@ -14,16 +14,31 @@ def download(dirs, music): artist = "" for ar in music.artist: artist += ar + " " + music.name = music.name.replace("/", "&") + music.name = music.name.replace("*", "&") + if not artist is None: + artist = artist.replace("/", "&") + artist = artist.replace("*", "&") name = music.name + " - " + artist + "." + music.type if not dirs: - dirs = "cloudmusic\\" + name - defalut_dirs = str(os.getcwd()) + '\\cloudmusic' + + if sys.platform == "darwin": + path1 = "cloudmusic/" + path2 = "/cloudmusic" + path3 = "/" + else : + path1 = "cloudmusic\\" + path2 = "\\cloudmusic" + path3 = "\\" + + dirs = path1 + name + defalut_dirs = str(os.getcwd()) + path2 isExist = os.path.exists(defalut_dirs) if not isExist: os.makedirs(defalut_dirs) else : - dirs += "\\" + name + dirs += path3 + name # 超时重连 for t in range(5):