Merge pull request #48 from OmarWKH/no-progress-task

Show task started even if it doesn't update progress
czue · Sep 8, 2020 · af964fe · af964fe
2 parents 314e232 + 277a3f1
commit af964fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/celery_progress/backend.py b/celery_progress/backend.py
@@ -42,6 +42,7 @@ def set_progress(self, current, total, description=""):
         self.task.update_state(
             state=PROGRESS_STATE,
             meta={
+                'pending': False,
                 'current': current,
                 'total': total,
                 'percent': percent,
@@ -53,6 +54,7 @@ def stop_task(self, current, total, exc):
         self.task.update_state(
             state='FAILURE',
             meta={
+                'pending': False,
                 'current': current,
                 'total': total,
                 'percent': 100.0,
@@ -88,22 +90,23 @@ def get_info(self):
             return {
                 'complete': False,
                 'success': None,
-                'progress': _get_unknown_progress(),
+                'progress': _get_unknown_progress(self.result.state),
             }
         return self.result.info
 
 
 def _get_completed_progress():
     return {
+        'pending': False,
         'current': 100,
         'total': 100,
         'percent': 100,
     }
 
 
-def _get_unknown_progress():
+def _get_unknown_progress(state):
     return {
-        'pending': True,
+        'pending': state == 'PENDING',
         'current': 0,
         'total': 100,
         'percent': 0,

diff --git a/celery_progress/static/celery_progress/celery_progress.js b/celery_progress/static/celery_progress/celery_progress.js
@@ -46,10 +46,14 @@ class CeleryProgressBar {
         progressBarElement.style.backgroundColor = '#68a9ef';
         progressBarElement.style.width = progress.percent + "%";
         var description = progress.description || "";
-        if (progress.current == 0 && progress.pending) {
-          progressBarMessageElement.textContent = 'Waiting for task to start...'
+        if (progress.current == 0) {
+            if (progress.pending === true) {
+                progressBarMessageElement.textContent = 'Waiting for task to start...';
+            } else {
+                progressBarMessageElement.textContent = 'Task started...';
+            }
         } else {
-          progressBarMessageElement.textContent = progress.current + ' of ' + progress.total + ' processed. ' + description;
+            progressBarMessageElement.textContent = progress.current + ' of ' + progress.total + ' processed. ' + description;
         }
     }