States for main build tasks

Author: rrah

app.py

@@ -136,6 +136,8 @@ def api_tasks():
         for name,host in running_tasks.items():
             for task in host:
                 if task["type"] == "tasks.build_video":
+                    state = app_cel.AsyncResult(task["id"])
+                    state.ready()
                     result["data"].append({
                         "time_start": datetime.datetime.fromtimestamp(task["time_start"]).strftime('%Y-%m-%d %H:%M:%S'),
                         "id": task["id"],
@@ -144,13 +146,16 @@ def api_tasks():
                         "presenter": task["args"][1]["presenter"],
                         "in_tc": task["args"][2],
                         "out_tc": task["args"][3],
-                        "node": task["hostname"]
+                        "node": task["hostname"],
+                        "state": state.state
                     })
 
     if scheduled_tasks:
         for name,host in scheduled_tasks.items():
             for task in host:
                 if task["type"] == "tasks.build_video":
+                    state = app_cel.AsyncResult(task["id"])
+                    state.ready()
                     result["data"].append({
                         "time_start": None,
                         "id": task["id"],
@@ -159,7 +164,8 @@ def api_tasks():
                         "presenter": task["args"][1]["presenter"],
                         "in_tc": task["args"][2],
                         "out_tc": task["args"][3],
-                        "node": task["hostname"]
+                        "node": task["hostname"],
+                        "state": state.state
                     })
     return flask.jsonify(result)
 

formvideo.py

@@ -196,13 +196,15 @@ def form_video(task, video, talk, start_tc, end_tc, framerate = FRAMERATE, out_d
 
     # Build all the text assets
     logger.info("Building text assets.")
+    task.update_state(state="Building text assets")
     subprocess.check_output(start_title_args)
     subprocess.check_output(start_pres_arg)
     subprocess.check_output(copyright_args)
 
     # First FFmpeg pass for getting loudness stats
     logger.info("Detecting loudness information.")
     logger.debug(ffmpeg_loudness_args)
+    task.update_state(state="Analysing Loudness")
     with open(loud_log, "a") as error_log:
         loud_output = subprocess.check_output(ffmpeg_loudness_args, stderr=subprocess.STDOUT, cwd=working_dir).decode("utf-8")
         error_log.writelines(loud_output)
@@ -274,6 +276,7 @@ def form_video(task, video, talk, start_tc, end_tc, framerate = FRAMERATE, out_d
     ]
     logger.info("Running main build.")
     logger.debug(ffmpeg_args)
+    task.update_state(state="Running main build")
     with open(build_log, "a") as error_log:
         subprocess.check_output(ffmpeg_args, stderr=error_log, cwd=working_dir)
     logger.info("Completed main build.")

templates/tasks-table-body.html

@@ -11,6 +11,7 @@ <h1>Running Tasks</h1>
             <th>Video Start TC</th>
             <th>Video End TC</th>
             <th>Worker node</th>
+            <th>Status</th>
             </tr>
         </thead>
     </table>

templates/tasks-table-head.html

@@ -12,11 +12,12 @@
                 { data: 'presenter' },
                 { data: 'in_tc' },
                 { data: 'out_tc' },
-                { data: 'node' }
+                { data: 'node' },
+                { data: 'state' }
             ]
         } );
         setInterval(function () {
             table.ajax.reload(null, false);
-        }, 30000);
+        }, 5000);
     } );
 </script>