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

Improved unkwnown format detection in the graphicsmagick backend

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-23 19:41:51 -04:00
parent 87c8b26270
commit 3de2969ec5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/converter/backends/graphicsmagick.py
View File

@@ -6,7 +6,7 @@ from converter.api import QUALITY_DEFAULT, QUALITY_SETTINGS
from converter.exceptions import ConvertError, UnknownFormat, IdentifyError from converter.exceptions import ConvertError, UnknownFormat, IdentifyError
CONVERTER_ERROR_STRING_NO_DECODER = u'No decode delegate for this image format' CONVERTER_ERROR_STRING_NO_DECODER = u'No decode delegate for this image format'
CONVERTER_ERROR_STARTS_WITH = u'starts with'
def execute_identify(input_filepath, arguments=u''): def execute_identify(input_filepath, arguments=u''):
command = [] command = []
@@ -36,7 +36,7 @@ def execute_convert(input_filepath, output_filepath, quality=QUALITY_DEFAULT, ar
if return_code != 0: if return_code != 0:
#Got an error from convert program #Got an error from convert program
error_line = proc.stderr.readline() error_line = proc.stderr.readline()
if CONVERTER_ERROR_STRING_NO_DECODER in error_line: if (CONVERTER_ERROR_STRING_NO_DECODER in error_line) or (CONVERTER_ERROR_STARTS_WITH in error_line):
#Try to determine from error message which class of error is it #Try to determine from error message which class of error is it
raise UnknownFormat raise UnknownFormat
else: else: