diff --git a/pa_job_manager.py b/pa_job_manager.py index 3e35c96..5f4d631 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -617,9 +617,9 @@ def RunJob(job): elif job.name =="getfiledetails": JobGetFileDetails(job) elif job.name == "checkdups": - CheckForDups(job) + JobCheckForDups(job) elif job.name == "rmdups": - RemoveDups(job) + JobRemoveDups(job) elif job.name == "delete_files": JobDeleteFiles(job) elif job.name == "move_files": @@ -1448,9 +1448,10 @@ def ClearOtherDupMessagesAndJobs(): return #################################################################################################################################### -# CheckForDups(): job to dig into the DB with sql, find duplicates - if there are any, pop a F/E status to say so +# JobCheckForDups(): job to dig into the DB with sql, find duplicates - if there are any, pop a F/E status to say so #################################################################################################################################### -def CheckForDups(job): +def JobCheckForDups(job): + JobProgressState( job, "In Progress" ) AddLogForJob( job, f"Check for duplicates" ) ClearOtherDupMessagesAndJobs() @@ -1465,10 +1466,11 @@ def CheckForDups(job): return #################################################################################################################################### -# RemoveDups(): job to go through the f/e nominated keep/del data and then put a new CheckDups() in, as the user may have only +# JobRemoveDups(): job to go through the f/e nominated keep/del data and then put a new CheckDups() in, as the user may have only # partially addressed them (e.g. the first 10 dups...) #################################################################################################################################### -def RemoveDups(job): +def JobRemoveDups(job): + JobProgressState( job, "In Progress" ) AddLogForJob(job, f"INFO: Starting Remove Duplicates job...") # as checkdups covers all dups, delete all future dups messages, and Withdraw future checkdups jobs ClearOtherDupMessagesAndJobs()