flyingrub
/
scdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass title to get_filename (#171) 

title was unbound in get_filename as a result of an incomplete refactor.
Rebind by passing the title in.
master
tPenguinLTG 2017-01-29 06:46:36 -05:00 committed by Ronan
parent ae3cff24fa
commit 7d0193c4e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scdl/scdl.py
View File

@ -351,7 +351,7 @@ def download_all_of_a_page(tracks):
logger.info('\nTrack n°{0}'.format(counter))
download_track(track)
def get_filename(track):
def get_filename(track, title):
username = track['user']['username']
if username not in title and arguments['--addtofile']:
title = '{0} - {1}'.format(username, title)
@ -381,15 +381,15 @@ def download_track(track, playlist_name=None, playlist_file=None):
r = requests.get(original_url, params={'client_id': CLIENT_ID}, stream=True)
if r.status_code == 401:
logger.info('The original file has no download left.')
filename = get_filename(track)
filename = get_filename(track, title)
else:
d = r.headers['content-disposition']
if d:
filename = re.findall("filename=(.+)", d)[0][1:-1]
else:
filename = get_filename(track)
filename = get_filename(track, title)
else:
filename = get_filename(track)
filename = get_filename(track, title)
invalid_chars = '\/:*?|<>"'
filename = ''.join(c for c in filename if c not in invalid_chars)