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

Properly import COMMON_TEMPORARY_DIRECTORY, removed more QUALITY related code

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-21 03:45:14 -04:00
parent 8ca9c5d4cd
commit 01de394b88
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/converter/api.py
View File

@@ -2,14 +2,12 @@ import os
import subprocess import subprocess
import hashlib import hashlib
from common import TEMPORARY_DIRECTORY from common.conf.settings import TEMPORARY_DIRECTORY
from documents.utils import document_save_to_temp_dir
from converter.conf.settings import UNOCONV_PATH from converter.conf.settings import UNOCONV_PATH
from converter.exceptions import OfficeConversionError from converter.exceptions import OfficeConversionError
from converter.literals import DEFAULT_PAGE_NUMBER, \ from converter.literals import DEFAULT_PAGE_NUMBER, \
QUALITY_DEFAULT, DEFAULT_ZOOM_LEVEL, \ DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, DEFAULT_FILE_FORMAT
DEFAULT_ROTATION, DEFAULT_FILE_FORMAT, QUALITY_HIGH
from converter import backend from converter import backend
from converter.literals import TRANSFORMATION_CHOICES from converter.literals import TRANSFORMATION_CHOICES
@@ -62,26 +60,19 @@ def convert_office_document(input_filepath):
return None return None
def convert_document(document, *args, **kwargs): def convert(input_filepath, output_filepath=None, cleanup_files=False, *args, **kwargs):
document_filepath = create_image_cache_filename(document.checksum, *args, **kwargs)
if os.path.exists(document_filepath):
return document_filepath
return convert(document_save_to_temp_dir(document, document.checksum), *args, **kwargs)
def convert(input_filepath, cleanup_files=True, *args, **kwargs):
size = kwargs.get('size') size = kwargs.get('size')
file_format = kwargs.get('file_format', DEFAULT_FILE_FORMAT) file_format = kwargs.get('file_format', DEFAULT_FILE_FORMAT)
zoom = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL) zoom = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL)
rotation = kwargs.get('rotation', DEFAULT_ROTATION) rotation = kwargs.get('rotation', DEFAULT_ROTATION)
page = kwargs.get('page', DEFAULT_PAGE_NUMBER) page = kwargs.get('page', DEFAULT_PAGE_NUMBER)
quality = kwargs.get('quality', QUALITY_DEFAULT)
transformations = kwargs.get('transformations', []) transformations = kwargs.get('transformations', [])
unoconv_output = None unoconv_output = None
output_filepath = create_image_cache_filename(input_filepath, *args, **kwargs) if output_filepath is None:
output_filepath = create_image_cache_filename(input_filepath, *args, **kwargs)
if os.path.exists(output_filepath): if os.path.exists(output_filepath):
return output_filepath return output_filepath
@@ -117,7 +108,7 @@ def convert(input_filepath, cleanup_files=True, *args, **kwargs):
) )
try: try:
backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, quality=quality, transformations=transformations, page=page, file_format=file_format) backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, transformations=transformations, page=page, file_format=file_format)
finally: finally:
if cleanup_files: if cleanup_files:
cleanup(input_filepath) cleanup(input_filepath)

2
apps/documents/utils.py
View File

@@ -1,6 +1,6 @@
import os import os
from common import TEMPORARY_DIRECTORY from common.conf.settings import TEMPORARY_DIRECTORY
#http://stackoverflow.com/questions/123198/how-do-i-copy-a-file-in-python #http://stackoverflow.com/questions/123198/how-do-i-copy-a-file-in-python