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

Update Document model to use background image conversion task

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-03 02:41:29 -04:00
parent 2833b6a4ec
commit b3ec836acf
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mayan/apps/documents/models.py
View File

@@ -24,6 +24,7 @@ from converter.api import (convert, get_page_count,
from converter.exceptions import UnknownFileFormat from converter.exceptions import UnknownFileFormat
from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
DEFAULT_PAGE_NUMBER) DEFAULT_PAGE_NUMBER)
from converter.tasks import task_convert
from mimetype.api import get_mimetype from mimetype.api import get_mimetype
from .exceptions import NewDocumentVersionNotAllowed from .exceptions import NewDocumentVersionNotAllowed
@@ -37,9 +38,8 @@ from .settings import (CACHE_PATH, CHECKSUM_FUNCTION, DISPLAY_SIZE,
UUID_FUNCTION, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL) UUID_FUNCTION, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
from .utils import document_save_to_temp_dir from .utils import document_save_to_temp_dir
# document image cache name hash function CONVERTER_TASK_TIMEOUT = 2 # In seconds
HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest() HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest() # document image cache name hash function
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -134,7 +134,8 @@ class Document(models.Model):
logger.debug('image_cache_name: %s' % image_cache_name) logger.debug('image_cache_name: %s' % image_cache_name)
return convert(image_cache_name, cleanup_files=False, size=size, zoom=zoom, rotation=rotation) task = task_convert.delay(image_cache_name, cleanup_files=False, size=size, zoom=zoom, rotation=rotation)
return task.get(timeout=CONVERTER_TASK_TIMEOUT)
def get_image(self, size=DISPLAY_SIZE, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, as_base64=False, version=None): def get_image(self, size=DISPLAY_SIZE, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, as_base64=False, version=None):
if zoom < ZOOM_MIN_LEVEL: if zoom < ZOOM_MIN_LEVEL: