fix current_file_num and num_files being wrong in import and gen*details jobs

This commit is contained in:
2021-01-22 16:32:30 +11:00
parent f73d488ee7
commit cfd4a3071f

View File

@@ -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