From 370d58d2fd2b327d542855d49157e8f2c6864443 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 31 Jan 2016 09:31:00 +0100 Subject: [PATCH] automatically setup cache values against MEDIA_ROOT (closes #95) --- telemeta/pages | 2 +- telemeta/views/core.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/telemeta/pages b/telemeta/pages index 4fcb6022..f8324093 160000 --- a/telemeta/pages +++ b/telemeta/pages @@ -1 +1 @@ -Subproject commit 4fcb6022f8a1cf0780fc526737e84b8e690c1f88 +Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5 diff --git a/telemeta/views/core.py b/telemeta/views/core.py index 0ea75b39..42e2fe5f 100644 --- a/telemeta/views/core.py +++ b/telemeta/views/core.py @@ -98,9 +98,11 @@ mods = {'item': MediaItem, 'collection': MediaCollection, class TelemetaBaseMixin(object): - cache_data = TelemetaCache(settings.TELEMETA_DATA_CACHE_DIR) - cache_export = TelemetaCache(settings.TELEMETA_EXPORT_CACHE_DIR) - cache_tmp = TelemetaCache(settings.FILE_UPLOAD_TEMP_DIR) + MEDIA_ROOT = getattr(settings, 'MEDIA_ROOT') + CACHE_DIR = os.path.join(MEDIA_ROOT, 'cache') + cache_data = TelemetaCache(getattr(settings, 'TELEMETA_DATA_CACHE_DIR', CACHE_DIR)) + cache_export = TelemetaCache(getattr(settings, 'TELEMETA_EXPORT_CACHE_DIR', os.path.join(CACHE_DIR, 'export'))) + cache_tmp = TelemetaCache(getattr(settings, 'FILE_UPLOAD_TEMP_DIR', os.path.join(MEDIA_ROOT, 'tmp'))) class FixedFileWrapper(FileWrapper): -- 2.39.5