Simplifying the "id:" url detection, per Elrond's suggestion.

As pointed out, we didn't need that nested if.

This commit sponsored by Paul Kuriakose.  Thank you!
This commit is contained in:
Christopher Allan Webber 2013-02-26 14:04:26 -06:00
parent 697c74c2de
commit e4e50a2765

View File

@ -130,17 +130,15 @@ def get_user_media_entry(controller):
# might not be a slug, might be an id, but whatever
media_slug = request.matchdict['media']
if u":" in media_slug:
# okay, it's not actually a slug, it's some kind of identifier,
# probably id:
if media_slug.startswith(u'id:'):
try:
media = MediaEntry.query.filter_by(
id=int(media_slug[3:]),
state=u'processed',
uploader=user.id).first()
except ValueError:
raise NotFound()
# 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(media_slug[3:]),
state=u'processed',
uploader=user.id).first()
except ValueError:
raise NotFound()
else:
# no magical id: stuff? It's a slug!
media = MediaEntry.query.filter_by(