Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #90 from gazpachoking/fix_cache

Browse source 
Enable caching of wiki pages
This commit is contained in:
Matthew Scragg 2015-12-11 10:14:58 -06:00
parent e565a0a77a d07c3e4bcf
commit 0aedf8177d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
realms/modules/wiki/models.py
View file

@ -48,6 +48,9 @@ class Wiki(HookMixin):
return username, email return username, email
def _cache_key(self, name, sha='HEAD'):
return 'page/%s[%s]' % (name, sha)
def revert_page(self, name, commit_sha, message, username, email): def revert_page(self, name, commit_sha, message, username, email):
"""Revert page to passed commit sha1 """Revert page to passed commit sha1
@ -104,7 +107,7 @@ class Wiki(HookMixin):
message=message, message=message,
files=[filename]) files=[filename])
cache.delete(cname) cache.delete(self._cache_key(cname))
return ret return ret
@ -145,7 +148,7 @@ class Wiki(HookMixin):
message=message, message=message,
files=[old_filename, new_filename]) files=[old_filename, new_filename])
cache.delete_many(old_name, new_name) cache.delete_many(self._cache_key(old_name), self._cache_key(new_name))
return commit return commit
@ -172,7 +175,7 @@ class Wiki(HookMixin):
email=email, email=email,
message=message, message=message,
files=[filename]) files=[filename])
cache.delete_many(name) cache.delete_many(self._cache_key(name))
return commit return commit
def get_page(self, name, sha='HEAD'): def get_page(self, name, sha='HEAD'):
@ -183,7 +186,7 @@ class Wiki(HookMixin):
:return: dict :return: dict
""" """
cached = cache.get(name) cached = cache.get(self._cache_key(name, sha))
if cached: if cached:
return cached return cached
@ -203,6 +206,7 @@ class Wiki(HookMixin):
partials[partial_name] = self.get_page(partial_name) partials[partial_name] = self.get_page(partial_name)
data['partials'] = partials data['partials'] = partials
data['info'] = self.get_history(name, limit=1)[0] data['info'] = self.get_history(name, limit=1)[0]
cache.set(self._cache_key(name, sha), data)
return data return data
except KeyError: except KeyError: