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

Merge branch 'master' into workbench

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-06-11 19:49:44 -05:00
commit d40f55e3d9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mediagoblin/process_media/__init__.py
View File

@ -18,7 +18,7 @@ import Image
from mediagoblin.db.util import ObjectId from mediagoblin.db.util import ObjectId
from celery.task import task 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 THUMB_SIZE = 200, 200
@ -26,38 +26,39 @@ THUMB_SIZE = 200, 200
@task @task
def process_media_initial(media_id): def process_media_initial(media_id):
entry = database.MediaEntry.one( entry = mg_globals.database.MediaEntry.one(
{'_id': ObjectId(media_id)}) {'_id': ObjectId(media_id)})
queued_filepath = entry['queued_media_file'] 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: with queued_file:
thumb = Image.open(queued_file) thumb = Image.open(queued_file)
thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS) thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS)
thumb_filepath = public_store.get_unique_filepath( thumb_filepath = mg_globals.public_store.get_unique_filepath(
['media_entries', ['media_entries',
unicode(entry['_id']), unicode(entry['_id']),
'thumbnail.jpg']) '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") thumb.save(thumb_file, "JPEG")
# we have to re-read because unlike PIL, not everything reads # we have to re-read because unlike PIL, not everything reads
# things in string representation :) # 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: with queued_file:
main_filepath = public_store.get_unique_filepath( main_filepath = mg_globals.public_store.get_unique_filepath(
['media_entries', ['media_entries',
unicode(entry['_id']), unicode(entry['_id']),
queued_filepath[-1]]) 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()) 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 = entry.setdefault('media_files', {})
media_files_dict['thumb'] = thumb_filepath media_files_dict['thumb'] = thumb_filepath
media_files_dict['main'] = main_filepath media_files_dict['main'] = main_filepath