matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Complete staging file caching refactor.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-09-12 13:32:41 -04:00
parent 9bc16aabc3
commit a85d33fd8e
4 changed files with 29 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/sources/api_views.py
View File

@@ -2,16 +2,13 @@ from __future__ import unicode_literals
from django.http import HttpResponse
from django.shortcuts import get_object_or_404
from django.views.decorators.cache import cache_control, patch_cache_control
from converter.models import Transformation
from rest_framework import generics
from rest_framework.response import Response
from .literals import STAGING_FILE_IMAGE_TASK_TIMEOUT
from .models import StagingFolderSource
from .serializers import StagingFolderFileSerializer, StagingFolderSerializer
from .settings import settings_staging_file_image_cache_time
from .storages import storage_staging_file_image_cache
from .tasks import task_generate_staging_file_image
@@ -76,8 +73,4 @@ class APIStagingSourceFileImageView(generics.RetrieveAPIView):
with storage_staging_file_image_cache.open(cache_filename) as file_object:
response = HttpResponse(file_object.read(), content_type='image')
if '_hash' in request.GET:
patch_cache_control(
response, max_age=settings_staging_file_image_cache_time.value
)
return response

45
mayan/apps/sources/classes.py
View File

@@ -20,8 +20,7 @@ from django.core.files.base import ContentFile
from django.urls import reverse
from django.utils.encoding import force_text, python_2_unicode_compatible
from converter import BaseTransformation, TransformationResize, converter_class
from converter.literals import DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL
from converter import TransformationResize, converter_class
from .storages import storage_staging_file_image_cache
@@ -76,42 +75,30 @@ class StagingFile(object):
return '{}{}'.format(self.staging_folder.pk, self.encoded_filename)
def delete(self):
#TODO: delete cached files
storage_staging_file_image_cache.delete(self.cache_filename)
os.unlink(self.get_full_path())
def generate_image(self, *args, **kwargs):
transformation_list = self.get_combined_transformation_list(*args, **kwargs)
cache_filename = '{}-{}'.format(
self.cache_filename, BaseTransformation.combine(transformation_list)
)
# Check is transformed image is available
logger.debug('transformations cache filename: %s', cache_filename)
logger.debug('transformations cache filename: %s', self.cache_filename)
if storage_staging_file_image_cache.exists(cache_filename):
if storage_staging_file_image_cache.exists(self.cache_filename):
logger.debug(
'transformations cache file "%s" found', cache_filename
'staging file cache file "%s" found', self.cache_filename
)
else:
logger.debug(
'transformations cache file "%s" not found', cache_filename
'staging file cache file "%s" not found', self.cache_filename
)
image = self.get_image(transformations=transformation_list)
with storage_staging_file_image_cache.open(cache_filename, 'wb+') as file_object:
with storage_staging_file_image_cache.open(self.cache_filename, 'wb+') as file_object:
file_object.write(image.getvalue())
#self.cached_images.create(filename=cache_filename)
return cache_filename
return self.cache_filename
def get_api_image_url(self, *args, **kwargs):
transformations_hash = BaseTransformation.combine(
self.get_combined_transformation_list(*args, **kwargs)
)
kwargs.pop('transformations', None)
final_url = furl()
final_url.args = kwargs
final_url.path = reverse(
@@ -120,7 +107,6 @@ class StagingFile(object):
self.encoded_filename
)
)
final_url.args['_hash'] = transformations_hash
return final_url.tostr()
@@ -135,8 +121,8 @@ class StagingFile(object):
# Set sensible defaults if the argument is not specified or if the
# argument is None
width = kwargs.get('width', self.staging_folder.preview_width) or self.staging_folder.preview_width
height = kwargs.get('height', self.staging_folder.preview_height) or self.staging_folder.preview_height
width = self.staging_folder.preview_width
height = self.staging_folder.preview_height
# Generate transformation hash
transformation_list = []
@@ -161,16 +147,7 @@ class StagingFile(object):
def get_image(self, transformations=None):
cache_filename = self.cache_filename
file_object = None
logger.debug('Page cache filename: %s', cache_filename)
if storage_staging_file_image_cache.exists(cache_filename):
logger.debug('Page cache file "%s" found', cache_filename)
file_object = storage_staging_file_image_cache.open(cache_filename)
converter = converter_class(file_object=file_object)
converter.seek(0)
else:
logger.debug('Page cache file "%s" not found', cache_filename)
try:
file_object = open(self.get_full_path())
converter = converter_class(file_object=file_object)
@@ -187,7 +164,7 @@ class StagingFile(object):
except Exception as exception:
# Cleanup in case of error
logger.error(
'Error creating page cache file "%s"; %s',
'Error creating staging file cache "%s"; %s',
cache_filename, exception
)
storage_staging_file_image_cache.delete(cache_filename)

7
mayan/apps/sources/settings.py
View File

@@ -31,10 +31,3 @@ setting_staging_file_image_cache_storage_arguments = namespace.add_setting(
'Arguments to pass to the SOURCES_STAGING_FILE_CACHE_STORAGE_BACKEND.'
), quoted=True,
)
settings_staging_file_image_cache_time = namespace.add_setting(
global_name='SOURCES_STAGING_FILE_IMAGE_CACHE_TIME', default='31556926',
help_text=_(
'Time in seconds that the browser should cache the supplied staging '
'file images. The default of 31559626 seconds corresponde to 1 year.'
)
)

1
mayan/apps/sources/tasks.py
View File

@@ -14,7 +14,6 @@ from common.exceptions import NoMIMETypeMatch
from lock_manager import LockError
from lock_manager.runtime import locking_backend
from .classes import StagingFile
from .literals import (
DEFAULT_SOURCE_LOCK_EXPIRE, DEFAULT_SOURCE_TASK_RETRY_DELAY
)