Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin

1 files changed, 7 insertions, 2 deletions

diff --git a/mediagoblin/models.py b/mediagoblin/models.py
index e1198187..69b1f4f0 100644
--- a/mediagoblin/models.py
+++ b/mediagoblin/models.py
@@ -74,11 +74,16 @@ class MediaEntry(Document):
         'tags': [unicode],
         'state': unicode,
 
+        # For now let's assume there can only be one main file queued
+        # at a time
+        'queued_media_file': [unicode],
+
+        # A dictionary of logical names to filepaths
+        'media_files': dict,
+
         # The following should be lists of lists, in appropriate file
         # record form
-        'media_files': list,
         'attachment_files': list,
-        'queue_files': list,
 
         # This one should just be a single file record
         'thumbnail_file': [unicode]}