This commit is contained in:
Rodney Ewing 2013-08-14 16:07:27 -07:00
parent a2f501982a
commit 63021eb609
4 changed files with 9 additions and 8 deletions

View File

@ -224,14 +224,15 @@ class Resizer(CommonAsciiProcessor):
parser.add_argument( parser.add_argument(
'file', 'file',
nargs='?', nargs='?',
default='thumb') default='thumb',
choices=['thumb'])
return parser return parser
@classmethod @classmethod
def args_to_request(cls, args): def args_to_request(cls, args):
return request_from_args( return request_from_args(
args, ['size', 'file']) args, ['thumb_size', 'file'])
def process(self, thumb_size=None, file=None): def process(self, thumb_size=None, file=None):
self.common_setup() self.common_setup()

View File

@ -168,7 +168,7 @@ class CommonImageProcessor(MediaProcessor):
if not quality: if not quality:
quality = self.image_config['quality'] quality = self.image_config['quality']
if not filter: if not filter:
filter = self.image_config['filter'] filter = self.image_config['resize_filter']
resize_tool(self.entry, True, 'thumb', self.orig_filename, resize_tool(self.entry, True, 'thumb', self.orig_filename,
self.name_builder.fill('{basename}.thumbnail{ext}'), self.name_builder.fill('{basename}.thumbnail{ext}'),
@ -255,7 +255,7 @@ class InitialProcessor(CommonImageProcessor):
self.common_setup() self.common_setup()
self.generate_medium_if_applicable(size=size, filter=filter, self.generate_medium_if_applicable(size=size, filter=filter,
quality=quality) 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.copy_original()
self.extract_metadata() self.extract_metadata()
self.delete_queue_file() self.delete_queue_file()

View File

@ -254,7 +254,7 @@ class CommonPdfProcessor(MediaProcessor):
if self.name_builder.ext == 'pdf': if self.name_builder.ext == 'pdf':
self.pdf_filename = self.orig_filename self.pdf_filename = self.orig_filename
elif self.entry.media_files.get('pdf'): 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']) mgg.public_store, self.entry.media_files['pdf'])
else: else:
self.pdf_filename = self._generate_pdf() self.pdf_filename = self._generate_pdf()
@ -328,7 +328,7 @@ class CommonPdfProcessor(MediaProcessor):
# since pdftocairo added '.png', we need to include it with the # since pdftocairo added '.png', we need to include it with the
# filename # filename
store_public(self.entry, 'thumb', filename + '.png', store_public(self.entry, 'medium', filename + '.png',
self.name_builder.fill('{basename}.medium.png')) self.name_builder.fill('{basename}.medium.png'))

View File

@ -249,7 +249,7 @@ class InitialProcessor(CommonStlProcessor):
type=int) type=int)
parser.add_argument( parser.add_argument(
'--thumb-size', '--thumb_size',
nargs=2, nargs=2,
metavar=('max_width', 'max_height'), metavar=('max_width', 'max_height'),
type=int) type=int)
@ -320,7 +320,7 @@ class Resizer(CommonStlProcessor):
self.generate_frontview(size=size) self.generate_frontview(size=size)
self.generate_sideview(size=size) self.generate_sideview(size=size)
elif file == 'thumb': elif file == 'thumb':
self.generate_thumb(size=size) self.generate_thumb(thumb_size=size)
class StlProcessingManager(ProcessingManager): class StlProcessingManager(ProcessingManager):