github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-13 00:32:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix downloading export file

Browse source
This commit is contained in:
JonnyWong16 2020-08-03 16:25:01 -07:00
parent 91d545f480
commit d5e91801d6
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plexpy/webserve.py
View file

@ -6507,7 +6507,6 @@ class WebInterface(object):
'message': 'Metadata export has started. Check the logs to monitor any problems.'} 'message': 'Metadata export has started. Check the logs to monitor any problems.'}
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def download_export(self, row_id=None, **kwargs): def download_export(self, row_id=None, **kwargs):
@ -6526,7 +6525,7 @@ class WebInterface(object):
""" """
result = exporter.get_export(export_id=row_id) result = exporter.get_export(export_id=row_id)
if result and result['complete'] and result['exists']: if result and result['complete'] and result['exists']:
serve_download(path=exporter.get_export_filepath(result['filename']), name=result['filename']) return serve_download(exporter.get_export_filepath(result['filename']), name=result['filename'])
else: else:
if result and not result.get('complete'): if result and not result.get('complete'):
msg = 'Export is still being processed.' msg = 'Export is still being processed.'
@ -6534,7 +6533,8 @@ class WebInterface(object):
msg = 'Export file does not exist.' msg = 'Export file does not exist.'
else: else:
msg = 'Invalid row_id provided.' msg = 'Invalid row_id provided.'
return {'result': 'error', 'message': msg} cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
return json.dumps({'result': 'error', 'message': msg}).encode('utf-8')
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()