diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 19:49:44 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 19:49:44 -0500 |
| commit | d40f55e3d9e3916c00a2bbd51d287d8c55683ced (patch) | |
| tree | 7fe58787781bc0c12f4afbf05b31d5f69363bf46 | |
| parent | 7ecc58cc5cf49c87001c38ba5d0607644ca195d4 (diff) | |
| parent | 894facc68d5a52dd796451361cd545f0bd3116f5 (diff) | |
| download | mediagoblin-d40f55e3d9e3916c00a2bbd51d287d8c55683ced.tar.lz mediagoblin-d40f55e3d9e3916c00a2bbd51d287d8c55683ced.tar.xz mediagoblin-d40f55e3d9e3916c00a2bbd51d287d8c55683ced.zip | |
Merge branch 'master' into workbench
| -rw-r--r-- | mediagoblin/process_media/__init__.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py index 4f06a686..527c198c 100644 --- a/mediagoblin/process_media/__init__.py +++ b/mediagoblin/process_media/__init__.py @@ -18,7 +18,7 @@ import Image from mediagoblin.db.util import ObjectId from celery.task import task -from mediagoblin.globals import database, queue_store, public_store +from mediagoblin import globals as mg_globals THUMB_SIZE = 200, 200 @@ -26,38 +26,39 @@ THUMB_SIZE = 200, 200 @task def process_media_initial(media_id): - entry = database.MediaEntry.one( + entry = mg_globals.database.MediaEntry.one( {'_id': ObjectId(media_id)}) queued_filepath = entry['queued_media_file'] - queued_file = queue_store.get_file(queued_filepath, 'r') + queued_file = mg_globals.queue_store.get_file(queued_filepath, 'r') with queued_file: thumb = Image.open(queued_file) thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS) - thumb_filepath = public_store.get_unique_filepath( + thumb_filepath = mg_globals.public_store.get_unique_filepath( ['media_entries', unicode(entry['_id']), 'thumbnail.jpg']) - with public_store.get_file(thumb_filepath, 'w') as thumb_file: + thumb_file = mg_globals.public_store.get_file(thumb_filepath, 'w') + with thumb_file: thumb.save(thumb_file, "JPEG") # we have to re-read because unlike PIL, not everything reads # things in string representation :) - queued_file = queue_store.get_file(queued_filepath, 'rb') + queued_file = mg_globals.queue_store.get_file(queued_filepath, 'rb') with queued_file: - main_filepath = public_store.get_unique_filepath( + main_filepath = mg_globals.public_store.get_unique_filepath( ['media_entries', unicode(entry['_id']), queued_filepath[-1]]) - with public_store.get_file(main_filepath, 'wb') as main_file: + with mg_globals.public_store.get_file(main_filepath, 'wb') as main_file: main_file.write(queued_file.read()) - queue_store.delete_file(queued_filepath) + mg_globals.queue_store.delete_file(queued_filepath) media_files_dict = entry.setdefault('media_files', {}) media_files_dict['thumb'] = thumb_filepath media_files_dict['main'] = main_filepath |