From cd2860f4e373cdd7c358bc1bf5204d7944d8d0e6 Mon Sep 17 00:00:00 2001
From: Kallys <kallys@openmailbox.org>
Date: Sun, 30 Apr 2017 14:00:10 +0200
Subject: [PATCH] Fix #2930 Fix #2931

---
 data/interfaces/default/config.html | 8 +++++++-
 headphones/deezloader.py            | 3 ++-
 headphones/searcher.py              | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index bd331f2c..18200892 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -335,12 +335,18 @@
                                     </label>
                                     <input type="text" name="aria_token" value="${config['aria_token']}" size="36">
                                 </div>
+                                <div class="row">
+                                    <small>Note: With Aria2, you can specify a different download directory for downloads sent from Headphones.
+                                    Set it in the Music Download Directory below</small>
+                                </div>
+                            </fieldset>
+                            <fieldset id="general_ddl_options">
                                 <div class="row">
                                     <label title="Path to folder where Headphones can find the downloads.">
                                         Music Download Directory:
                                     </label>
                                     <input type="text" name="download_ddl_dir" value="${config['download_ddl_dir']}" size="50">
-                                    <small>Full path where ddl client downloads your music, e.g. /Users/name/Downloads/music</small>
+                                    <small>Full path where your direct download client downloads your music, e.g. /Users/name/Downloads/music</small>
                                 </div>
                             </fieldset>
                         </td>
diff --git a/headphones/deezloader.py b/headphones/deezloader.py
index 8de85df9..09eb60d9 100644
--- a/headphones/deezloader.py
+++ b/headphones/deezloader.py
@@ -350,6 +350,7 @@ 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))
@@ -371,7 +372,7 @@ def decryptTracks(paths):
                     # Decrypt track if not already done
                     if not os.path.exists(dest):
                         try:
-                            __decryptDownload(path, sng_id, dest)
+                            __decryptDownload(track['path'], track['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 f6554cb1..fdef6153 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -894,7 +894,10 @@ 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': folder_name})
+                        getAria2RPC().addUri(
+                            [track['downloadUrl']],
+                            {'out': filename, 'auto-file-renaming': 'false', 'continue': 'true',
+                             'dir': os.path.join(headphones.CONFIG.DOWNLOAD_DDL_DIR, folder_name)})
 
             except Exception as e:
                 logger.error(u'Error sending torrent to Aria2. Are you sure it\'s running? (%s)' % e)