From 51f15a3131945e219eacdfc9fa87c4e57fd1b2be Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 26 Nov 2018 17:45:43 -0400 Subject: [PATCH] Settings: Update defaults formats Update the default values of the settings which pass arguments to backends to be valid Python values and not YAML strings. Signed-off-by: Roberto Rosario --- mayan/apps/common/settings.py | 4 +--- mayan/apps/converter/settings.py | 23 ++++++++-------------- mayan/apps/document_signatures/settings.py | 6 +++--- mayan/apps/documents/settings.py | 11 +++++------ mayan/apps/ocr/settings.py | 3 +-- mayan/apps/sources/settings.py | 6 +++--- 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/mayan/apps/common/settings.py b/mayan/apps/common/settings.py index d79adf1b19..70545ee79a 100644 --- a/mayan/apps/common/settings.py +++ b/mayan/apps/common/settings.py @@ -65,9 +65,7 @@ setting_shared_storage = namespace.add_setting( ) setting_shared_storage_arguments = namespace.add_setting( global_name='COMMON_SHARED_STORAGE_ARGUMENTS', - default='{{location: {}}}'.format( - os.path.join(settings.MEDIA_ROOT, 'shared_files') - ) + default={'location': os.path.join(settings.MEDIA_ROOT, 'shared_files')} ) setting_temporary_directory = namespace.add_setting( global_name='COMMON_TEMPORARY_DIRECTORY', default=tempfile.gettempdir(), diff --git a/mayan/apps/converter/settings.py b/mayan/apps/converter/settings.py index fe1469b516..4338386d85 100644 --- a/mayan/apps/converter/settings.py +++ b/mayan/apps/converter/settings.py @@ -16,21 +16,14 @@ setting_graphics_backend = namespace.add_setting( global_name='CONVERTER_GRAPHICS_BACKEND', ) setting_graphics_backend_arguments = namespace.add_setting( - default=''' - {{ - libreoffice_path: {}, - pdftoppm_dpi: {}, - pdftoppm_format: {}, - pdftoppm_path: {}, - pdfinfo_path: {}, - pillow_format: {} - - }} - '''.replace('\n', '').format( - DEFAULT_LIBREOFFICE_PATH, DEFAULT_PDFTOPPM_DPI, - DEFAULT_PDFTOPPM_FORMAT, DEFAULT_PDFTOPPM_PATH, DEFAULT_PDFINFO_PATH, - DEFAULT_PILLOW_FORMAT - ), help_text=_( + default={ + 'libreoffice_path': DEFAULT_LIBREOFFICE_PATH, + 'pdftoppm_dpi': DEFAULT_PDFTOPPM_DPI, + 'pdftoppm_format': DEFAULT_PDFTOPPM_FORMAT, + 'pdftoppm_path': DEFAULT_PDFTOPPM_PATH, + 'pdfinfo_path': DEFAULT_PDFINFO_PATH, + 'pillow_format': DEFAULT_PILLOW_FORMAT + }, help_text=_( 'Configuration options for the graphics conversion backend.' ), global_name='CONVERTER_GRAPHICS_BACKEND_ARGUMENTS' ) diff --git a/mayan/apps/document_signatures/settings.py b/mayan/apps/document_signatures/settings.py index 5dc52a99cf..40268beece 100644 --- a/mayan/apps/document_signatures/settings.py +++ b/mayan/apps/document_signatures/settings.py @@ -17,9 +17,9 @@ setting_storage_backend = namespace.add_setting( ) setting_storage_backend_arguments = namespace.add_setting( global_name='SIGNATURES_STORAGE_BACKEND_ARGUMENTS', - default='{{location: {}}}'.format( - os.path.join(settings.MEDIA_ROOT, 'document_signatures') - ), help_text=_( + default={ + 'location': os.path.join(settings.MEDIA_ROOT, 'document_signatures') + }, help_text=_( 'Arguments to pass to the SIGNATURE_STORAGE_BACKEND. ' ) ) diff --git a/mayan/apps/documents/settings.py b/mayan/apps/documents/settings.py index 51b963c049..334a3abd6a 100644 --- a/mayan/apps/documents/settings.py +++ b/mayan/apps/documents/settings.py @@ -20,9 +20,8 @@ setting_documentimagecache_storage = namespace.add_setting( ) setting_documentimagecache_storage_arguments = namespace.add_setting( global_name='DOCUMENTS_CACHE_STORAGE_BACKEND_ARGUMENTS', - default='{{location: {}}}'.format( - os.path.join(settings.MEDIA_ROOT, 'document_cache') - ), help_text=_( + default={'location': os.path.join(settings.MEDIA_ROOT, 'document_cache')}, + help_text=_( 'Arguments to pass to the DOCUMENT_CACHE_STORAGE_BACKEND.' ) ) @@ -117,9 +116,9 @@ setting_storage_backend = namespace.add_setting( ) setting_storage_backend_arguments = namespace.add_setting( global_name='DOCUMENTS_STORAGE_BACKEND_ARGUMENTS', - default='{{location: {}}}'.format( - os.path.join(settings.MEDIA_ROOT, 'document_storage') - ), help_text=_('Arguments to pass to the DOCUMENT_STORAGE_BACKEND.') + default={ + 'location': os.path.join(settings.MEDIA_ROOT, 'document_storage') + }, help_text=_('Arguments to pass to the DOCUMENT_STORAGE_BACKEND.') ) setting_thumbnail_height = namespace.add_setting( global_name='DOCUMENTS_THUMBNAIL_HEIGHT', default='', help_text=_( diff --git a/mayan/apps/ocr/settings.py b/mayan/apps/ocr/settings.py index 05e3c5cd7a..9fd66fe2da 100644 --- a/mayan/apps/ocr/settings.py +++ b/mayan/apps/ocr/settings.py @@ -11,8 +11,7 @@ setting_ocr_backend = namespace.add_setting( help_text=_('Full path to the backend to be used to do OCR.') ) setting_ocr_backend_arguments = namespace.add_setting( - global_name='OCR_BACKEND_ARGUMENTS', - default='{}' + global_name='OCR_BACKEND_ARGUMENTS', default={} ) setting_auto_ocr = namespace.add_setting( global_name='OCR_AUTO_OCR', default=True, diff --git a/mayan/apps/sources/settings.py b/mayan/apps/sources/settings.py index 33d180f046..666605b352 100644 --- a/mayan/apps/sources/settings.py +++ b/mayan/apps/sources/settings.py @@ -25,9 +25,9 @@ setting_staging_file_image_cache_storage = namespace.add_setting( ) setting_staging_file_image_cache_storage_arguments = namespace.add_setting( global_name='SOURCES_STAGING_FILE_CACHE_STORAGE_BACKEND_ARGUMENTS', - default='{{location: {}}}'.format( - os.path.join(settings.MEDIA_ROOT, 'staging_file_cache') - ), help_text=_( + default={ + 'location': os.path.join(settings.MEDIA_ROOT, 'staging_file_cache') + }, help_text=_( 'Arguments to pass to the SOURCES_STAGING_FILE_CACHE_STORAGE_BACKEND.' ) )