From c74e82ba964a759aeb912e8616a76910ed51ff02 Mon Sep 17 00:00:00 2001 From: Anthony Forsberg Date: Thu, 12 Jan 2017 19:36:21 -0500 Subject: [PATCH] Changes that I should not have merged from master into 0.0.7 --- bandcamp_dl/bandcamp_dl.py | 2 +- bandcamp_dl/bandcampdownloader.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bandcamp_dl/bandcamp_dl.py b/bandcamp_dl/bandcamp_dl.py index a008967..dc84a91 100755 --- a/bandcamp_dl/bandcamp_dl.py +++ b/bandcamp_dl/bandcamp_dl.py @@ -51,7 +51,7 @@ from .bandcampdownloader import BandcampDownloader def main(): - arguments = docopt(__doc__, version='bandcamp-dl 0.0.7') + arguments = docopt(__doc__, version='bandcamp-dl 0.0.7-01') bandcamp = Bandcamp() basedir = arguments['--base-dir'] or os.getcwd() diff --git a/bandcamp_dl/bandcampdownloader.py b/bandcamp_dl/bandcampdownloader.py index d2022bb..45115a9 100644 --- a/bandcamp_dl/bandcampdownloader.py +++ b/bandcamp_dl/bandcampdownloader.py @@ -53,7 +53,7 @@ class BandcampDownloader: path = path.replace("%{title}", slugify(track['title'])) path = u"{0}/{1}.{2}".format(self.directory, path, "mp3") - return path.encode('utf-8') + return path @staticmethod def create_directory(filename: str) -> str: @@ -139,7 +139,7 @@ class BandcampDownloader: self.write_id3_tags(filepath, track_meta) if album['art']: try: - with open("{}/cover.jpg".format(dirname), "wb") as f: + with open(dirname + "/cover.jpg", "wb") as f: r = requests.get(album['art'], stream=True) f.write(r.content) except Exception as e: diff --git a/setup.py b/setup.py index a7c323c..eb6074f 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ here = path.abspath(path.dirname(__file__)) setup( name='bandcamp-downloader', - version='0.0.7', + version='0.0.7-01', description='bandcamp-dl downloads albums and tracks from Bandcamp for you', long_description=open('README.rst').read(), url='https://github.com/iheanyi/bandcamp-dl',