diff --git a/dsbm/K.I.Z/Hurra die Welt geht unter/Ariane.mp3.part b/dsbm/K.I.Z/Hurra die Welt geht unter/Ariane.mp3.part new file mode 100644 index 0000000..bf1eab5 Binary files /dev/null and b/dsbm/K.I.Z/Hurra die Welt geht unter/Ariane.mp3.part differ diff --git a/src/download.py b/src/download.py index 41db5d2..21e7f65 100644 --- a/src/download.py +++ b/src/download.py @@ -129,7 +129,7 @@ class Download: src = row['src'] if src == 'musify': - self.download_from_musify(row['path'], row['file'], row['url']) + musify.download(row) elif src == 'youtube': youtube_music.download(row) self.write_metadata(row, row['file']) @@ -142,18 +142,6 @@ class Download: os.makedirs(path, exist_ok=True) return False - def download_from_musify(self, path, file, url): - logging.info(f"downloading: '{url}'") - r = self.session.get(url) - if r.status_code != 200: - if r.status_code == 404: - logging.warning(f"{url} was not found") - return -1 - raise ConnectionError(f"\"{url}\" returned {r.status_code}: {r.text}") - with open(file, "wb") as mp3_file: - mp3_file.write(r.content) - logging.info("finished") - def write_metadata(self, row, filePath): AudioSegment.from_file(filePath).export(filePath, format="mp3") diff --git a/src/musify.py b/src/musify.py index fb02f46..e2337c5 100644 --- a/src/musify.py +++ b/src/musify.py @@ -33,3 +33,20 @@ def get_download_link(default_url): logging.info(f"https://musify.club/track/dl/{musify_id}/{musify_name}.mp3") return f"https://musify.club/track/dl/{musify_id}/{musify_name}.mp3" + +def download_from_musify(path, file, url): + logging.info(f"downloading: '{url}'") + r = session.get(url) + if r.status_code != 200: + if r.status_code == 404: + logging.warning(f"{url} was not found") + return -1 + raise ConnectionError(f"\"{url}\" returned {r.status_code}: {r.text}") + with open(file, "wb") as mp3_file: + mp3_file.write(r.content) + logging.info("finished") + +def download(row): + url = row['url'] + file_ = row['file'] + return download_from_musify(file_, url)