From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Wed, 8 Jun 2011 21:22:11 +0000 (+0200)
Subject: Refactor filename generation in the public store
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=180bdbde93ad4b62395c78e99e97587b44ad31c7;p=mediagoblin.git

Refactor filename generation in the public store

Just a small refactoring of the filename setup in the
public store. Very simple.
---

diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py
index 4f06a686..097b4375 100644
--- a/mediagoblin/process_media/__init__.py
+++ b/mediagoblin/process_media/__init__.py
@@ -24,6 +24,13 @@ from mediagoblin.globals import database, queue_store, public_store
 THUMB_SIZE = 200, 200
 
 
+def create_pub_filepath(entry, filename):
+    return public_store.get_unique_filepath(
+            ['media_entries',
+             unicode(entry['_id']),
+             filename])
+
+
 @task
 def process_media_initial(media_id):
     entry = database.MediaEntry.one(
@@ -36,10 +43,7 @@ def process_media_initial(media_id):
         thumb = Image.open(queued_file)
         thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS)
 
-        thumb_filepath = public_store.get_unique_filepath(
-            ['media_entries',
-             unicode(entry['_id']),
-             'thumbnail.jpg'])
+        thumb_filepath = create_pub_filepath(entry, 'thumbnail.jpg')
 
         with public_store.get_file(thumb_filepath, 'w') as thumb_file:
             thumb.save(thumb_file, "JPEG")
@@ -49,15 +53,13 @@ def process_media_initial(media_id):
     queued_file = queue_store.get_file(queued_filepath, 'rb')
 
     with queued_file:
-        main_filepath = public_store.get_unique_filepath(
-            ['media_entries',
-             unicode(entry['_id']),
-             queued_filepath[-1]])
+        main_filepath = create_pub_filepath(entry, queued_filepath[-1])
         
         with public_store.get_file(main_filepath, 'wb') as main_file:
             main_file.write(queued_file.read())
 
     queue_store.delete_file(queued_filepath)
+    entry['queued_media_file'] = []
     media_files_dict = entry.setdefault('media_files', {})
     media_files_dict['thumb'] = thumb_filepath
     media_files_dict['main'] = main_filepath