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

Improve exporter API error messages

Browse source
This commit is contained in:
JonnyWong16 2020-09-27 15:30:10 -07:00
parent 0a60d5f2b2
commit 02d4a3b9fe
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
plexpy/exporter.py
View file

@ -74,8 +74,8 @@ class Export(object):
def __init__(self, section_id=None, rating_key=None, file_format='json',
metadata_level=1, media_info_level=1, include_images=False,
custom_fields=''):
self.section_id = helpers.cast_to_int(section_id)
self.rating_key = helpers.cast_to_int(rating_key)
self.section_id = helpers.cast_to_int(section_id) or None
self.rating_key = helpers.cast_to_int(rating_key) or None
self.file_format = file_format
self.metadata_level = helpers.cast_to_int(metadata_level)
self.media_info_level = helpers.cast_to_int(media_info_level)
@ -1396,24 +1396,19 @@ class Export(object):
return _media_types[media_type]()
def export(self):
msg = ''
if not self.section_id and not self.rating_key:
logger.error("Tautulli Exporter :: Export called but no section_id or rating_key provided.")
return
elif self.rating_key and not str(self.rating_key).isdigit():
logger.error("Tautulli Exporter :: Export called with invalid rating_key '%s'.", self.rating_key)
return
elif self.section_id and not str(self.section_id).isdigit():
logger.error("Tautulli Exporter :: Export called with invalid section_id '%s'.", self.section_id)
return
msg = "Export called but no section_id or rating_key provided."
elif self.metadata_level not in self.METADATA_LEVELS:
logger.error("Tautulli Exporter :: Export called with invalid metadata_level '%s'.", self.metadata_level)
return
msg = "Export called with invalid metadata_level '{}'.".format(self.metadata_level)
elif self.media_info_level not in self.MEDIA_INFO_LEVELS:
logger.error("Tautulli Exporter :: Export called with invalid media_info_level '%s'.", self.media_info_level)
return
msg = "Export called with invalid media_info_level '{}'.".format(self.media_info_level)
elif self.file_format not in ('json', 'csv'):
logger.error("Tautulli Exporter :: Export called but invalid file_format '%s' provided.", self.file_format)
return
msg = "Export called with invalid file_format '{}'.".format(self.file_format)
if msg:
logger.error("Tautulli Exporter :: %s", msg)
return msg
plex = Plex(plexpy.CONFIG.PMS_URL, plexpy.CONFIG.PMS_TOKEN)
@ -1463,11 +1458,14 @@ class Export(object):
self.items = library.all()
else:
return
msg = "Export called but no section_id or rating_key provided."
logger.error("Tautulli Exporter :: %s", msg)
return msg
if self.media_type not in self.MEDIA_TYPES:
logger.error("Tautulli Exporter :: Cannot export media type '%s'", self.media_type)
return
msg = "Cannot export media type '{}'.".format(self.media_type)
logger.error("Tautulli Exporter :: %s", msg)
return msg
if self.include_images and self.media_type not in ('movie', 'show', 'season', 'artist', 'album'):
self.include_images = False
@ -1477,8 +1475,9 @@ class Export(object):
self.filename = '{}.{}'.format(helpers.clean_filename(filename), self.file_format)
self.export_id = self.add_export()
if not self.export_id:
logger.error("Tautulli Exporter :: Failed to export '%s'", self.filename)
return
msg = "Failed to export '{}'.".format(self.filename)
logger.error("Tautulli Exporter :: %s", msg)
return msg
threading.Thread(target=self._real_export).start()

4
plexpy/webserve.py
View file

@ -6524,10 +6524,10 @@ class WebInterface(object):
include_images=helpers.bool_true(include_images),
custom_fields=custom_fields).export()
if result:
if result is True:
return {'result': 'success', 'message': 'Metadata export has started.'}
else:
return {'result': 'error', 'message': 'Failed to export metadata.'}
return {'result': 'error', 'message': result}
@cherrypy.expose
@requireAuth(member_of("admin"))