Support for multiline strings

README.md

@@ -3,10 +3,15 @@
 Из папки репозитория:
 
 Запуск:
-
+
+    cp .env_template .env
     docker-compose build
     docker-compose up
 
+Деплой на production:
+
+    ./build_and_run.sh <RECAPTCHA_SITE_KEY> <RECAPTCHA_SECRET_KEY>
+
 Запуск тестов (когда докер работает и прослушивает адрес localhost:5000):
 
     pytest ./app/templater/tests.py -s
@@ -18,4 +23,4 @@
 или запустите тестовую конфигурацию докера:
 
     docker-compose -f ./docker-compose.test.yml build
-    docker-compose -f ./docker-compose.test.yml up
+    docker-compose -f ./docker-compose.test.yml up

app/templater/lib/templater/__init__.py

@@ -1,6 +1,6 @@
 import csv
 import xlrd
-from docxtpl import DocxTemplate
+from docxtpl import DocxTemplate, RichText
 from jinja2 import Environment, Template, meta
 from .custom_exceptions import TemplateTypeNotSupported, OutputNameTemplateSyntax
 from .custom_odt_renderer import CustomOdtRenderer
@@ -20,23 +20,31 @@ def __init__(self):
 
 class TemplateRenderer(object):
 
+    MULTILINE_PREFIX = "&^<\\multiline>"
+
     def __init__(self):
         self.contexts = []
         self.fieldnames = []
         self.raw_table = []
 
+    def _preprocess_value(self, value):
+        if value.startswith(self.MULTILINE_PREFIX):
+            value = RichText(value[len(self.MULTILINE_PREFIX):])
+        return value
+
     # Load data from csv file
     def load_csv(self, csvfile, delimiter):
         # open csv file and prepare context array
-        lines = csvfile.read().decode("utf-8-sig").splitlines()
-        reader = csv.DictReader(lines, delimiter=delimiter)
+        lines = csvfile.read().decode("utf-8-sig")
+        reader = csv.DictReader(io.StringIO(lines), delimiter=delimiter)
         self.fieldnames = reader.fieldnames
         self.raw_table.append(self.fieldnames)
         for row in reader:
             context = {}
             r = []
             for key, value in row.items():
-                context[key] = value
+                value = value.lstrip('\"').rstrip('\"')
+                context[key] = self._preprocess_value(value)
                 r.append(value)
             self.contexts.append(context)
             self.raw_table.append(r)
@@ -52,7 +60,7 @@ def load_excel(self, excelfile):
             r = []
             for col in range(sh.ncols):
                 value = str(sh.cell_value(rowx=row, colx=col))
-                context[self.fieldnames[col]] = value
+                context[self.fieldnames[col]] = self._preprocess_value(value)
                 r.append(value)
             self.contexts.append(context)
             self.raw_table.append(r)