kallithea Changeset - 8e01265fb586

Changeset - 8e01265fb586

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-05-21 02:17:13
marcin@python-works.com

added long term caching of repo_list to the base controller. changed hg and repos to use that cached list.

3 files changed with 8 insertions and 19 deletions:

pylons_app/controllers/hg.py

pylons_app/controllers/repos.py

pylons_app/lib/base.py

0 comments (0 inline, 0 general)

pylons_app/controllers/hg.py

➞

Show inline comments

@@ @@ -3,37 +3,28 @@ @@
 import logging
 from operator import itemgetter
 from pylons import tmpl_context as c, request, config
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model.hg_model import HgModel
 from beaker.cache import cache_region
 log = logging.getLogger(__name__)
 class HgController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
         c.repo_name = get_repo_slug(request)
     def index(self):
         hg_model = HgModel()
         @cache_region('short_term', 'repo_list')
         def _list():
             return list(hg_model.get_repos())
         c.repos_list = _list()
         c.current_sort = request.GET.get('sort', 'name')
         cs = c.current_sort
         c.cs_slug = cs.replace('-', '')
         sortables = ['name', 'description', 'last_change', 'tip', 'contact']
         if cs and c.cs_slug in sortables:
             sort_key = c.cs_slug + '_sort'
             if cs.startswith('-'):
-                c.repos_list.sort(key=itemgetter(sort_key), reverse=True)
+                c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key), reverse=True)
             else:
-                c.repos_list.sort(key=itemgetter(sort_key), reverse=False)
+                c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key), reverse=False)
         return render('/index.html')

pylons_app/controllers/repos.py

➞

Show inline comments

@@ @@ -23,15 +23,13 @@ class ReposController(BaseController): @@
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
         hg_model = HgModel()
         c.repos_list = list(hg_model.get_repos())
         c.repos_list.sort(key=itemgetter('name'))
         c.repos_list = c.cached_repo_list
         return render('admin/repos/repos.html')
     def create(self):
         """POST /repos: Create a new item"""
         # url('repos')
@@ @@ -61,13 +59,13 @@ class ReposController(BaseController): @@
         rm_path = os.path.join(path, id)
         log.info("Removing %s", rm_path)
         shutil.move(os.path.join(rm_path, '.hg'), os.path.join(rm_path, 'rm__.hg'))
         shutil.move(rm_path, os.path.join(path, 'rm__%s-%s' % (datetime.today(), id)))
         #clear our cached list for refresh with new repo
-        invalidate_cache('repo_list_2')
+        invalidate_cache('cached_repo_list')
         return redirect(url('repos'))
     def show(self, id, format='html'):
         """GET /repos/id: Show a specific item"""

pylons_app/lib/base.py

➞

Show inline comments

@@ @@ -6,23 +6,23 @@ from pylons.controllers import WSGIContr @@
 from pylons.templating import render_mako as render
 from pylons_app.model import meta
 from beaker.cache import cache_region
 from pylons import tmpl_context as c
 from pylons_app.model.hg_model import HgModel
 @cache_region('long_term', 'repo_list_2')
 def _get_repos():
     return [rep['name'] for rep in HgModel().get_repos()]
 @cache_region('long_term', 'cached_repo_list')
 def _get_repos_cached():
     return [rep for rep in HgModel().get_repos()]
 class BaseController(WSGIController):
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
-        c.repo_list = _get_repos()
+        c.cached_repo_list = _get_repos_cached()
         self.sa = meta.Session
         try:
             return WSGIController.__call__(self, environ, start_response)
         finally:
             meta.Session.remove()

0 comments (0 inline, 0 general)