diff options
| -rw-r--r-- | mediagoblin/media_types/ascii/processing.py | 5 | ||||
| -rw-r--r-- | mediagoblin/media_types/image/processing.py | 4 | ||||
| -rw-r--r-- | mediagoblin/media_types/pdf/processing.py | 4 | ||||
| -rw-r--r-- | mediagoblin/media_types/stl/processing.py | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index e11ac91e..6ba432e2 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -224,14 +224,15 @@ class Resizer(CommonAsciiProcessor): parser.add_argument( 'file', nargs='?', - default='thumb') + default='thumb', + choices=['thumb']) return parser @classmethod def args_to_request(cls, args): return request_from_args( - args, ['size', 'file']) + args, ['thumb_size', 'file']) def process(self, thumb_size=None, file=None): self.common_setup() diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index ef415496..c29030c9 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -168,7 +168,7 @@ class CommonImageProcessor(MediaProcessor): if not quality: quality = self.image_config['quality'] if not filter: - filter = self.image_config['filter'] + filter = self.image_config['resize_filter'] resize_tool(self.entry, True, 'thumb', self.orig_filename, self.name_builder.fill('{basename}.thumbnail{ext}'), @@ -255,7 +255,7 @@ class InitialProcessor(CommonImageProcessor): self.common_setup() self.generate_medium_if_applicable(size=size, filter=filter, quality=quality) - self.generate_thumb(size=thumb_sizei, filter=filter, quality=quality) + self.generate_thumb(size=thumb_size, filter=filter, quality=quality) self.copy_original() self.extract_metadata() self.delete_queue_file() diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py index f8aea7bb..fdf4b161 100644 --- a/mediagoblin/media_types/pdf/processing.py +++ b/mediagoblin/media_types/pdf/processing.py @@ -254,7 +254,7 @@ class CommonPdfProcessor(MediaProcessor): if self.name_builder.ext == 'pdf': self.pdf_filename = self.orig_filename elif self.entry.media_files.get('pdf'): - self.pdf_filename = self.workbench.local_file( + self.pdf_filename = self.workbench.localized_file( mgg.public_store, self.entry.media_files['pdf']) else: self.pdf_filename = self._generate_pdf() @@ -328,7 +328,7 @@ class CommonPdfProcessor(MediaProcessor): # since pdftocairo added '.png', we need to include it with the # filename - store_public(self.entry, 'thumb', filename + '.png', + store_public(self.entry, 'medium', filename + '.png', self.name_builder.fill('{basename}.medium.png')) diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 55938c06..fc8c10b6 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -249,7 +249,7 @@ class InitialProcessor(CommonStlProcessor): type=int) parser.add_argument( - '--thumb-size', + '--thumb_size', nargs=2, metavar=('max_width', 'max_height'), type=int) @@ -320,7 +320,7 @@ class Resizer(CommonStlProcessor): self.generate_frontview(size=size) self.generate_sideview(size=size) elif file == 'thumb': - self.generate_thumb(size=size) + self.generate_thumb(thumb_size=size) class StlProcessingManager(ProcessingManager): |