typos
authorRodney Ewing <ewing.rj@gmail.com>
Wed, 14 Aug 2013 23:07:27 +0000 (16:07 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Fri, 16 Aug 2013 22:30:22 +0000 (15:30 -0700)
mediagoblin/media_types/ascii/processing.py
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/pdf/processing.py
mediagoblin/media_types/stl/processing.py

index e11ac91eea8a65f38a6d2435d7c0e4b558e01854..6ba432e21b85721b8e0cb54ba9021df8bed01889 100644 (file)
@@ -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()
index ef4154963f66e364bbd0947271713fc1b6e883d8..c29030c9c854f3860890776353b2e33f517f0f84 100644 (file)
@@ -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()
index f8aea7bbaa1e4bee4f50996a82bf9c49981761aa..fdf4b161ffc74ab545199f41294b95ceda27230b 100644 (file)
@@ -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'))
 
 
index 55938c06f32e573f4955b8bb283b52fce5eb260c..fc8c10b60c97563499926655be92e6b5af59a929 100644 (file)
@@ -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):