diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-01-26 15:08:12 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-08 10:09:37 +0100 |
| commit | 715ea495466a0dcebd1425dfd322775ff147aacd (patch) | |
| tree | 878c152f8e152f98dade7efb06a7a41c337ba40c /mediagoblin/media_types | |
| parent | bfd68cce8593f44ad34d9a731269041f44a9c790 (diff) | |
| download | mediagoblin-715ea495466a0dcebd1425dfd322775ff147aacd.tar.lz mediagoblin-715ea495466a0dcebd1425dfd322775ff147aacd.tar.xz mediagoblin-715ea495466a0dcebd1425dfd322775ff147aacd.zip | |
Also refactor "copy original into public storage".
This makes the processing code easier to read/write and
alos will help the reprocessing once we get to it.
Thanks to Joar Wandborg for testing!
Diffstat (limited to 'mediagoblin/media_types')
| -rw-r--r-- | mediagoblin/media_types/image/processing.py | 5 | ||||
| -rw-r--r-- | mediagoblin/media_types/video/processing.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 541e5109..8afcf90b 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -141,9 +141,7 @@ def process_image(entry): medium_filepath = None # Copy our queued local workbench to its final destination - original_filepath = create_pub_filepath( - entry, name_builder.fill('{basename}{ext}')) - mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) + proc_state.copy_original(name_builder.fill('{basename}{ext}')) # Remove queued media file from storage and database proc_state.delete_queue_file() @@ -151,7 +149,6 @@ def process_image(entry): # Insert media file information into database media_files_dict = entry.setdefault('media_files', {}) media_files_dict[u'thumb'] = thumb_filepath - media_files_dict[u'original'] = original_filepath if medium_filepath: media_files_dict[u'medium'] = medium_filepath diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 8b966636..9040b736 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -116,9 +116,7 @@ def process_video(entry): if video_config['keep_original']: # Push original file to public storage _log.debug('Saving original...') - original_filepath = create_pub_filepath(entry, queued_filepath[-1]) - mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) - entry.media_files['original'] = original_filepath + proc_state.copy_original(queued_filepath[-1]) # Remove queued media file from storage and database proc_state.delete_queue_file() |