From: Rodney Ewing Date: Wed, 21 Aug 2013 23:03:34 +0000 (-0700) Subject: skip ascii thumb resizing if necessary X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fd9e4af2721dd242382df8ddc0b5189fb521181c;p=mediagoblin.git skip ascii thumb resizing if necessary --- diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index 9b6b3ad4..60b21c55 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -120,6 +120,9 @@ class CommonAsciiProcessor(MediaProcessor): thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_resizing(font, thumb_size): + return + tmp_thumb = os.path.join( self.conversions_subdir, self.name_builder.fill('{basename}.thumbnail.png')) @@ -144,10 +147,33 @@ class CommonAsciiProcessor(MediaProcessor): Image.ANTIALIAS) thumb.save(thumb_file) + thumb_info = {'font': font, + 'width': thumb_size[0], + 'height': thumb_size[1]} + + self.entry.set_file_metadata('thumb', **thumb_info) + _log.debug('Copying local file to public storage') store_public(self.entry, 'thumb', tmp_thumb, self.name_builder.fill('{basename}.thumbnail.jpg')) + def _skip_resizing(self, font, thumb_size): + thumb_info = self.entry.get_file_metadata('thumb') + + if not thumb_info: + return False + + skip = True + + if thumb_info.get('font') != font: + skip = False + elif thumb_info.get('width') != thumb_size[0]: + skip = False + elif thumb_info.get('height') != thumb_size[1]: + skip = False + + return skip + class InitialProcessor(CommonAsciiProcessor): """