Merge pull request 'refactor(jobs):track 100-on-finished as a progress update' (#44) from fix-no-updates-if-delayed into master

Reviewed-on: #44
2023-07-21 16:30:28 +03:00 · 2023-07-21 16:30:28 +03:00 · c5b7ca7565
parent e8c59f5068 d664fcbdc4
commit c5b7ca7565
1 changed files with 7 additions and 4 deletions
--- a/selfprivacy_api/jobs/init.py
+++ b/selfprivacy_api/jobs/init.py
@ -198,12 +198,15 @@ class Jobs:
            job.description = description
        if status_text is not None:
            job.status_text = status_text
-        if status == JobStatus.FINISHED:
-            job.progress = 100
-        if progress is not None:
-            # explicitly provided progress has priority
+
+        # if it is finished it is 100
+        # unless user says otherwise
+        if status == JobStatus.FINISHED and progress is None:
+            progress = 100
+        if progress is not None and job.progress != progress:
            job.progress = progress
            Jobs.log_progress_update(job, progress)
+
        job.status = status
        Jobs.log_status_update(job, status)
        job.updated_at = datetime.datetime.now()