kallithea Changeset - 9ecd1d4836cc

Changeset - 9ecd1d4836cc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2015-03-11 00:24:25
madski@unity3d.com

helpers: introduce user_or_none helper helper

Slight cleanup refactoring - will be useful later.

2 files changed with 24 insertions and 29 deletions:

kallithea/lib/helpers.py

kallithea/model/user.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -491,61 +491,56 @@ def is_hg(repository): @@
         _type = repository.repo_type
     else:
         _type = repository
     return _type == 'hg'
 def user_or_none(author):
     email = author_email(author)
     if email is not None:
         user = User.get_by_email(email, case_insensitive=True, cache=True)
         if user is not None:
             return user
     user = User.get_by_username(author_name(author), case_insensitive=True, cache=True)
     if user is not None:
         return user
     return None
 def email_or_none(author):
     if not author:
         return None
     # extract email from the commit string
     _email = email(author)
     if _email:
         # check it against Kallithea database, and use the MAIN email for this
         # user
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
     user = user_or_none(author)
         if user is not None:
             return user.email
         return _email
         return user.email # always use main email address - not necessarily the one used to find user
     # See if it contains a username we can get an email from
     user = User.get_by_username(author_name(author), case_insensitive=True,
                                 cache=True)
     if user is not None:
         return user.email
     # extract email from the commit string
     email = author_email(author)
     if email:
         return email
     # No valid email, not a valid user in the system, none!
     return None
 def person(author, show_attr="username"):
     """Find the user identified by 'author', return one of the users attributes,
     default to the username attribute, None if there is no user"""
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     # if author is already an instance use it for extraction
     if isinstance(author, User):
         return person_getter(author)
     # Valid email in the attribute passed, see if they're in the system
     _email = email(author)
     if _email:
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
         if user is not None:
             return person_getter(user)
     # Maybe it's a username?
     _author = author_name(author)
     user = User.get_by_username(_author, case_insensitive=True,
                                 cache=True)
     user = user_or_none(author)
     if user is not None:
         return person_getter(user)
     # Still nothing?  Just pass back the author name if any, else the email
-    return _author or _email
+    return author_name(author) or email(author)
 def person_by_id(id_, show_attr="username"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)

kallithea/model/user.py

➞

Show inline comments

@@ @@ -344,17 +344,17 @@ class UserModel(BaseModel): @@
         :param username: username to fetch by
         """
         if user_id is None and api_key is None and username is None:
             raise Exception('You need to pass user_id, api_key or username')
         dbuser = None
         if user_id:
+        if user_id is not None:
             dbuser = self.get(user_id)
         elif api_key:
+        elif api_key is not None:
             dbuser = self.get_by_api_key(api_key)
         elif username:
+        elif username is not None:
             dbuser = self.get_by_username(username)
         if dbuser is not None and dbuser.active:
             log.debug('filling %s data' % dbuser)
             for k, v in dbuser.get_dict().iteritems():
                 if k not in ['api_keys', 'permissions']:

0 comments (0 inline, 0 general)