kallithea Changeset - b118e9ffc85c

Changeset - b118e9ffc85c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2019-07-31 02:09:04
mads@kiilerich.com

clone_url: simplify the logic - move summary handling of different URLs with/without id to db

Drop the half-baked concept of a separate "clone_uri_by_id" - just always use a
single template and change back and forth between {repo} and _{repoid} as
necessary.

Make it clear that clone_uri_tmpl always is passed as argument.

2 files changed with 9 insertions and 21 deletions:

kallithea/controllers/summary.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -114,23 +114,14 @@ class SummaryController(BaseRepoControll @@
         c.cs_statuses = c.db_repo.statuses(page_revisions)
         if request.authuser.is_default_user:
             username = ''
         else:
             username = safe_str(request.authuser.username)
         _def_clone_uri = _def_clone_uri_by_id = c.clone_uri_tmpl
         if '{repo}' in _def_clone_uri_by_id:
             _def_clone_uri_by_id = _def_clone_uri_by_id.replace('{repo}', '_{repoid}')
         elif '_{repoid}' in _def_clone_uri:
             _def_clone_uri = _def_clone_uri.replace('_{repoid}', '{repo}')
         else:
             log.error("Configured clone_uri_tmpl %r has no '{repo}' or '_{repoid}' and cannot toggle to use repo id URLs", c.clone_uri_tmpl)
         c.clone_repo_url = c.db_repo.clone_url(clone_uri_tmpl=_def_clone_uri, username=username)
         c.clone_repo_url_id = c.db_repo.clone_url(clone_uri_tmpl=_def_clone_uri_by_id, username=username)
         c.clone_repo_url = c.db_repo.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=False, username=username)
         c.clone_repo_url_id = c.db_repo.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=True, username=username)
         if c.db_repo.enable_statistics:
             c.show_stats = True
         else:
             c.show_stats = False

kallithea/model/db.py

➞

Show inline comments

@@ @@ -960,13 +960,12 @@ class Repository(Base, BaseDbModel): @@
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name'),
         _table_args_default_dict,
+    )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
     STATE_CREATED = u'repo_state_created'
     STATE_PENDING = u'repo_state_pending'
     STATE_ERROR = u'repo_state_error'
     repo_id = Column(Integer(), primary_key=True)
@@ @@ -1257,21 +1256,19 @@ class Repository(Base, BaseDbModel): @@
             import urlobject
             url_obj = urlobject.URLObject(self.clone_uri)
             if url_obj.password:
                 clone_uri = url_obj.with_password('*****')
         return clone_uri
     def clone_url(self, **override):
         clone_uri_tmpl = None
         if 'with_id' in override:
             clone_uri_tmpl = self.DEFAULT_CLONE_URI_ID
             del override['with_id']
         if 'clone_uri_tmpl' in override:
             clone_uri_tmpl = override['clone_uri_tmpl']
             del override['clone_uri_tmpl']
     def clone_url(self, clone_uri_tmpl, with_id=False, **override):
         if '{repo}' not in clone_uri_tmpl and '_{repoid}' not in clone_uri_tmpl:
             log.error("Configured clone_uri_tmpl %r has no '{repo}' or '_{repoid}' and cannot toggle to use repo id URLs", clone_uri_tmpl)
         elif with_id:
             clone_uri_tmpl = clone_uri_tmpl.replace('{repo}', '_{repoid}')
         else:
             clone_uri_tmpl = clone_uri_tmpl.replace('_{repoid}', '{repo}')
         import kallithea.lib.helpers as h
         prefix_url = h.canonical_url('home')
         return get_clone_url(clone_uri_tmpl=clone_uri_tmpl,
                              prefix_url=prefix_url,

0 comments (0 inline, 0 general)