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

fix not setting in progress when we should on 2 more jobs

Browse Source
This commit is contained in:
Damien De Paoli
2021-09-18 17:55:32 +10:00
parent 5b4bbeec46
commit 3f21f3d1f5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pa_job_manager.py
View File

@@ -617,9 +617,9 @@ def RunJob(job):
elif job.name =="getfiledetails": elif job.name =="getfiledetails":
JobGetFileDetails(job) JobGetFileDetails(job)
elif job.name == "checkdups": elif job.name == "checkdups":
CheckForDups(job) JobCheckForDups(job)
elif job.name == "rmdups": elif job.name == "rmdups":
RemoveDups(job) JobRemoveDups(job)
elif job.name == "delete_files": elif job.name == "delete_files":
JobDeleteFiles(job) JobDeleteFiles(job)
elif job.name == "move_files": elif job.name == "move_files":
@@ -1448,9 +1448,10 @@ def ClearOtherDupMessagesAndJobs():
return 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" ) AddLogForJob( job, f"Check for duplicates" )
ClearOtherDupMessagesAndJobs() ClearOtherDupMessagesAndJobs()
@@ -1465,10 +1466,11 @@ def CheckForDups(job):
return 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...) # 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...") AddLogForJob(job, f"INFO: Starting Remove Duplicates job...")
# as checkdups covers all dups, delete all future dups messages, and Withdraw future checkdups jobs # as checkdups covers all dups, delete all future dups messages, and Withdraw future checkdups jobs
ClearOtherDupMessagesAndJobs() ClearOtherDupMessagesAndJobs()