diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 18200892..bd331f2c 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -335,18 +335,12 @@ -
- Note: With Aria2, you can specify a different download directory for downloads sent from Headphones. - Set it in the Music Download Directory below -
- -
- Full path where your direct download client downloads your music, e.g. /Users/name/Downloads/music + Full path where ddl client downloads your music, e.g. /Users/name/Downloads/music
diff --git a/headphones/deezloader.py b/headphones/deezloader.py index 09eb60d9..8de85df9 100644 --- a/headphones/deezloader.py +++ b/headphones/deezloader.py @@ -350,7 +350,6 @@ def decryptTracks(paths): decrypted_tracks[album_folder][disk_number] = {} decrypted_tracks[album_folder][disk_number][track_number] = track - decrypted_tracks[album_folder][disk_number][track_number]['path'] = path except Exception as e: logger.error(u'Unable to load deezer track infos "%s": %s' % (path, e)) @@ -372,7 +371,7 @@ def decryptTracks(paths): # Decrypt track if not already done if not os.path.exists(dest): try: - __decryptDownload(track['path'], track['SNG_ID'], dest) + __decryptDownload(path, sng_id, dest) __tagTrack(dest, track) except Exception as e: logger.error(u'Unable to decrypt deezer track "%s": %s' % (path, e)) diff --git a/headphones/searcher.py b/headphones/searcher.py index fdef6153..f6554cb1 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -894,10 +894,7 @@ def send_to_downloader(data, bestqual, album): if track: filename = track['SNG_ID'] + '.dzr' logger.debug(u'Sending song "%s" to Aria' % track['SNG_TITLE']) - getAria2RPC().addUri( - [track['downloadUrl']], - {'out': filename, 'auto-file-renaming': 'false', 'continue': 'true', - 'dir': os.path.join(headphones.CONFIG.DOWNLOAD_DDL_DIR, folder_name)}) + getAria2RPC().addUri([track['downloadUrl']], {'out': filename, 'auto-file-renaming': 'false', 'continue': 'true', 'dir': folder_name}) except Exception as e: logger.error(u'Error sending torrent to Aria2. Are you sure it\'s running? (%s)' % e)