Merge branch 'master' into joar-skip_transcoding

[mediagoblin.git] / mediagoblin / decorators.py

diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 42406b7dc4475a5d30d543d5d9154b5dee5c4b3c..fbf7b1887c9a15c439a0748820165ab812a2b238 100644 (file)
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -125,24 +125,29 @@ def get_user_media_entry(controller):
         if not user:
             raise NotFound()
 
-        media = MediaEntry.query.filter_by(
-            slug = request.matchdict['media'],
-            state = u'processed',
-            uploader = user.id).first()
+        media = None
 
-        if not media:
-            # no media via slug?  Grab it via object id
+        # might not be a slug, might be an id, but whatever
+        media_slug = request.matchdict['media']
+
+        # if it starts with id: it actually isn't a slug, it's an id.
+        if media_slug.startswith(u'id:'):
             try:
                 media = MediaEntry.query.filter_by(
-                    id = int(request.matchdict['media']),
-                    state = u'processed',
-                    uploader = user.id).first()
+                    id=int(media_slug[3:]),
+                    state=u'processed',
+                    uploader=user.id).first()
             except ValueError:
-                # media "id" was no int
                 raise NotFound()
+        else:
+            # no magical id: stuff?  It's a slug!
+            media = MediaEntry.query.filter_by(
+                slug=media_slug,
+                state=u'processed',
+                uploader=user.id).first()
 
         if not media:
-            # no media by that id? Okay, 404.
+            # Didn't find anything?  Okay, 404.
             raise NotFound()
 
         return controller(request, media=media, *args, **kwargs)