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

Make export work on Python 2 and set failed state

Browse source
This commit is contained in:
JonnyWong16 2020-08-03 18:12:43 -07:00
parent 58292067f0
commit e256d2080d
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 62 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/webserve.py
View file

@ -919,6 +919,7 @@ class WebInterface(object):
dt_columns = [("timestamp", True, False),
("media_type_title", True, True),
("rating_key", True, True),
("file_format", True, True),
("filename", True, True),
("complete", True, False)]
kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
@ -6524,11 +6525,13 @@ class WebInterface(object):
```
"""
result = exporter.get_export(export_id=row_id)
if result and result['complete'] and result['exists']:
if result and result['complete'] == 1 and result['exists']:
return serve_download(exporter.get_export_filepath(result['filename']), name=result['filename'])
else:
if result and not result.get('complete'):
if result and result.get('complete') == 0:
msg = 'Export is still being processed.'
elif result and result.get('complete') == -1:
msg = 'Export failed to process.'
elif result and not result.get('exists'):
msg = 'Export file does not exist.'
else: