From b4c1e57963e6a646c0d20c6d99dfd667a9952290 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 25 Jan 2017 16:34:05 +0100 Subject: [PATCH] let this work please --- catalogue/models.py | 4 ++-- catalogue/publish.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/catalogue/models.py b/catalogue/models.py index f518743..9bd5f7e 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -159,9 +159,9 @@ class Lesson(models.Model): if attachments is None: attachments = {} for attachment in self.attachment_set.all(): - full_name = os.path.join(settings.MEDIA_ROOT, '%s.%s' % (attachment.file.name, attachment.ext)) + full_name = os.path.join(settings.MEDIA_ROOT, attachment.file.name) f = IOFile.from_filename(full_name) - attachments[attachment.slug] = f + attachments['%s.%s' % (attachment.slug, attachment.ext)] = f infile = IOFile.from_filename(self.xml_file.path, attachments=attachments) Lesson.publish(infile) if repackage_level: diff --git a/catalogue/publish.py b/catalogue/publish.py index 89c76a1..bc2e37a 100755 --- a/catalogue/publish.py +++ b/catalogue/publish.py @@ -40,7 +40,11 @@ def get_image(src_img_path, width=None, default_width=1600, formats=('PNG', 'JPE if convert: if width is None: width = default_width - return get_thumbnail(src_img_path, '%sx%s' % (width, 10*width)) + try: + return get_thumbnail(src_img_path, '%sx%s' % (width, 10*width)) + except: + # hard to predict what solr raises on invalid image + return None else: return None -- 2.20.1