danvics/immich-automated-selfie-timelapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix progress report skipping bad images

Browse source
This commit is contained in:
Arnaud_Cayrol 2025-04-09 19:48:32 +02:00
parent 3c87086292
commit 0a4d1208ad
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
timelapse.py
View file

@ -392,8 +392,6 @@ def process_asset_wrapper(args):
return process_asset_worker(asset, config) return process_asset_worker(asset, config)
# Replacing only the process_faces function in timelapse.py
def process_faces(config: ProcessConfig, max_workers=1, progress_callback=None, date_from=None, date_to=None, def process_faces(config: ProcessConfig, max_workers=1, progress_callback=None, date_from=None, date_to=None,
cancel_flag=None): cancel_flag=None):
""" """
@ -427,6 +425,8 @@ def process_faces(config: ProcessConfig, max_workers=1, progress_callback=None,
progress_callback(0, total_assets) progress_callback(0, total_assets)
processed_files = [] processed_files = []
completed_count = 0 # Track all processed items, successful or not
# Initialize workers with the face detection models # Initialize workers with the face detection models
initializer_args = (config.face_detect_model_path, config.landmark_model_path) initializer_args = (config.face_detect_model_path, config.landmark_model_path)
with concurrent.futures.ProcessPoolExecutor( with concurrent.futures.ProcessPoolExecutor(
@ -455,8 +455,11 @@ def process_faces(config: ProcessConfig, max_workers=1, progress_callback=None,
except Exception as e: except Exception as e:
logger.info(f"Asset processing failed: {e}") logger.info(f"Asset processing failed: {e}")
if progress_callback: # Increment the completed count regardless of success/failure
progress_callback(len(processed_files), total_assets) completed_count += 1
logger.info(f"Finished processing. {len(processed_files)} images saved.") if progress_callback:
return processed_files progress_callback(completed_count, total_assets)
logger.info(f"Finished processing. {len(processed_files)} images saved out of {total_assets} assets.")
return processed_files