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

Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'

Browse Source 
Conflicts:
	mediagoblin/process_media/__init__.py
This commit is contained in:
Christopher Allan Webber 2011-06-12 17:42:26 -05:00
commit 48a7ba1e1c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mediagoblin/process_media/__init__.py
View File

@ -24,6 +24,13 @@ from mediagoblin import mg_globals as mgg
THUMB_SIZE = 200, 200 THUMB_SIZE = 200, 200
def create_pub_filepath(entry, filename):
return mgg.public_store.get_unique_filepath(
['media_entries',
unicode(entry['_id']),
filename])
@task @task
def process_media_initial(media_id): def process_media_initial(media_id):
workbench = mgg.workbench_manager.create_workbench() workbench = mgg.workbench_manager.create_workbench()
@ -45,10 +52,7 @@ def process_media_initial(media_id):
if thumb.mode != "RGB": if thumb.mode != "RGB":
thumb = thumb.convert("RGB") thumb = thumb.convert("RGB")
thumb_filepath = mgg.public_store.get_unique_filepath( thumb_filepath = create_pub_filepath(entry, 'thumbnail.jpg')
['media_entries',
unicode(entry['_id']),
'thumbnail.jpg'])
thumb_file = mgg.public_store.get_file(thumb_filepath, 'w') thumb_file = mgg.public_store.get_file(thumb_filepath, 'w')
with thumb_file: with thumb_file:
@ -59,15 +63,13 @@ def process_media_initial(media_id):
queued_file = file(queued_filename, 'rb') queued_file = file(queued_filename, 'rb')
with queued_file: with queued_file:
main_filepath = mgg.public_store.get_unique_filepath( main_filepath = create_pub_filepath(entry, queued_filepath[-1])
['media_entries',
unicode(entry['_id']),
queued_filepath[-1]])
with mgg.public_store.get_file(main_filepath, 'wb') as main_file: with mgg.public_store.get_file(main_filepath, 'wb') as main_file:
main_file.write(queued_file.read()) main_file.write(queued_file.read())
mgg.queue_store.delete_file(queued_filepath) mgg.queue_store.delete_file(queued_filepath)
entry['queued_media_file'] = []
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