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

big change to get metadata working fully in DB and on Filesystem, and recover from most common scenarios, improved GUI as well for allowing an immediate search after adding refimg as well

Browse Source
This commit is contained in:
Damien De Paoli
2022-08-01 23:44:38 +10:00
parent 391b61f3c4
commit a8af00fe66
13 changed files with 523 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
job.py
View File

@@ -171,18 +171,22 @@ def joblog(id):
display_more=False
order="desc"
if joblog.pa_job_state == "Completed":
duration=(joblog.last_update-joblog.start_time)
if joblog.start_time:
if joblog.pa_job_state == "Completed":
duration=(joblog.last_update-joblog.start_time)
elif joblog.start_time:
duration=(datetime.now(pytz.utc)-joblog.start_time)
duration= duration-timedelta(microseconds=duration.microseconds)
estimate=None
duration_s = duration.total_seconds()
# if job is old, not completed, and we have num_files and current_file_num > 0 so we can work out an estimated duration
if duration_s > 300 and joblog.pa_job_state != "Completed" and joblog.current_file_num and joblog.num_files:
estimate_s = duration_s / joblog.current_file_num * joblog.num_files
estimate = timedelta( seconds=(estimate_s-duration_s) )
estimate = estimate - timedelta(microseconds=estimate.microseconds)
else:
duration=(datetime.now(pytz.utc)-joblog.start_time)
duration= duration-timedelta(microseconds=duration.microseconds)
estimate=None
duration_s = duration.total_seconds()
# if job is old, not completed, and we have num_files and current_file_num > 0 so we can work out an estimated duration
if duration_s > 300 and joblog.pa_job_state != "Completed" and joblog.current_file_num and joblog.num_files:
estimate_s = duration_s / joblog.current_file_num * joblog.num_files
estimate = timedelta( seconds=(estimate_s-duration_s) )
estimate = estimate - timedelta(microseconds=estimate.microseconds)
duration="N/A"
estimate=None
return render_template("joblog.html", job=joblog, logs=logs, duration=duration, display_more=display_more, order=order, estimate=estimate, refresh=refresh)
###############################################################################