iheanyi
/
bandcamp-dl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7 from bjesus/master 

Allow all characters for title, artist and album
master
Iheanyi Ekechukwu 2014-06-01 19:14:22 -05:00
parent 57404f5a37 20e6b557c5
commit 328bc85243
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bandcamp-dl/Bandcamp.py
View File

@ -63,18 +63,6 @@ class Bandcamp:
return new_track return new_track
def get_embed_string_block(self, request):
embedBlock = request.text.split("var EmbedData = ")
embedStringBlock = embedBlock[1]
embedStringBlock = unicodedata.normalize('NFKD', embedStringBlock).encode('ascii', 'ignore')
embedStringBlock = embedStringBlock.split("};")[0] + "};"
embedStringBlock = jsobj.read_js_object("var EmbedData = %s" % str(embedStringBlock))
return embedStringBlock
def extract_album_meta_data(self, request): def extract_album_meta_data(self, request):
album = {} album = {}
@ -83,14 +71,13 @@ class Bandcamp:
block = request.text.split("var TralbumData = ") block = request.text.split("var TralbumData = ")
stringBlock = block[1] stringBlock = block[1]
stringBlock = unicodedata.normalize('NFKD', stringBlock).encode('ascii', 'ignore')
stringBlock = stringBlock.split("};")[0] + "};" stringBlock = stringBlock.split("};")[0] + "};"
stringBlock = jsobj.read_js_object("var TralbumData = %s" % str(stringBlock)) stringBlock = jsobj.read_js_object("var TralbumData = %s" % stringBlock)
album['title'] = embedData['EmbedData']['album_title'] album['title'] = embedData['EmbedData']['album_title']
album['artist'] = stringBlock['TralbumData']['artist'] album['artist'] = stringBlock['TralbumData']['artist']
album['tracks'] = stringBlock['TralbumData']['trackinfo'] album['tracks'] = stringBlock['TralbumData']['trackinfo']
return album return album
@ -108,8 +95,7 @@ class Bandcamp:
embedBlock = request.text.split("var EmbedData = ") embedBlock = request.text.split("var EmbedData = ")
embedStringBlock = embedBlock[1] embedStringBlock = embedBlock[1]
embedStringBlock = unicodedata.normalize('NFKD', embedStringBlock).encode('ascii', 'ignore')
embedStringBlock = embedStringBlock.split("};")[0] + "};" embedStringBlock = embedStringBlock.split("};")[0] + "};"
embedStringBlock = jsobj.read_js_object("var EmbedData = %s" % str(embedStringBlock)) embedStringBlock = jsobj.read_js_object("var EmbedData = %s" % embedStringBlock)
return embedStringBlock return embedStringBlock

4
bandcamp-dl/BandcampDownloader.py
View File

@ -39,7 +39,7 @@ class BandcampDownloader():
path = path.replace("%{album}", track['album']) path = path.replace("%{album}", track['album'])
path = path.replace("%{track}", track['track']) path = path.replace("%{track}", track['track'])
path = path.replace("%{title}", track['title']) path = path.replace("%{title}", track['title'])
path = "{0}/{1}.{2}".format(self.directory, path, "mp3") path = u"{0}/{1}.{2}".format(self.directory, path, "mp3")
return path return path
@ -63,7 +63,7 @@ class BandcampDownloader():
filename = self.template_to_path(track_meta) filename = self.template_to_path(track_meta)
dirname = self.create_directory(filename) dirname = self.create_directory(filename)
try: try:
tmp_file = wgetter.download(track['url'], outdir=dirname) tmp_file = wgetter.download(track['url'], outdir=dirname)
os.rename(tmp_file, filename) os.rename(tmp_file, filename)