kallithea Changeset - c8f34ad333a2

Changeset - c8f34ad333a2

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Søren Løvborg - 9 years ago 2017-01-18 16:30:13
sorenl@unity3d.com

model: simplify guess_instance invocations

The second argument to the guess_instance classmethod is in practice
fixed for Gist, Permission, RepoGroup, Repository, User, UserGroup;
so might as well move this logic into per-class specializations of
guess_instance.

6 files changed with 33 insertions and 17 deletions:

kallithea/model/base.py

kallithea/model/db.py

kallithea/model/gist.py

kallithea/model/repo.py

kallithea/model/repo_group.py

kallithea/model/user_group.py

0 comments (0 inline, 0 general)

kallithea/model/base.py

➞

Show inline comments

@@ @@ -64,28 +64,25 @@ class BaseModel(object): @@
         """
         Helper method to get user by ID, or username fallback
         :param user: UserID, username, or User instance
         """
         from kallithea.model.db import User
         return User.guess_instance(user,
                                   callback=User.get_by_username)
         return User.guess_instance(user)
     def _get_repo(self, repository):
         """
         Helper method to get repository by ID, or repository name
         :param repository: RepoID, repository name or Repository Instance
         """
         from kallithea.model.db import Repository
         return Repository.guess_instance(repository,
                                   callback=Repository.get_by_repo_name)
         return Repository.guess_instance(repository)
     def _get_perm(self, permission):
         """
         Helper method to get permission by ID, or permission name
         :param permission: PermissionID, permission_name or Permission instance
         """
         from kallithea.model.db import Permission
         return Permission.guess_instance(permission,
                                   callback=Permission.get_by_key)
         return Permission.guess_instance(permission)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -557,12 +557,16 @@ class User(Base, BaseDbModel): @@
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.user_id, self.username)
     @classmethod
     def guess_instance(cls, value):
         return super(User, cls).guess_instance(value, User.get_by_username)
     @classmethod
     def get_or_404(cls, id_, allow_default=True):
         '''
         Overridden version of BaseDbModel.get_or_404, with an extra check on
         the default user.
         '''
         user = super(User, cls).get_or_404(id_)
@@ @@ -877,12 +881,16 @@ class UserGroup(Base, BaseDbModel): @@
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.users_group_id,
                                       self.users_group_name)
     @classmethod
     def guess_instance(cls, value):
         return super(UserGroup, cls).guess_instance(value, UserGroup.get_by_group_name)
     @classmethod
     def get_by_group_name(cls, group_name, cache=False,
                           case_insensitive=False):
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.users_group_name) == func.lower(group_name))
         else:
             q = cls.query().filter(cls.users_group_name == group_name)
@@ @@ -1115,12 +1123,16 @@ class Repository(Base, BaseDbModel): @@
         :param cls:
         :param repo_name:
         """
         return cls.url_sep().join(repo_name.split(os.sep))
     @classmethod
     def guess_instance(cls, value):
         return super(Repository, cls).guess_instance(value, Repository.get_by_repo_name)
     @classmethod
     def get_by_repo_name(cls, repo_name):
         q = Session().query(cls).filter(cls.repo_name == repo_name)
         q = q.options(joinedload(Repository.fork)) \
                 .options(joinedload(Repository.owner)) \
                 .options(joinedload(Repository.group))
         return q.scalar()
@@ @@ -1559,12 +1571,16 @@ class RepoGroup(Base, BaseDbModel): @@
     @classmethod
     def url_sep(cls):
         return URL_SEP
     @classmethod
     def guess_instance(cls, value):
         return super(RepoGroup, cls).guess_instance(value, RepoGroup.get_by_group_name)
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         group_name = group_name.rstrip('/')
         if case_insensitive:
             gr = cls.query() \
                 .filter(func.lower(cls.group_name) == func.lower(group_name))
         else:
@@ @@ -1775,12 +1791,16 @@ class Permission(Base, BaseDbModel): @@
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (
             self.__class__.__name__, self.permission_id, self.permission_name
+        )
     @classmethod
     def guess_instance(cls, value):
         return super(Permission, cls).guess_instance(value, Permission.get_by_key)
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.permission_name == key).scalar()
     @classmethod
     def get_default_perms(cls, default_user_id):
         q = Session().query(UserRepoToPerm, Repository, cls) \
@@ @@ -2535,12 +2555,16 @@ class Gist(Base, BaseDbModel): @@
     owner = relationship('User')
     def __repr__(self):
         return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
     @classmethod
     def guess_instance(cls, value):
         return super(Gist, cls).guess_instance(value, Gist.get_by_access_id)
     @classmethod
     def get_or_404(cls, id_):
         res = cls.query().filter(cls.gist_access_id == id_).scalar()
         if res is None:
             raise HTTPNotFound
         return res

kallithea/model/gist.py

➞

Show inline comments

@@ @@ -50,13 +50,13 @@ class GistModel(BaseModel): @@
     def _get_gist(self, gist):
         """
         Helper method to get gist by ID, or gist_access_id as a fallback
         :param gist: GistID, gist_access_id, or Gist instance
         """
-        return Gist.guess_instance(gist, callback=Gist.get_by_access_id)
         return Gist.guess_instance(gist)
     def __delete_gist(self, gist):
         """
         removes gist from filesystem
         :param gist: gist object

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -56,18 +56,16 @@ log = logging.getLogger(__name__) @@
 class RepoModel(BaseModel):
     URL_SEPARATOR = Repository.url_sep()
     def _get_user_group(self, users_group):
         return UserGroup.guess_instance(users_group,
                                   callback=UserGroup.get_by_group_name)
         return UserGroup.guess_instance(users_group)
     def _get_repo_group(self, repo_group):
         return RepoGroup.guess_instance(repo_group,
                                   callback=RepoGroup.get_by_group_name)
         return RepoGroup.guess_instance(repo_group)
     def _create_default_perms(self, repository, private):
         # create default permission
         default = 'repository.read'
         def_user = User.get_default_user()
         for p in def_user.user_perms:

kallithea/model/repo_group.py

➞

Show inline comments

@@ @@ -41,18 +41,16 @@ from kallithea.model.db import RepoGroup @@
 log = logging.getLogger(__name__)
 class RepoGroupModel(BaseModel):
     def _get_user_group(self, users_group):
         return UserGroup.guess_instance(users_group,
                                   callback=UserGroup.get_by_group_name)
         return UserGroup.guess_instance(users_group)
     def _get_repo_group(self, repo_group):
         return RepoGroup.guess_instance(repo_group,
                                   callback=RepoGroup.get_by_group_name)
         return RepoGroup.guess_instance(repo_group)
     @LazyProperty
     def repos_path(self):
         """
         Gets the repositories root path from database
         """

kallithea/model/user_group.py

➞

Show inline comments

@@ @@ -37,14 +37,13 @@ from kallithea.lib.exceptions import Use @@
 log = logging.getLogger(__name__)
 class UserGroupModel(BaseModel):
     def _get_user_group(self, user_group):
         return UserGroup.guess_instance(user_group,
                                   callback=UserGroup.get_by_group_name)
         return UserGroup.guess_instance(user_group)
     def _create_default_perms(self, user_group):
         # create default permission
         default_perm = 'usergroup.read'
         def_user = User.get_default_user()
         for p in def_user.user_perms:

0 comments (0 inline, 0 general)