Tiny pagination style changes

[mediagoblin.git] / mediagoblin / decorators.py

diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index bc12d61c2e28a7644ef83e3264dcb334cf22490d..081eda623f08c0d386d903bfbc9e4234aed4dba4 100644 (file)
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from bson.errors import InvalidId
 from webob import exc
 
-from mediagoblin.db.util import ObjectId
+from mediagoblin.util import redirect
+from mediagoblin.db.util import ObjectId, InvalidId
 
 
 def _make_safe(decorator, original):
@@ -36,9 +36,10 @@ def require_active_login(controller):
     Require an active login from the user.
     """
     def new_controller_func(request, *args, **kwargs):
-        if request.user and request.user.get('status') == u'needs_email_verification':
-            return exc.HTTPFound(
-                location = request.urlgen('mediagoblin.auth.verify_email_notice'))
+        if request.user and \
+                request.user.get('status') == u'needs_email_verification':
+            return redirect(request,
+                    'mediagoblin.auth.verify_email_notice')
         elif not request.user or request.user.get('status') != u'active':
             return exc.HTTPFound(
                 location="%s?next=%s" % (
@@ -100,3 +101,23 @@ def get_user_media_entry(controller):
         return controller(request, media=media, *args, **kwargs)
 
     return _make_safe(wrapper, controller)
+
+def get_media_entry_by_id(controller):
+    """
+    Pass in a MediaEntry based off of a url component
+    """
+    def wrapper(request, *args, **kwargs):
+        try:
+            media = request.db.MediaEntry.find_one(
+                {'_id': ObjectId(request.matchdict['media']),
+                 'state': 'processed'})
+        except InvalidId:
+            return exc.HTTPNotFound()
+
+        # Still no media?  Okay, 404.
+        if not media:
+            return exc.HTTPNotFound()
+
+        return controller(request, media=media, *args, **kwargs)
+
+    return _make_safe(wrapper, controller)