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

fix storage paramater in get_orig_filename(), fix __init__ for ProceessImage, better description for --size flag

Browse Source
This commit is contained in:
Rodney Ewing 2013-08-06 10:48:26 -07:00
parent 7ac66a3dd0
commit c541fb71f7
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ def setup_plugin():
class ImageMediaManager(MediaManagerBase): class ImageMediaManager(MediaManagerBase):
human_readable = "Image" human_readable = "Image"
processor = ProcessImage processor = staticmethod(ProcessImage)
display_template = "mediagoblin/media_displays/image.html" display_template = "mediagoblin/media_displays/image.html"
default_thumb = "images/media_thumbs/image.png" default_thumb = "images/media_thumbs/image.png"

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

@ -134,22 +134,23 @@ class ProcessImage(object):
A Workbench() represents a local tempory dir. It is automatically A Workbench() represents a local tempory dir. It is automatically
cleaned up when this function exits. cleaned up when this function exits.
""" """
def init(self, proc_state): def __init__(self, proc_state=None):
self.proc_state = proc_state if proc_state:
self.entry = proc_state.entry self.proc_state = proc_state
self.workbench = proc_state.workbench self.entry = proc_state.entry
self.workbench = proc_state.workbench
# Conversions subdirectory to avoid collisions # Conversions subdirectory to avoid collisions
self.conversions_subdir = os.path.join( self.conversions_subdir = os.path.join(
self.workbench.dir, 'convirsions') self.workbench.dir, 'convirsions')
self.orig_filename = proc_state.get_orig_filename() self.orig_filename = proc_state.get_orig_filename()
self.name_builder = FilenameBuilder(self.orig_filename) self.name_builder = FilenameBuilder(self.orig_filename)
# Exif extraction # Exif extraction
self.exif_tags = extract_exif(self.orig_filename) self.exif_tags = extract_exif(self.orig_filename)
os.mkdir(self.conversions_subdir) os.mkdir(self.conversions_subdir)
def reprocess_action(self, args): def reprocess_action(self, args):
""" """
@ -174,6 +175,7 @@ class ProcessImage(object):
parser.add_argument( parser.add_argument(
'--size', '--size',
nargs=2, nargs=2,
metavar=('max_width', 'max_height'),
type=int) type=int)
parser.add_argument( parser.add_argument(
'--initial_processing', '--initial_processing',

4
mediagoblin/processing/__init__.py
View File

@ -106,11 +106,13 @@ class ProcessingState(object):
if self.entry.queued_media_file: if self.entry.queued_media_file:
orig_filepath = self.entry.queued_media_file orig_filepath = self.entry.queued_media_file
storage = mgg.queue_store
else: else:
orig_filepath = self.entry.media_files['original'] orig_filepath = self.entry.media_files['original']
storage = mgg.public_store
orig_filename = self.workbench.localized_file( orig_filename = self.workbench.localized_file(
mgg.queue_store, orig_filepath, storage, orig_filepath,
'source') 'source')
self.orig_filename = orig_filename self.orig_filename = orig_filename
return orig_filename return orig_filename