aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing/__init__.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-08-06 10:48:26 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-08-16 15:30:15 -0700
commitc541fb71f7f92ce13783400cf9b22083f38ae189 (patch)
tree0d08ffc50615d0042773c62a9b59c567d89a2be0 /mediagoblin/processing/__init__.py
parent7ac66a3dd095c8358e7392702f2948265135dc1c (diff)
downloadmediagoblin-c541fb71f7f92ce13783400cf9b22083f38ae189.tar.lz
mediagoblin-c541fb71f7f92ce13783400cf9b22083f38ae189.tar.xz
mediagoblin-c541fb71f7f92ce13783400cf9b22083f38ae189.zip
fix storage paramater in get_orig_filename(), fix __init__ for ProceessImage, better description for --size flag
Diffstat (limited to 'mediagoblin/processing/__init__.py')
-rw-r--r--mediagoblin/processing/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py
index 60565e09..5ce9281b 100644
--- a/mediagoblin/processing/__init__.py
+++ b/mediagoblin/processing/__init__.py
@@ -106,11 +106,13 @@ class ProcessingState(object):
if self.entry.queued_media_file:
orig_filepath = self.entry.queued_media_file
+ storage = mgg.queue_store
else:
orig_filepath = self.entry.media_files['original']
+ storage = mgg.public_store
orig_filename = self.workbench.localized_file(
- mgg.queue_store, orig_filepath,
+ storage, orig_filepath,
'source')
self.orig_filename = orig_filename
return orig_filename