diff --git a/pa_job_manager.py b/pa_job_manager.py index e3ee8a1..d7733e0 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -886,7 +886,6 @@ def RunJob(job): elif job.name == "run_ai_on_path": JobRunAIOnPath(job) elif job.name == "transform_image": - #time.sleep(10) JobTransformImage(job) elif job.name == "clean_bin": JobCleanBin(job) @@ -1874,6 +1873,20 @@ def JobRunAIOn(job): FinishJob(job, "Finished Processesing AI") return +################################################################################ +# removeEntryAmendment(): helper routine to remove an Etnry Amendment for a +# given job and eid (called after Transform or Delete/Restore/Move files +################################################################################ +def removeEntryAmendment( job, eid ): + # now remove the matching amendment for the transform job + stmt=select(EntryAmendment).where(EntryAmendment.eid==eid) + ea=session.execute(stmt).scalars().one_or_none() + if ea: + session.delete(ea) + else: + AddLogForJob( job, f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id})" ) + PAprint( f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id}, job={job} )" ) + #################################################################################################################################### # JobTransformImage(): transform an image by the amount requested (can also flip horizontal or vertical) #################################################################################################################################### @@ -1907,14 +1920,7 @@ def JobTransformImage(job): e.file_details.hash = md5( job, e ) PAprint( f"JobTransformImage DONE thumb: job={job.id}, id={id}, amt={amt}" ) session.add(e) - # now remove the matching amendment for the transform job - stmt=select(EntryAmendment).where(EntryAmendment.eid==id) - ea=session.execute(stmt).scalars().one_or_none() - if ea: - session.delete(ea) - else: - AddLogForJob( job, f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id})" ) - PAprint( f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id}, job={job} )" ) + removeEntryAmendment( job, id ) FinishJob(job, "Finished Processesing image rotation/flip") return @@ -2207,6 +2213,7 @@ def JobDeleteFiles(job): if 'eid-' in jex.name: del_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first() MoveFileToRecycleBin(job,del_me) + removeEntryAmendment(job,del_me.id) NewJob( name="check_dups", num_files=0, wait_for=None, jex=None, parent_job=None, desc="check for duplicate files" ) FinishJob(job, f"Finished deleting selected file(s)") return @@ -2221,6 +2228,7 @@ def JobRestoreFiles(job): if 'eid-' in jex.name: restore_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first() RestoreFile(job,restore_me) + removeEntryAmendment(job,restore_me.id) NewJob( name="check_dups", num_files=0, wait_for=None, jex=None, parent_job=None, desc="check for duplicate files" ) FinishJob(job, f"Finished restoring selected file(s)") return