Converter: Rename setting

Change the CONVERTER_GRAPHICS_BACKEND_CONFIG settings
to CONVERTER_GRAPHICS_BACKEND_ARGUMENTS for uniformity
and to convey it real purpose which is initializing a backend.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-11-26 17:39:48 -04:00
parent f5f6470697
commit 5c1eb59a1a
4 changed files with 11 additions and 10 deletions

View File

@@ -66,6 +66,7 @@
TypeError: type object argument after ** must be a mapping, not str
- Rename the CONVERTER_GRAPHICS_BACKEND_CONFIG to CONVERTER_GRAPHICS_BACKEND_ARGUMENTS.
3.1.9 (2018-11-01)
==================

View File

@@ -15,7 +15,7 @@ from common.utils import fs_cleanup, mkstemp
from ..classes import ConverterBase
from ..exceptions import PageCountError
from ..settings import setting_graphics_backend_config
from ..settings import setting_graphics_backend_arguments
from ..literals import (
DEFAULT_PDFTOPPM_DPI, DEFAULT_PDFTOPPM_FORMAT, DEFAULT_PDFTOPPM_PATH,
@@ -24,7 +24,7 @@ from ..literals import (
try:
pdftoppm = sh.Command(
setting_graphics_backend_config.value.get(
setting_graphics_backend_arguments.value.get(
'pdftoppm_path', DEFAULT_PDFTOPPM_PATH
)
)
@@ -32,13 +32,13 @@ except sh.CommandNotFound:
pdftoppm = None
else:
pdftoppm_format = '-{}'.format(
setting_graphics_backend_config.value.get(
setting_graphics_backend_arguments.value.get(
'pdftoppm_format', DEFAULT_PDFTOPPM_FORMAT
)
)
pdftoppm_dpi = format(
setting_graphics_backend_config.value.get(
setting_graphics_backend_arguments.value.get(
'pdftoppm_dpi', DEFAULT_PDFTOPPM_DPI
)
)
@@ -47,7 +47,7 @@ else:
try:
pdfinfo = sh.Command(
setting_graphics_backend_config.value.get(
setting_graphics_backend_arguments.value.get(
'pdfinfo_path', DEFAULT_PDFINFO_PATH
)
)

View File

@@ -18,14 +18,14 @@ from .exceptions import InvalidOfficeFormat, OfficeConversionError
from .literals import (
DEFAULT_LIBREOFFICE_PATH, DEFAULT_PAGE_NUMBER, DEFAULT_PILLOW_FORMAT
)
from .settings import setting_graphics_backend_config
from .settings import setting_graphics_backend_arguments
CHUNK_SIZE = 1024
logger = logging.getLogger(__name__)
try:
LIBREOFFICE = sh.Command(
setting_graphics_backend_config.value.get(
setting_graphics_backend_arguments.value.get(
'libreoffice_path', DEFAULT_LIBREOFFICE_PATH
)
).bake('--headless', '--convert-to', 'pdf:writer_pdf_Export')
@@ -179,7 +179,7 @@ class ConverterBase(object):
fs_cleanup(converted_output)
def get_page(self, output_format=None, as_base64=False):
output_format = output_format or setting_graphics_backend_config.value.get(
output_format = output_format or setting_graphics_backend_arguments.value.get(
'pillow_format', DEFAULT_PILLOW_FORMAT
)

View File

@@ -15,7 +15,7 @@ setting_graphics_backend = namespace.add_setting(
help_text=_('Graphics conversion backend to use.'),
global_name='CONVERTER_GRAPHICS_BACKEND',
)
setting_graphics_backend_config = namespace.add_setting(
setting_graphics_backend_arguments = namespace.add_setting(
default='''
{{
libreoffice_path: {},
@@ -32,5 +32,5 @@ setting_graphics_backend_config = namespace.add_setting(
DEFAULT_PILLOW_FORMAT
), help_text=_(
'Configuration options for the graphics conversion backend.'
), global_name='CONVERTER_GRAPHICS_BACKEND_CONFIG'
), global_name='CONVERTER_GRAPHICS_BACKEND_ARGUMENTS'
)