diff options
Diffstat (limited to 'mediagoblin/gmg_commands')
| -rw-r--r-- | mediagoblin/gmg_commands/addmedia.py | 7 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/batchaddmedia.py | 6 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/users.py | 47 |
3 files changed, 39 insertions, 21 deletions
diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py index 2aa8f96a..8cbfc806 100644 --- a/mediagoblin/gmg_commands/addmedia.py +++ b/mediagoblin/gmg_commands/addmedia.py @@ -20,6 +20,7 @@ import os import six +from mediagoblin.db.models import LocalUser from mediagoblin.gmg_commands import util as commands_util from mediagoblin.submit.lib import ( submit_media, get_upload_file_limits, @@ -70,11 +71,13 @@ def addmedia(args): app = commands_util.setup_app(args) # get the user - user = app.db.User.query.filter_by(username=args.username.lower()).first() + user = app.db.LocalUser.query.filter( + LocalUser.username==args.username.lower() + ).first() if user is None: print("Sorry, no user by username '%s'" % args.username) return - + # check for the file, if it exists... filename = os.path.split(args.filename)[-1] abs_filename = os.path.abspath(args.filename) diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py index 5a47d698..2ad7e39e 100644 --- a/mediagoblin/gmg_commands/batchaddmedia.py +++ b/mediagoblin/gmg_commands/batchaddmedia.py @@ -25,6 +25,7 @@ import six from six.moves.urllib.parse import urlparse +from mediagoblin.db.models import LocalUser from mediagoblin.gmg_commands import util as commands_util from mediagoblin.submit.lib import ( submit_media, get_upload_file_limits, @@ -64,7 +65,9 @@ def batchaddmedia(args): files_uploaded, files_attempted = 0, 0 # get the user - user = app.db.User.query.filter_by(username=args.username.lower()).first() + user = app.db.LocalUser.query.filter( + LocalUser.username==args.username.lower() + ).first() if user is None: print(_(u"Sorry, no user by username '{username}' exists".format( username=args.username))) @@ -210,4 +213,3 @@ def parse_csv_file(file_contents): objects_dict[media_id] = (line_dict) return objects_dict - diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py index ad22c169..d1a8b72d 100644 --- a/mediagoblin/gmg_commands/users.py +++ b/mediagoblin/gmg_commands/users.py @@ -16,8 +16,11 @@ from __future__ import print_function +import sys + import six +from mediagoblin.db.models import LocalUser from mediagoblin.gmg_commands import util as commands_util from mediagoblin import auth from mediagoblin import mg_globals @@ -44,16 +47,17 @@ def adduser(args): db = mg_globals.database users_with_username = \ - db.User.query.filter_by( - username=args.username.lower() + db.LocalUser.query.filter( + LocalUser.username==args.username.lower() ).count() if users_with_username: print(u'Sorry, a user with that name already exists.') + sys.exit(1) else: # Create the user - entry = db.User() + entry = db.LocalUser() entry.username = six.text_type(args.username.lower()) entry.email = six.text_type(args.email) entry.pw_hash = auth.gen_password_hash(args.password) @@ -70,13 +74,14 @@ def adduser(args): entry.all_privileges = default_privileges entry.save() - print(u"User created (and email marked as verified)") + print(u"User created (and email marked as verified).") def makeadmin_parser_setup(subparser): subparser.add_argument( 'username', - help="Username to give admin level") + help="Username to give admin level", + type=six.text_type) def makeadmin(args): @@ -84,23 +89,26 @@ def makeadmin(args): db = mg_globals.database - user = db.User.query.filter_by( - username=six.text_type(args.username.lower())).one() + user = db.LocalUser.query.filter( + LocalUser.username==args.username.lower() + ).first() if user: user.all_privileges.append( db.Privilege.query.filter( db.Privilege.privilege_name==u'admin').one() ) user.save() - print(u'The user is now Admin') + print(u'The user %s is now an admin.' % args.username) else: - print(u'The user doesn\'t exist') + print(u'The user %s doesn\'t exist.' % args.username) + sys.exit(1) def changepw_parser_setup(subparser): subparser.add_argument( 'username', - help="Username used to login") + help="Username used to login", + type=six.text_type) subparser.add_argument( 'password', help="Your NEW supersecret word to login") @@ -111,14 +119,16 @@ def changepw(args): db = mg_globals.database - user = db.User.query.filter_by( - username=six.text_type(args.username.lower())).one() + user = db.LocalUser.query.filter( + LocalUser.username==args.username.lower() + ).first() if user: user.pw_hash = auth.gen_password_hash(args.password) user.save() - print(u'Password successfully changed') + print(u'Password successfully changed for user %s.' % args.username) else: - print(u'The user doesn\'t exist') + print(u'The user %s doesn\'t exist.' % args.username) + sys.exit(1) def deleteuser_parser_setup(subparser): @@ -133,9 +143,12 @@ def deleteuser(args): db = mg_globals.database - user = db.User.query.filter_by(username=args.username.lower()).first() + user = db.LocalUser.query.filter( + LocalUser.username==args.username.lower() + ).first() if user: user.delete() - print('The user %s has been deleted' % args.username) + print('The user %s has been deleted.' % args.username) else: - print('The user %s doesn\'t exist' % args.username) + print('The user %s doesn\'t exist.' % args.username) + sys.exit(1) |