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

fixed bug where job is not set to "In Progress" for run_ai_on

Browse Source
This commit is contained in:
Damien De Paoli
2021-09-15 18:09:52 +10:00
parent 3b8ce90af2
commit a068133149
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUGs
View File

@@ -1,4 +1,4 @@
### Next: 57 ### Next: 58
BUG-52: updated tag on person, and it said successful, but the colour was red/danger BUG-52: updated tag on person, and it said successful, but the colour was red/danger
BUG-53: when viewing list, moving to a video and the name of the file is not updated (are there 2 in the dom?) BUG-53: when viewing list, moving to a video and the name of the file is not updated (are there 2 in the dom?)
BUG-56: when making a viewing list of AI:mich, (any search?) and going past the page_size, it gets the wrong data from the DB for the 'next' entry BUG-56: when making a viewing list of AI:mich, (any search?) and going past the page_size, it gets the wrong data from the DB for the 'next' entry

6
pa_job_manager.py
View File

@@ -1230,6 +1230,7 @@ def AddToJobImageCount(job, entry ):
#################################################################################################################################### ####################################################################################################################################
def JobRunAIOn(job): def JobRunAIOn(job):
# TODO: need to use JobInProgress... (here and other jobs?) -- so should I move this to HandleJob??? # TODO: need to use JobInProgress... (here and other jobs?) -- so should I move this to HandleJob???
JobProgressState( job, "In Progress" )
AddLogForJob(job, f"INFO: Starting job to look for faces in files...") AddLogForJob(job, f"INFO: Starting job to look for faces in files...")
which_person=[jex.value for jex in job.extra if jex.name == "person"][0] which_person=[jex.value for jex in job.extra if jex.name == "person"][0]
if which_person == "all": if which_person == "all":
@@ -1276,6 +1277,7 @@ def JobRunAIOn(job):
# TODO: should be JobTransformImage() ;) # TODO: should be JobTransformImage() ;)
#################################################################################################################################### ####################################################################################################################################
def JobRotateImage(job): def JobRotateImage(job):
JobProgressState( job, "In Progress" )
AddLogForJob(job, f"INFO: Starting rotation/flip of image file...") AddLogForJob(job, f"INFO: Starting rotation/flip of image file...")
id=[jex.value for jex in job.extra if jex.name == "id"][0] id=[jex.value for jex in job.extra if jex.name == "id"][0]
amt=[jex.value for jex in job.extra if jex.name == "amt"][0] amt=[jex.value for jex in job.extra if jex.name == "amt"][0]
@@ -1540,6 +1542,7 @@ def RemoveDups(job):
#################################################################################################################################### ####################################################################################################################################
def JobMoveFiles(job): def JobMoveFiles(job):
AddLogForJob(job, f"INFO: Starting Move Files job...") AddLogForJob(job, f"INFO: Starting Move Files job...")
JobProgressState( job, "In Progress" )
prefix=[jex.value for jex in job.extra if jex.name == "prefix"][0] prefix=[jex.value for jex in job.extra if jex.name == "prefix"][0]
suffix=[jex.value for jex in job.extra if jex.name == "suffix"][0] suffix=[jex.value for jex in job.extra if jex.name == "suffix"][0]
storage_rp=[jex.value for jex in job.extra if jex.name == "storage_rp"][0] storage_rp=[jex.value for jex in job.extra if jex.name == "storage_rp"][0]
@@ -1560,6 +1563,7 @@ def JobMoveFiles(job):
#################################################################################################################################### ####################################################################################################################################
def JobDeleteFiles(job): def JobDeleteFiles(job):
AddLogForJob(job, f"INFO: Starting Delete Files job...") AddLogForJob(job, f"INFO: Starting Delete Files job...")
JobProgressState( job, "In Progress" )
for jex in job.extra: for jex in job.extra:
if 'eid-' in jex.name: if 'eid-' in jex.name:
del_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first() del_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first()
@@ -1576,6 +1580,7 @@ def JobDeleteFiles(job):
#################################################################################################################################### ####################################################################################################################################
def JobRestoreFiles(job): def JobRestoreFiles(job):
AddLogForJob(job, f"INFO: Starting Restore Files job...") AddLogForJob(job, f"INFO: Starting Restore Files job...")
JobProgressState( job, "In Progress" )
for jex in job.extra: for jex in job.extra:
if 'eid-' in jex.name: if 'eid-' in jex.name:
restore_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first() restore_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first()
@@ -1598,6 +1603,7 @@ def InitialValidationChecks():
session.add(job) session.add(job)
settings = session.query(Settings).first() settings = session.query(Settings).first()
AddLogForJob(job, f"INFO: Starting Initial Validation checks...") AddLogForJob(job, f"INFO: Starting Initial Validation checks...")
JobProgressState( job, "In Progress" )
path=SettingsRBPath() path=SettingsRBPath()
rbp_exists=0 rbp_exists=0
if os.path.exists(path): if os.path.exists(path):