Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-21 16:13:38 +01:00
Code Issues Projects Releases Wiki Activity

Add unicode support for Python 2 and 3

Browse source 
Converts bytes to unicode using util.text_string, assuming that the
string is a UTF-8 string.
If that fails, it falls back to a hardcoded fallback filename.
This commit is contained in:
Waweic 2018-03-01 19:45:44 +01:00
parent 4df313e3ce
commit d0fd41b474
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
beetsplug/web/__init__.py
View file

@ -225,12 +225,19 @@ def item_file(item_id):
item_path = util.syspath(item.path)
else:
item_path = util.py3_path(item.path)
try:
os.path.basename(util.py3_path(item.path)).encode("latin-1", "strict") #Imitate http.server behaviour
response = flask.send_file(item_path,as_attachment=True)
except UnicodeEncodeError:
response = flask.send_file(item_path,as_attachment=True, attachment_filename=unidecode(os.path.basename(util.py3_path(item.path))))
try:
unicode_item_path = util.text_string(item.path)
except:
unicode_item_path = u"fallback" + os.path.splitext(item_path)[1]
try:
os.path.basename(unicode_item_path).encode("latin-1", "strict") #Imitate http.server behaviour
safe_filename = os.path.basename(unicode_item_path)
except:
safe_filename = unidecode(os.path.basename(unicode_item_path))
response = flask.send_file(item_path,as_attachment=True, attachment_filename=safe_filename)
response.headers['Content-Length'] = os.path.getsize(item_path)
return response