Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Simplify helper functions for cache keys

Roland Geiderad18024f818c
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 1cda24d75..ad8be1d86 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -68,60 +68,46 @@ class CacheKeyMapper(object):
WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}'
WORKOUT_LOG_LIST = 'workout-log-hash-{0}'
- def get_exercise_muscle_bg_key(self, param):
+ def get_pk(self, param):
'''
- Return the exercise muscle background cache key
+ Small helper function that returns the PK for the given parameter
'''
try:
pk = param.pk
except AttributeError:
pk = param
- return self.EXERCISE_CACHE_KEY_MUSCLE_BG.format(pk)
+ return pk
+
+ def get_exercise_muscle_bg_key(self, param):
+ '''
+ Return the exercise muscle background cache key
+ '''
+ return self.EXERCISE_CACHE_KEY_MUSCLE_BG.format(self.get_pk(param))
def get_language_key(self, param):
'''
Return the language cache key
'''
- try:
- pk = param.pk
- except AttributeError:
- pk = param
-
- return self.LANGUAGE_CACHE_KEY.format(pk)
+ return self.LANGUAGE_CACHE_KEY.format(self.get_pk(param))
def get_language_config_key(self, param, item):
'''
Return the language cache key
'''
- try:
- pk = param.pk
- except AttributeError:
- pk = param
-
- return self.LANGUAGE_CONFIG_CACHE_KEY.format(pk, item)
+ return self.LANGUAGE_CONFIG_CACHE_KEY.format(self.get_pk(param), item)
def get_ingredient_key(self, param):
'''
Return the ingredient cache key
'''
- try:
- pk = param.pk
- except AttributeError:
- pk = param
-
- return self.INGREDIENT_CACHE_KEY.format(pk)
+ return self.INGREDIENT_CACHE_KEY.format(self.get_pk(param))
def get_workout_canonical(self, param):
'''
Return the workout canonical representation
'''
- try:
- pk = param.pk
- except AttributeError:
- pk = param
-
- return self.WORKOUT_CANONICAL_REPRESENTATION.format(pk)
+ return self.WORKOUT_CANONICAL_REPRESENTATION.format(self.get_pk(param))
def get_workout_log_list(self, hash_value):
'''