diff --git a/client/start.sh b/client/start.sh new file mode 100644 index 0000000..e69de29 diff --git a/watcher/app.py b/watcher/app.py index 27ee5d9..fa68c22 100644 --- a/watcher/app.py +++ b/watcher/app.py @@ -1,8 +1,11 @@ -import datetime +from datetime import datetime +import socketio from flask import Flask, render_template +sio = socketio.Server() app = Flask(__name__) +app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app) # We request users to send the run number to prevent accidentially getting old requests from a previous run # This maybe will give to much errors from people forgetting to change their number @@ -24,9 +27,12 @@ def index(): @app.route("/start_run/") def start_run(run_index): db["current_run"] = run_index - starttime = datetime.datetime.now() + starttime = datetime.now() + if run_index in db["run_data"]: + return "This run is already ran, take another number." db["run_data"][run_index] = {"starttime": starttime, "data": {}} # TODO send start request to the first person in the chain. Probably a zeus part already written as example + sio.emit('start_run', run_index) return f'Run {run_index} started at {starttime}' @@ -35,11 +41,12 @@ def link_start(run, index): if db["current_run"] != run: return "Wrong run number, you are probably behind.", 404 else: - link_data = db["run_data"][run]["data"][index] - if link_data["start"]: + run_data = db["run_data"][run]["data"] + if index in run_data: return "you already started in this run. Ignoring this request." else: - link_data["start"] = datetime.datetime.now() + run_data[index] = {"start": datetime.now()} + sio.emit('link_start', index) return "Success." @@ -52,9 +59,9 @@ def link_handoff(run, index): if link_data["handoff"]: return "you already handed off control during this run. Ignoring this request" else: - link_data["handoff"] = datetime.datetime.now() + link_data["handoff"] = datetime.now() return "Success." if __name__ == '__main__': - app.run(host="0.0.0.0",debug=True) + app.run(host="0.0.0.0", debug=True) diff --git a/watcher/static/index.js b/watcher/static/index.js index b69f147..41303b7 100644 --- a/watcher/static/index.js +++ b/watcher/static/index.js @@ -2,7 +2,10 @@ import io from 'socket.io-client'; $(function() { var socket = io(); - socket.on('link_arrived', function(link_id) { + socket.on('start_run', function(run_index){ + }) + + socket.on('link_start', function(link_id) { $('#current_run').append($('
').text(link_id)); }); }); diff --git a/watcher/templates/index.html b/watcher/templates/index.html index 85d710d..5d1c148 100644 --- a/watcher/templates/index.html +++ b/watcher/templates/index.html @@ -10,18 +10,19 @@
-
+
1
- time +
- +
+
hoi
hoi
@@ -35,7 +36,6 @@
hoi
-