Renamed avatar cache to store

misago/project_template/project_name/settings.py

@@ -68,7 +68,7 @@ MEDIA_URL = '/media/'
 
 # Automatically setup default paths to media and attachments directories
 MISAGO_ATTACHMENTS_ROOT = os.path.join(BASE_DIR, 'attachments')
-MISAGO_AVATAR_CACHE = os.path.join(BASE_DIR, 'avatar_cache')
+MISAGO_AVATAR_STORE = os.path.join(BASE_DIR, 'avatar_store')
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')

misago/users/avatars/__init__.py

@@ -1,6 +1,6 @@
 from misago.conf import settings
 
-from misago.users.avatars import cache, gravatar, dynamic, gallery, uploaded
+from misago.users.avatars import store, gravatar, dynamic, gallery, uploaded
 
 
 AVATAR_TYPES = ('gravatar', 'dynamic', 'gallery', 'uploaded')
@@ -24,4 +24,4 @@ def set_default_avatar(user):
 
 
 def delete_avatar(user):
-    cache.delete_avatar(user)
+    store.delete_avatar(user)

misago/users/avatars/dynamic.py

@@ -7,7 +7,7 @@ from PIL import Image, ImageDraw, ImageColor, ImageFont, ImageFilter
 
 from misago.conf import settings
 
-from misago.users.avatars import cache
+from misago.users.avatars import store
 
 
 def set_avatar(user):
@@ -18,7 +18,7 @@ def set_avatar(user):
     drawer_function = getattr(drawer_module, name_bits[-1])
 
     image = drawer_function(user)
-    cache.store_new_avatar(user, image)
+    store.store_new_avatar(user, image)
 
 
 """

misago/users/avatars/gallery.py

@@ -5,7 +5,7 @@ from PIL import Image
 
 from django.conf import settings
 
-from misago.users.avatars import cache
+from misago.users.avatars import store
 from misago.users.avatars.paths import MEDIA_AVATARS
 
 
@@ -50,7 +50,7 @@ def is_avatar_from_gallery(image_path):
 
 def set_avatar(user, gallery_image_path):
     image = Image.open(settings.MEDIA_ROOT + gallery_image_path)
-    cache.store_new_avatar(user, image)
+    store.store_new_avatar(user, image)
 
 
 def set_random_avatar(user):

misago/users/avatars/gravatar.py

@@ -5,7 +5,7 @@ import requests
 
 from misago.conf import settings
 
-from misago.users.avatars import cache
+from misago.users.avatars import store
 
 
 GRAVATAR_URL = 'http://www.gravatar.com/avatar/%s?s=%s&d=404'
@@ -28,6 +28,6 @@ def set_avatar(user):
                 'gravatar is not available for this e-mail')
 
         image = Image.open(StringIO(r.content))
-        cache.store_new_avatar(user, image)
+        store.store_new_avatar(user, image)
     except requests.exceptions.RequestException:
         raise GravatarError('failed to connect to gravatar servers')

misago/users/avatars/paths.py

@@ -5,6 +5,6 @@ from path import path
 from misago.conf import settings
 
 
-AVATARS_CACHE = settings.MISAGO_AVATAR_CACHE
+AVATARS_STORE = settings.MISAGO_AVATAR_STORE
 MEDIA_AVATARS = os.path.join(settings.MEDIA_ROOT, 'avatars')
 BLANK_AVATAR = os.path.join(MEDIA_AVATARS, 'blank.png')

misago/users/avatars/cache.py → misago/users/avatars/store.py

@@ -5,7 +5,7 @@ from PIL import Image
 
 from misago.conf import settings
 
-from misago.users.avatars.paths import AVATARS_CACHE
+from misago.users.avatars.paths import AVATARS_STORE
 
 
 def store_avatar(user, image):
@@ -36,7 +36,7 @@ def store_new_avatar(user, image):
 
 def get_existing_avatars_dir(user):
     date_dir = unicode(user.joined_on.strftime('%y%m'))
-    avatars_dir = path(os.path.join(AVATARS_CACHE, date_dir))
+    avatars_dir = path(os.path.join(AVATARS_STORE, date_dir))
 
     if not avatars_dir.exists():
         avatars_dir.mkdir()

misago/users/views/avatarserver.py

@@ -19,14 +19,14 @@ def serve_user_avatar(request, user_id, size):
     else:
         avatar_file = get_blank_avatar_file(size)
 
-    avatar_path = '%s/%s.png' % (settings.MISAGO_AVATAR_CACHE, avatar_file)
+    avatar_path = '%s/%s.png' % (settings.MISAGO_AVATAR_STORE, avatar_file)
     return make_file_response(avatar_path, 'image/png')
 
 
 def serve_blank_avatar(request, size):
     size = clean_size(size)
     avatar_file = get_blank_avatar_file(size)
-    avatar_path = '%s/%s.png' % (settings.MISAGO_AVATAR_CACHE, avatar_file)
+    avatar_path = '%s/%s.png' % (settings.MISAGO_AVATAR_STORE, avatar_file)
     return make_file_response(avatar_path, 'image/png')