diff --git a/apps/converter/conf/settings.py b/apps/converter/conf/settings.py index f13cc2c76f..e9dcad1eaa 100644 --- a/apps/converter/conf/settings.py +++ b/apps/converter/conf/settings.py @@ -13,8 +13,6 @@ register_settings( {'name': u'GM_PATH', 'global_name': u'CONVERTER_GM_PATH', 'default': u'/usr/bin/gm', 'description': _(u'File path to graphicsmagick\'s program.'), 'exists': True}, {'name': u'GM_SETTINGS', 'global_name': u'CONVERTER_GM_SETTINGS', 'default': u''}, {'name': u'GRAPHICS_BACKEND', 'global_name': u'CONVERTER_GRAPHICS_BACKEND', 'default': u'converter.backends.python', 'description': _(u'Graphics conversion backend to use. Options are: converter.backends.imagemagick, converter.backends.graphicsmagick and converter.backends.python.')}, - {'name': u'UNOCONV_PATH', 'global_name': u'CONVERTER_UNOCONV_PATH', 'default': u'/usr/bin/unoconv', 'exists': True, 'description': _(u'Path to the unoconv program.')}, - {'name': u'UNOCONV_USE_PIPE', 'global_name': u'CONVERTER_UNOCONV_USE_PIPE', 'default': True, 'description': _(u'Use alternate method of connection to LibreOffice using a pipe, it is slower but less prone to segmentation faults.')}, {'name': u'LIBREOFFICE_PATH', 'global_name': u'CONVERTER_LIBREOFFICE_PATH', 'default': u'/usr/bin/libreoffice', 'exists': True, 'description': _(u'Path to the libreoffice program.')}, #{'name': u'OCR_OPTIONS', 'global_name': u'CONVERTER_OCR_OPTIONS', 'default': u'-colorspace Gray -depth 8 -resample 200x200'}, diff --git a/apps/converter/office_converter.py b/apps/converter/office_converter.py index bdf9e36419..f2d80bc16d 100644 --- a/apps/converter/office_converter.py +++ b/apps/converter/office_converter.py @@ -8,7 +8,7 @@ from mimetype.api import get_mimetype from common.conf.settings import TEMPORARY_DIRECTORY from common.utils import id_generator -from .conf.settings import UNOCONV_PATH, UNOCONV_USE_PIPE, LIBREOFFICE_PATH +from .conf.settings import LIBREOFFICE_PATH from .exceptions import (OfficeConversionError, OfficeBackendError, UnknownFileFormat) @@ -79,47 +79,6 @@ class OfficeConverter(object): return str(self.__unicode__()) -class OfficeConverterBackendUnoconv(object): - def __init__(self): - self.unoconv_path = UNOCONV_PATH if UNOCONV_PATH else u'/usr/bin/unoconv' - if not os.path.exists(self.unoconv_path): - raise OfficeBackendError('cannot find unoconv executable') - - def convert(self, input_filepath, output_filepath): - """ - Executes the program unoconv using subprocess's Popen - """ - self.input_filepath = input_filepath - self.output_filepath = output_filepath - - command = [] - command.append(self.unoconv_path) - - if UNOCONV_USE_PIPE: - command.append(u'--pipe') - command.append(u'mayan-%s' % id_generator()) - - command.append(u'--format') - command.append(u'pdf') - command.append(u'--output') - command.append(self.output_filepath) - command.append(self.input_filepath) - - try: - proc = subprocess.Popen(command, close_fds=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE) - return_code = proc.wait() - logger.debug('return_code: %s' % return_code) - - readline = proc.stderr.readline() - logger.debug('stderr: %s' % readline) - if return_code != 0: - raise OfficeBackendError(readline) - except OSError, msg: - raise OfficeBackendError(msg) - except Exception, msg: - logger.error('Unhandled exception', exc_info=msg) - - class OfficeConverterBackendDirect(object): def __init__(self): self.libreoffice_path = LIBREOFFICE_PATH if LIBREOFFICE_PATH else u'/usr/bin/libreoffice'