aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-05-09 23:37:49 +0300
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-06-13 10:30:46 -0500
commit9da03b739f19d43f195e6216f3469808fa67a191 (patch)
tree0d0cbcb26241683b9250893ae86bfe720c40366e
parent25b1296dedef20de338fd72bf631bd4d1c2deb38 (diff)
downloadmediagoblin-9da03b739f19d43f195e6216f3469808fa67a191.tar.lz
mediagoblin-9da03b739f19d43f195e6216f3469808fa67a191.tar.xz
mediagoblin-9da03b739f19d43f195e6216f3469808fa67a191.zip
Convert media_ids to int safely.
With this commit, "gmg deletemedia spam,12" will not raise ValueError anymore.
-rw-r--r--mediagoblin/gmg_commands/deletemedia.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/gmg_commands/deletemedia.py b/mediagoblin/gmg_commands/deletemedia.py
index ed1ca4e9..ab5a81f6 100644
--- a/mediagoblin/gmg_commands/deletemedia.py
+++ b/mediagoblin/gmg_commands/deletemedia.py
@@ -27,7 +27,10 @@ def parser_setup(subparser):
def deletemedia(args):
app = commands_util.setup_app(args)
- media_ids = set(map(int, args.media_ids.split(',')))
+ media_ids = set([int(mid) for mid in args.media_ids.split(',') if mid.isdigit()])
+ if not media_ids:
+ print 'Can\'t find any valid media ID(s).'
+ sys.exit(1)
found_medias = set()
filter_ids = app.db.MediaEntry.id.in_(media_ids)
medias = app.db.MediaEntry.query.filter(filter_ids).all()