Browse Source

Merge PR #365 into 12.0

Signed-off-by sbidoul
12.0
OCA-git-bot 5 years ago
parent
commit
b8f91ee8fc
  1. 15
      report_py3o/models/py3o_report.py

15
report_py3o/models/py3o_report.py

@ -244,8 +244,12 @@ class Py3oReport(models.TransientModel):
def _convert_single_report(self, result_path, model_instance, data): def _convert_single_report(self, result_path, model_instance, data):
"""Run a command to convert to our target format""" """Run a command to convert to our target format"""
if not self.ir_actions_report_id.is_py3o_native_format: if not self.ir_actions_report_id.is_py3o_native_format:
with tempfile.TemporaryDirectory() as tmp_user_installation:
command = self._convert_single_report_cmd( command = self._convert_single_report_cmd(
result_path, model_instance, data,
result_path,
model_instance,
data,
user_installation=tmp_user_installation,
) )
logger.debug('Running command %s', command) logger.debug('Running command %s', command)
output = subprocess.check_output( output = subprocess.check_output(
@ -263,7 +267,9 @@ class Py3oReport(models.TransientModel):
return result_path return result_path
@api.multi @api.multi
def _convert_single_report_cmd(self, result_path, model_instance, data):
def _convert_single_report_cmd(
self, result_path, model_instance, data, user_installation=None
):
"""Return a command list suitable for use in subprocess.call""" """Return a command list suitable for use in subprocess.call"""
lo_bin = self.ir_actions_report_id.lo_bin_path lo_bin = self.ir_actions_report_id.lo_bin_path
if not lo_bin: if not lo_bin:
@ -271,13 +277,16 @@ class Py3oReport(models.TransientModel):
_("Libreoffice runtime not available. " _("Libreoffice runtime not available. "
"Please contact your administrator.") "Please contact your administrator.")
) )
return [
cmd = [
lo_bin, lo_bin,
'--headless', '--headless',
'--convert-to', '--convert-to',
self.ir_actions_report_id.py3o_filetype, self.ir_actions_report_id.py3o_filetype,
result_path, result_path,
] ]
if user_installation:
cmd.append('-env:UserInstallation=file:%s' % user_installation)
return cmd
@api.multi @api.multi
def _get_or_create_single_report(self, model_instance, data, def _get_or_create_single_report(self, model_instance, data,

Loading…
Cancel
Save