sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

fix ocr command

Browse Source
This commit is contained in:
Patrick Jentsch 2020-06-23 15:20:05 +02:00
parent ead0117bbb
commit 106fd75c75
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon/tasks/check_jobs.py
View File

@ -70,18 +70,15 @@ def __add_notification_data(job, notified_on_status, scoped_session):
def __create_job_service(job): def __create_job_service(job):
job_dir = os.path.join(NOPAQUE_STORAGE, str(job.user_id), 'jobs', job_dir = os.path.join(NOPAQUE_STORAGE, str(job.user_id), 'jobs',
str(job.id)) str(job.id))
service_args = {'command': ('{} /files /files/output'.format(job.service) cmd = '{} -i /files -o /files/output'.format(job.service)
+ ' {}'.format(job.secure_filename if job.service == 'file-setup':
if job.service == 'file-setup' cmd += ' -f {}'.format(job.secure_filename)
else '') elif job.service == 'ocr':
+ ' {}'.format('--compress' cmd += ' --compress'
if job.service == 'ocr' cmd += ' --log-dir /files'
else '') cmd += ' --zip [{}]_{}'.format(job.service, job.secure_filename)
+ ' --log-dir /files' cmd += ' ' + ' '.join(json.loads(job.service_args))
+ ' --zip [{}]_{}'.format(job.service, service_args = {'command': cmd,
job.secure_filename)
+ ' ' + ' '.join(json.loads(job.service_args))
),
'constraints': ['node.role==worker'], 'constraints': ['node.role==worker'],
'labels': {'origin': 'nopaque', 'labels': {'origin': 'nopaque',
'type': 'service.{}'.format(job.service), 'type': 'service.{}'.format(job.service),