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

Moved the converter to its own app

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-08 19:46:46 -04:00
parent 584f525783
commit 37f74a3f26
7 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/documents/convert.py
View File

@@ -1,42 +0,0 @@
import os
import subprocess
import tempfile
#from django.core.files.base import File
from documents.conf.settings import TEMPORARY_DIRECTORY
def in_cache(input_filepath, size, page=0, format='jpg'):
temp_directory = TEMPORARY_DIRECTORY if TEMPORARY_DIRECTORY else tempfile.mkdtemp()
temp_filename, separator = os.path.splitext(os.path.basename(input_filepath))
temp_path = os.path.join(temp_directory, temp_filename)
output_arg = '%s_%s%s%s' % (temp_path, size, os.extsep, format)
input_arg = '%s[%s]' % (input_filepath, page)
if os.path.exists(output_arg):
return output_arg
else:
return None
def convert(input_filepath, size, cache=True, page=0, format='jpg'):
temp_directory = TEMPORARY_DIRECTORY if TEMPORARY_DIRECTORY else tempfile.mkdtemp()
#TODO: generate output file using lightweight hash function on
#file name or file content
#descriptor, temp_filepath = tempfile.mkstemp()
temp_filename, separator = os.path.splitext(os.path.basename(input_filepath))
temp_path = os.path.join(temp_directory, temp_filename)
output_arg = '%s_%s%s%s' % (temp_path, size, os.extsep, format)
input_arg = '%s[%s]' % (input_filepath, page)
if os.path.exists(output_arg):
return output_arg
#TODO: Check mimetype and use corresponding utility
convert = subprocess.Popen(['convert', input_arg, '-resize', size, output_arg])
return_code = convert.wait()
if return_code:
raise Exception
#TODO: check return code & messages
#TODO: Timeout & kill child
return output_arg

5
apps/documents/views.py
View File

@@ -12,9 +12,10 @@ from django.forms.formsets import formset_factory
from django.core.files.base import File
from filetransfers.api import serve_file
from converter.api import convert, in_cache
from common.utils import pretty_size
from convert import convert, in_cache
from utils import from_descriptor_to_tempfile, pretty_size
from utils import from_descriptor_to_tempfile
from models import Document, DocumentMetadata, DocumentType, MetadataType
from forms import DocumentTypeSelectForm, DocumentCreateWizard, \