heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

very rough working version of image reprocessing

Browse Source
This commit is contained in:
Rodney Ewing 2013-08-02 13:18:35 -07:00
parent f30fbfe60c
commit 49db778579
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/media_types/image/__init__.py
View File

@ -86,7 +86,8 @@ def _parser(args):
'--resize') '--resize')
parser.add_argument( parser.add_argument(
'--size', '--size',
nargs=2) nargs=2,
type=int)
parser.add_argument( parser.add_argument(
'--initial_processing', '--initial_processing',
action='store_true') action='store_true')
@ -103,14 +104,14 @@ def _check_eligible(entry_args, reprocess_args):
if entry_args.state == 'failed': if entry_args.state == 'failed':
if reprocess_args.resize: if reprocess_args.resize:
raise Exception(_('You can not run --resize on media that has not' raise Exception(_('You can not run --resize on media that has not'
'been processed.')) ' been processed.'))
if reprocess_args.size: if reprocess_args.size:
_log.warn('With --initial_processing, the --size flag will be' _log.warn('With --initial_processing, the --size flag will be'
' ignored.') ' ignored.')
if entry_args.state == 'processing': if entry_args.state == 'processing':
raise Exception(_('We currently do not support reprocessing on media' raise Exception(_('We currently do not support reprocessing on media'
'that is in the "processing" state.')) ' that is in the "processing" state.'))
def media_reprocess(args): def media_reprocess(args):
@ -133,15 +134,15 @@ def media_reprocess(args):
# For now we can only reprocess with the original file # For now we can only reprocess with the original file
if not entry.media_files.get('original'): if not entry.media_files.get('original'):
raise Exception(_('The original file for this media entry' raise Exception(_('The original file for this media entry'
'does not exist.')) ' does not exist.'))
reprocess_info = {'resize': reprocess_args.resize} reprocess_info = {'resize': reprocess_args.resize}
if reprocess_args.size and len(reprocess_args.size) == 2: if reprocess_args.size:
reprocess_info['max_width'] = reprocess_args.size[0] reprocess_info['max_width'] = reprocess_args.size[0]
reprocess_info['max_height'] = reprocess_args.size[1] reprocess_info['max_height'] = reprocess_args.size[1]
run_process_media(entry, reprocess_info) run_process_media(entry, reprocess_info=reprocess_info)
else: else:
raise Exception(_('The --resize flag must set either "thumb"' raise Exception(_('The --resize flag must set either "thumb"'

22
mediagoblin/media_types/image/processing.py
View File

@ -73,10 +73,8 @@ def resize_image(proc_state, resized, keyname, target_name, new_size,
proc_state.store_public(keyname, tmp_resized_filename, target_name) proc_state.store_public(keyname, tmp_resized_filename, target_name)
def resize_tool(proc_state, force, keyname, target_name, def resize_tool(proc_state, force, keyname, filename, target_name,
conversions_subdir, exif_tags, new_size=None): conversions_subdir, exif_tags, new_size=None):
# filename -- the filename of the original image being resized
filename = proc_state.get_queued_filename()
if not new_size: if not new_size:
max_width = mgg.global_config['media:' + keyname]['max_width'] max_width = mgg.global_config['media:' + keyname]['max_width']
max_height = mgg.global_config['media:' + keyname]['max_height'] max_height = mgg.global_config['media:' + keyname]['max_height']
@ -90,8 +88,8 @@ def resize_tool(proc_state, force, keyname, target_name,
except IOError: except IOError:
raise BadMediaFail() raise BadMediaFail()
if force \ if force \
or im.size[0] > max_width \ or im.size[0] > new_size[0]\
or im.size[1] > max_height \ or im.size[1] > new_size[1]\
or exif_image_needs_rotation(exif_tags): or exif_image_needs_rotation(exif_tags):
resize_image( resize_image(
proc_state, im, unicode(keyname), target_name, proc_state, im, unicode(keyname), target_name,
@ -129,8 +127,7 @@ def process_image(proc_state, reprocess_info=None):
""" """
entry = proc_state.entry entry = proc_state.entry
workbench = proc_state.workbench workbench = proc_state.workbench
import ipdb
ipdb.set_trace()
# Conversions subdirectory to avoid collisions # Conversions subdirectory to avoid collisions
conversions_subdir = os.path.join( conversions_subdir = os.path.join(
workbench.dir, 'conversions') workbench.dir, 'conversions')
@ -148,12 +145,12 @@ def process_image(proc_state, reprocess_info=None):
gps_data = get_gps_data(exif_tags) gps_data = get_gps_data(exif_tags)
# Always create a small thumbnail # Always create a small thumbnail
resize_tool(proc_state, True, 'thumb', resize_tool(proc_state, True, 'thumb', queued_filename,
name_builder.fill('{basename}.thumbnail{ext}'), name_builder.fill('{basename}.thumbnail{ext}'),
conversions_subdir, exif_tags) conversions_subdir, exif_tags)
# Possibly create a medium # Possibly create a medium
resize_tool(proc_state, False, 'medium', resize_tool(proc_state, False, 'medium', queued_filename,
name_builder.fill('{basename}.medium{ext}'), name_builder.fill('{basename}.medium{ext}'),
conversions_subdir, exif_tags) conversions_subdir, exif_tags)
@ -183,19 +180,16 @@ def _reprocess_image(proc_state, reprocess_info, conversions_subdir):
if reprocess_info.get('max_width'): if reprocess_info.get('max_width'):
max_width = reprocess_info['max_width'] max_width = reprocess_info['max_width']
max_height = reprocess_info['max_height']
else: else:
max_width = mgg.global_config \ max_width = mgg.global_config \
['media:' + reprocess_info['resize']]['max_width'] ['media:' + reprocess_info['resize']]['max_width']
if reprocess_info.get('max_height'):
max_height = reprocess_info['max_height']
else:
max_height = mgg.global_config \ max_height = mgg.global_config \
['media:' + reprocess_info['resize']]['max_height'] ['media:' + reprocess_info['resize']]['max_height']
new_size = (max_width, max_height) new_size = (max_width, max_height)
resize_tool(proc_state, False, reprocess_info['resize'], resize_tool(proc_state, False, reprocess_info['resize'], reprocess_filename,
name_builder.fill('{basename}.thumbnail{ext}'), name_builder.fill('{basename}.thumbnail{ext}'),
conversions_subdir, exif_tags, new_size) conversions_subdir, exif_tags, new_size)

6
mediagoblin/processing/__init__.py
View File

@ -138,10 +138,10 @@ class ProcessingState(object):
if self.reprocess_filename is not None: if self.reprocess_filename is not None:
return self.reprocess_filename return self.reprocess_filename
reprocess_filepath = self.entry.media_files['original'][2] reprocess_filepath = self.entry.media_files['original']
reprocess_filename = self.workbench.local_file( reprocess_filename = self.workbench.localized_file(
mgg.public_store, reprocess_filepath, mgg.public_store, reprocess_filepath,
'original') 'source')
self.reprocess_filename = reprocess_filename self.reprocess_filename = reprocess_filename
return reprocess_filename return reprocess_filename