# HG changeset patch # User Marcin Kuzminski # Date 2013-04-05 13:49:03 # Node ID 8849c07d8c628feed1e71f10976bbcaf4cf79bd6 # Parent f18801f827da1b6d3789e861ac3d6d54376dd1c1 fixed prefix extractions from cache keys + cleanup diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1653,12 +1653,27 @@ class CacheInvalidation(Base, BaseModel) return u"<%s('%s:%s[%s]')>" % (self.__class__.__name__, self.cache_id, self.cache_key, self.cache_active) + def _cache_key_partition(self): + prefix, repo_name, suffix = self.cache_key.partition(self.cache_args) + return prefix, repo_name, suffix + def get_prefix(self): """ - Guess prefix that might have been used in _get_cache_key to generate self.cache_key . - Only used for informational purposes in repo_edit.html . + get prefix that might have been used in _get_cache_key to + generate self.cache_key. Only used for informational purposes + in repo_edit.html. """ - return self.cache_key.split(self.cache_args, 1)[0] + # prefix, repo_name, suffix + return self._cache_key_partition()[0] + + def get_suffix(self): + """ + get suffix that might have been used in _get_cache_key to + generate self.cache_key. Only used for informational purposes + in repo_edit.html. + """ + # prefix, repo_name, suffix + return self._cache_key_partition()[2] @classmethod def _get_cache_key(cls, key):