diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index d5a56245..74f04d3f 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -288,9 +288,9 @@ def serve_template(templatename, **kwargs): try: template = _hplookup.get_template(templatename) - return template.render(**kwargs) + return template.render(**kwargs), False except: - return exceptions.html_error_template().render() + return exceptions.html_error_template().render(), True def generate_newsletter_uuid(): @@ -376,6 +376,7 @@ class Newsletter(object): self.newsletter = None self.is_preview = False + self.template_error = None def set_config(self, config=None, default=None): return self._validate_config(config=config, default=default) @@ -421,7 +422,7 @@ class Newsletter(object): self.retrieve_data() - newsletter_rendered = serve_template( + newsletter_rendered, self.template_error = serve_template( templatename=self._TEMPLATE, uuid=self.uuid, subject=self.subject_formatted, @@ -432,6 +433,9 @@ class Newsletter(object): preview=self.is_preview ) + if self.template_error: + return newsletter_rendered + # Force Tautulli footer if '' in newsletter_rendered: newsletter_rendered = newsletter_rendered.replace( @@ -439,7 +443,7 @@ class Newsletter(object): 'Newsletter generated by Tautulli.' ) - return newsletter_rendered + else: msg = ('
Tautulli.
Thank you.'
'