From 106fd75c75fdd46c36e5bdf44bcf1c48ac250df2 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Laptop.fritz.box>
Date: Tue, 23 Jun 2020 15:20:05 +0200
Subject: [PATCH] fix ocr command
---
daemon/tasks/check_jobs.py | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/daemon/tasks/check_jobs.py b/daemon/tasks/check_jobs.py
index 758ab892..a70c4a47 100644
--- a/daemon/tasks/check_jobs.py
+++ b/daemon/tasks/check_jobs.py
@@ -70,18 +70,15 @@ def __add_notification_data(job, notified_on_status, scoped_session):
def __create_job_service(job):
job_dir = os.path.join(NOPAQUE_STORAGE, str(job.user_id), 'jobs',
str(job.id))
- service_args = {'command': ('{} /files /files/output'.format(job.service)
- + ' {}'.format(job.secure_filename
- if job.service == 'file-setup'
- else '')
- + ' {}'.format('--compress'
- if job.service == 'ocr'
- else '')
- + ' --log-dir /files'
- + ' --zip [{}]_{}'.format(job.service,
- job.secure_filename)
- + ' ' + ' '.join(json.loads(job.service_args))
- ),
+ cmd = '{} -i /files -o /files/output'.format(job.service)
+ if job.service == 'file-setup':
+ cmd += ' -f {}'.format(job.secure_filename)
+ elif job.service == 'ocr':
+ cmd += ' --compress'
+ cmd += ' --log-dir /files'
+ cmd += ' --zip [{}]_{}'.format(job.service, job.secure_filename)
+ cmd += ' ' + ' '.join(json.loads(job.service_args))
+ service_args = {'command': cmd,
'constraints': ['node.role==worker'],
'labels': {'origin': 'nopaque',
'type': 'service.{}'.format(job.service),
--
GitLab