From cfd4a3071f07042a68485e68502a5250e9f9f57e Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Fri, 22 Jan 2021 16:32:30 +1100 Subject: [PATCH] fix current_file_num and num_files being wrong in import and gen*details jobs --- pa_job_manager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pa_job_manager.py b/pa_job_manager.py index 63971fa..23d7923 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -407,6 +407,7 @@ def JobNewImportDir(job): dir.num_files=len(files)+len(subdirs) dir.last_import_date = time.time() job.num_files=overall_file_cnt + job.current_file_num=overall_file_cnt FinishJob(job, "Finished Importing: {} - Found {} new files".format( path, overall_file_cnt ) ) ####### NEED TO FIX THIS BASED ON os.walk contents import_dir=session.query(Dir).filter(Dir.path_prefix==symlink).first() @@ -534,6 +535,7 @@ def ProcessFilesInDir(job, e, file_func, go_into_dir_func): file_func(job, e) else: dir=session.query(Dir).filter(Dir.eid==e.id).first() + job.current_file_num+=1 # if this func returns if not go_into_dir_func(dir): return