aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-04 09:57:56 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-04 15:15:41 +0100
commit5f8b4ae895ecb228c5f5d615818ffe0a06a30473 (patch)
tree2ead38386621af120360ae9f1b5b59e235bc060a /mediagoblin/user_pages
parentc39b9afc83d5e0bfd9312d762a7b16955ba949ca (diff)
downloadmediagoblin-5f8b4ae895ecb228c5f5d615818ffe0a06a30473.tar.lz
mediagoblin-5f8b4ae895ecb228c5f5d615818ffe0a06a30473.tar.xz
mediagoblin-5f8b4ae895ecb228c5f5d615818ffe0a06a30473.zip
make media_manager a property of MediaEntry in mixin.py
In all cases where get_media_manager(_media_type_as_string) was called in our code base we ultimately passed in a "MediaEntry().media_type" to get the matching MEDIA_MANAGER. It so makes sense to make this a function of the MediaEntry rather than a global function in mediagoblin.media_types and passing around media_entry.media_type as arguments all the time. It saves a few import statements and arguments. I also made it so the Media_manager property is cached for subsequent calls, although I am not too sure that this is needed (there are other cases for which this would make more sense) Also add a get_media_manager test to the media submission tests. It submits an image and checks that both media.media_type and media.media_manager return the right thing. Not sure if these tests could not be merged with an existing submission test, but it can't hurt to have things explicit. TODO: Right now we iterate through all existing media_managers to find the right one based on the string of its module name. This should be made a simple dict lookup to avoid all the extra work. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'mediagoblin/user_pages')
-rw-r--r--mediagoblin/user_pages/views.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index c26bd340..ec159b6e 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -33,7 +33,6 @@ from mediagoblin.decorators import (uses_pagination, get_user_media_entry,
from werkzeug.contrib.atom import AtomFeed
-from mediagoblin.media_types import get_media_manager
_log = logging.getLogger(__name__)
_log.setLevel(logging.DEBUG)
@@ -128,8 +127,7 @@ def media_home(request, media, page, **kwargs):
comment_form = user_forms.MediaCommentForm(request.form)
- media_template_name = get_media_manager(
- media.media_type)['display_template']
+ media_template_name = media.media_manager['display_template']
return render_to_response(
request,