diff --git a/pa_job_manager.py b/pa_job_manager.py index 112e9a7..91c82e4 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -239,14 +239,14 @@ def ProcessImportDirs(parent_job=None): # force commit to make job.id be valid in use of wait_for later session.commit() jex2=JobExtra( name="path", value=path ) - job2=Job(start_time='now()', last_update='now()', name="getfiledetails", state="New", wait_for=job.id, pa_job_state="New" ) + job2=Job(start_time='now()', last_update='now()', name="getfiledetails", state="New", wait_for=job.id, pa_job_state="New", current_file_num=0 ) job2.extra.append(jex2) session.add(job2) session.commit() if parent_job: AddLogForJob(parent_job, "adding job id={} {} (wait for: {})".format( job2.id, job2.id, job2.name, job2.wait_for ) ) jex3=JobExtra( name="path", value=path ) - job3=Job(start_time='now()', last_update='now()', name="processai", state="New", wait_for=job.id, pa_job_state="New" ) + job3=Job(start_time='now()', last_update='now()', name="processai", state="New", wait_for=job.id, pa_job_state="New", current_file_num=0 ) job3.extra.append(jex3) session.add(job3) session.commit() @@ -472,7 +472,7 @@ def JobNewImportDir(job): def JobProcessAI(job): path=[jex.value for jex in job.extra if jex.name == "path"][0] - path='static/photos' + path = SymlinkName(path, '/') print('meeeee',path) for e in FilesInDir( path ): ProcessFilesInDir(job, e, ProcessAI, lambda a: True)