ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed BUG-9, current_file_num uninitd

Browse Source
This commit is contained in:
Damien De Paoli
2021-01-22 21:15:47 +11:00
parent 2dc0e921ef
commit aa81d46a09
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pa_job_manager.py
View File

@@ -239,14 +239,14 @@ def ProcessImportDirs(parent_job=None):
# force commit to make job.id be valid in use of wait_for later # force commit to make job.id be valid in use of wait_for later
session.commit() session.commit()
jex2=JobExtra( name="path", value=path ) 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) job2.extra.append(jex2)
session.add(job2) session.add(job2)
session.commit() session.commit()
if parent_job: if parent_job:
AddLogForJob(parent_job, "adding <a href='/job/{}'>job id={} {}</a> (wait for: {})".format( job2.id, job2.id, job2.name, job2.wait_for ) ) AddLogForJob(parent_job, "adding <a href='/job/{}'>job id={} {}</a> (wait for: {})".format( job2.id, job2.id, job2.name, job2.wait_for ) )
jex3=JobExtra( name="path", value=path ) 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) job3.extra.append(jex3)
session.add(job3) session.add(job3)
session.commit() session.commit()
@@ -472,7 +472,7 @@ def JobNewImportDir(job):
def JobProcessAI(job): def JobProcessAI(job):
path=[jex.value for jex in job.extra if jex.name == "path"][0] path=[jex.value for jex in job.extra if jex.name == "path"][0]
path='static/photos' path = SymlinkName(path, '/')
print('meeeee',path) print('meeeee',path)
for e in FilesInDir( path ): for e in FilesInDir( path ):
ProcessFilesInDir(job, e, ProcessAI, lambda a: True) ProcessFilesInDir(job, e, ProcessAI, lambda a: True)