|
|
@@ -7,6 +7,7 @@ from settings import Settings
|
|
|
import math
|
|
|
import urllib.parse
|
|
|
import json
|
|
|
+import os
|
|
|
|
|
|
|
|
|
def download(item, type='GET', parameters=None, headers=None, cookies=None, stream=True):
|
|
|
@@ -28,13 +29,13 @@ def download(item, type='GET', parameters=None, headers=None, cookies=None, stre
|
|
|
notExist(item)
|
|
|
return
|
|
|
|
|
|
- name = urllib.parse.unquote(item.title)
|
|
|
+ name = urllib.parse.unquote('{x.artist} - {x.title}'.format(x=item))
|
|
|
|
|
|
if not name.endswith('.mp3'):
|
|
|
console.output('Assuming it\'s a mp3 file', console.DBG_INFO)
|
|
|
name = name + '.mp3'
|
|
|
|
|
|
- full_name = '{0}/{1}'.format(Settings.SaveDir, name)
|
|
|
+ full_name = '{0}/{1}'.format(Settings.tmpDir, name)
|
|
|
|
|
|
size = file.headers.get('content-length')
|
|
|
|
|
|
@@ -73,6 +74,9 @@ def savefileprogress(name, full_name, file, size, item):
|
|
|
|
|
|
console.output('Download of {0} completed!'.format(name))
|
|
|
|
|
|
+ full_save_name = '{0}/{1}'.format(Settings.SaveDir, name)
|
|
|
+ os.rename(full_name, full_save_name)
|
|
|
+
|
|
|
|
|
|
def notExist(item):
|
|
|
console.output('{x.title} at {x.download_url} does not exist'.format(x=item))
|