Added convert script

Author: chris-adam

setup.py

@@ -68,5 +68,6 @@
     target = plone
     [console_scripts]
     odfsplit = appy.bin.odfsplit:main
+    converter = appy.pod.converter:main
     """,
 )

src/collective/documentgenerator/config.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from collective.documentgenerator import BLDT_DIR
 from imio.helpers import HAS_PLONE_5_2
 from plone import api
 from Products.CMFPlone.utils import safe_unicode
@@ -35,10 +36,13 @@
     u'Comma': u',', u'Semicolon': u';', u'Colon': u':', u'Space': u' ', u'Tabulation': u'\t'}
 DEFAULT_CSV_STRING_DELIMITERS = {u"Double Quote": u'"', u"Single Quote": u"'"}
 
+CONVSCRIPT = "{pwd}/bin/converter".format(pwd=BLDT_DIR)
+
 
 if HAS_PLONE_5_2:
-    import sys
     from zope.deprecation import deprecation
+
+    import sys
     sys.modules['collective.documentgenerator.demo.helper.ATDemoHelperView'] = \
         deprecation.deprecated(deprecation, 'Archetypes was removed from Plone 5.2.')
 

src/collective/documentgenerator/events/styles_events.py

@@ -12,15 +12,12 @@
 from zExceptions import Redirect
 from zope.i18n import translate
 
-import appy.pod
 import logging
 import os
 
 
 logger = logging.getLogger('collective.documentgenerator: styles update')
 
-CONVSCRIPT = '{}/converter.py'.format(os.path.dirname(appy.pod.__file__))
-
 
 def update_styles_of_all_PODtemplate(style_template, event):
     """
@@ -83,7 +80,7 @@ def _update_template_styles(pod_template, style_template_filename):
     cmd = '{path} {script} {tmp_file} {extension} -e ' \
           '{libreoffice_host} -p {port} ' \
           '-t {style_template} -v -a {stream}'.format(path=config.get_uno_path(),
-                                                      script=CONVSCRIPT,
+                                                      script=config.CONVSCRIPT,
                                                       tmp_file=temp_file.name,
                                                       extension='odt',
                                                       libreoffice_host=config.get_oo_server(),

src/collective/documentgenerator/utils.py

@@ -4,6 +4,7 @@
 from collective.documentgenerator import _
 from collective.documentgenerator import BLDT_DIR
 from collective.documentgenerator import config
+from collective.documentgenerator.config import CONVSCRIPT
 from collective.documentgenerator.config import DEFAULT_OO_PORT
 from collective.documentgenerator.config import get_oo_port_list
 from collective.documentgenerator.config import get_oo_server
@@ -291,8 +292,7 @@ def convert_file(afile, fmt="pdf", renderer=False, gen_context=None, delete_temp
             message = _(u"Conversion with renderer only works from odt files.")
             raise Invalid(message)
         return convert_odt(afile, fmt=fmt, gen_context=gen_context, delete_temp_files=delete_temp_files)
-    from appy.pod import converter
-    converter_path = converter.__file__.endswith(".pyc") and converter.__file__[:-1] or converter.__file__
+
     file_ext = afile.filename.split('.')[-1].lower()
     temp_file = create_temporary_file(afile, base_name=".{}".format(file_ext))
     converted_filename = temp_file.name.replace(".{}".format(file_ext), ".{}".format(fmt))
@@ -301,7 +301,7 @@ def convert_file(afile, fmt="pdf", renderer=False, gen_context=None, delete_temp
         ports = get_oo_port_list()
         port = ports[0] if ports else DEFAULT_OO_PORT
         command = "{python_uno_path} {converter_path} {temp_file} {fmt} -p {port} -e {server}".format(
-            python_uno_path=get_uno_path(), converter_path=converter_path, temp_file=temp_file.name, fmt=fmt,
+            python_uno_path=get_uno_path(), converter_path=CONVSCRIPT, temp_file=temp_file.name, fmt=fmt,
             port=port, server=get_oo_server())
         out, err, code = runCommand(command)
         # This command has no output on success