Merge branch 'master' of mara.ddp.net:photoassistant

pa_job_manager.py

@@ -462,6 +462,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()
@@ -658,6 +659,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