gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-03-17 18:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix #2930"

Browse Source 
This reverts commit cd2860f4e3.
This commit is contained in:
Kallys
2017-05-02 13:41:29 +02:00
parent d802948a35
commit e3c7790039
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/interfaces/default/config.html
View File

@@ -335,18 +335,12 @@
</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 your direct download client downloads your music, e.g. /Users/name/Downloads/music</small>
<small>Full path where ddl client downloads your music, e.g. /Users/name/Downloads/music</small>
</div>
</fieldset>
</td>

3
headphones/deezloader.py
View File

@@ -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))

5
headphones/searcher.py
View File

@@ -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)