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

Updated python converter backend, document model and staging module to use the new get_mimetype API

Browse Source
This commit is contained in:
Roberto Rosario
2011-11-07 00:05:25 -04:00
parent 160950b6f4
commit 557c960094
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/converter/backends/python/base.py
View File

@@ -25,7 +25,7 @@ class ConverterClass(ConverterBase):
def get_page_count(self, input_filepath): def get_page_count(self, input_filepath):
page_count = 1 page_count = 1
mimetype, encoding = get_mimetype(input_filepath) mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath)
if mimetype == 'application/pdf': if mimetype == 'application/pdf':
# If file is a PDF open it with slate to determine the page # If file is a PDF open it with slate to determine the page
# count # count
@@ -50,7 +50,7 @@ class ConverterClass(ConverterBase):
def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT): def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT):
tmpfile = None tmpfile = None
mimetype, encoding = get_mimetype(input_filepath) mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath)
if mimetype == 'application/pdf' and USE_GHOSTSCRIPT: if mimetype == 'application/pdf' and USE_GHOSTSCRIPT:
# If file is a PDF open it with ghostscript and convert it to # If file is a PDF open it with ghostscript and convert it to
# TIFF # TIFF

4
apps/documents/models.py
View File

@@ -17,7 +17,7 @@ from converter.api import get_page_count
from converter.api import get_available_transformations_choices from converter.api import get_available_transformations_choices
from converter.api import convert from converter.api import convert
from converter.exceptions import UnknownFileFormat, UnkownConvertError from converter.exceptions import UnknownFileFormat, UnkownConvertError
from mimetype.api import get_document_mimetype, get_icon_file_path, \ from mimetype.api import get_mimetype, get_icon_file_path, \
get_error_icon_file_path get_error_icon_file_path
from documents.conf.settings import CHECKSUM_FUNCTION from documents.conf.settings import CHECKSUM_FUNCTION
@@ -135,7 +135,7 @@ class Document(models.Model):
""" """
if self.exists(): if self.exists():
try: try:
self.file_mimetype, self.mime_encoding = get_document_mimetype(self) self.file_mimetype, self.mime_encoding = get_mimetype(self.open(), self.get_fullname())
except: except:
self.file_mimetype = u'' self.file_mimetype = u''
self.file_mime_encoding = u'' self.file_mime_encoding = u''

3
apps/sources/staging.py
View File

@@ -138,6 +138,7 @@ class StagingFile(object):
try: try:
return convert(self.filepath, size=size, cleanup_files=False, transformations=transformations) return convert(self.filepath, size=size, cleanup_files=False, transformations=transformations)
except UnknownFileFormat: except UnknownFileFormat:
return get_icon_file_path(get_mimetype(self.filepath)) mimetype, encoding = get_mimetype(open(self.filepath, 'rb'), self.filepath)
return get_icon_file_path(mimetype)
except UnkownConvertError: except UnkownConvertError:
return get_error_icon_file_path() return get_error_icon_file_path()