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

change get_queued_filename to get_orig_filename and modified function

Browse Source
This commit is contained in:
Rodney Ewing 2013-08-02 15:20:59 -07:00
parent 3e9faf85da
commit 45b20dce1a
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ def resize_image(proc_state, resized, keyname, target_name, new_size,
def resize_tool(proc_state, force, keyname, target_name, def resize_tool(proc_state, force, keyname, target_name,
conversions_subdir, exif_tags, new_size=None): conversions_subdir, exif_tags, new_size=None):
# Get the filename of the original file # filename -- the filename of the original image being resized
filename = proc_state.get_orig_filename() filename = proc_state.get_orig_filename()
# Use the default size if new_size was not given # Use the default size if new_size was not given

48
mediagoblin/processing/__init__.py
View File

@ -86,27 +86,37 @@ class ProcessingState(object):
def __init__(self, entry): def __init__(self, entry):
self.entry = entry self.entry = entry
self.workbench = None self.workbench = None
self.queued_filename = None self.orig_filename = None
self.reprocess_filename = None
def set_workbench(self, wb): def set_workbench(self, wb):
self.workbench = wb self.workbench = wb
def get_queued_filename(self): def get_orig_filename(self):
""" """
Get the a filename for the original, on local storage Get the a filename for the original, on local storage
If the media entry has a queued_media_file, use that, otherwise
use the original.
In the future, this will return the highest quality file available
if neither the original or queued file are available
""" """
if self.queued_filename is not None: if self.orig_filename is not None:
return self.queued_filename return self.orig_filename
queued_filepath = self.entry.queued_media_file
queued_filename = self.workbench.localized_file( if self.entry.queued_media_file:
mgg.queue_store, queued_filepath, orig_filepath = self.entry.queued_media_file
else:
orig_filepath = self.entry.media_files['original']
orig_filename = self.workbench.localized_file(
mgg.queue_store, orig_filepath,
'source') 'source')
self.queued_filename = queued_filename self.orig_filename = orig_filename
return queued_filename return orig_filename
def copy_original(self, target_name, keyname=u"original"): def copy_original(self, target_name, keyname=u"original"):
self.store_public(keyname, self.get_queued_filename(), target_name) self.store_public(keyname, self.get_orig_filename(), target_name)
def store_public(self, keyname, local_file, target_name=None): def store_public(self, keyname, local_file, target_name=None):
if target_name is None: if target_name is None:
@ -129,22 +139,6 @@ class ProcessingState(object):
mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir
self.entry.queued_media_file = [] self.entry.queued_media_file = []
def get_reprocess_filename(self):
"""
Get the filename to use during reprocessing
"""
# Currently only returns the original file, but eventually will return
# the highest quality file if the original doesn't exist
if self.reprocess_filename is not None:
return self.reprocess_filename
reprocess_filepath = self.entry.media_files['original']
reprocess_filename = self.workbench.localized_file(
mgg.public_store, reprocess_filepath,
'source')
self.reprocess_filename = reprocess_filename
return reprocess_filename
def mark_entry_failed(entry_id, exc): def mark_entry_failed(entry_id, exc):
""" """