diff --git a/server/alarm.py b/server/alarm.py index f24d8f1..5b34c3a 100644 --- a/server/alarm.py +++ b/server/alarm.py @@ -4,6 +4,4 @@ class alarm: self.time = time_ self.name = alarm_ def check(self): - if self.time >= time.time(): - return True - return False + return self.time >= time.time() diff --git a/server/http_server.py b/server/http_server.py index c9235f7..e3bdeca 100644 --- a/server/http_server.py +++ b/server/http_server.py @@ -12,7 +12,7 @@ class http_endpoint: async def rtasks(self, request): resp = [] for task in self.parent.tasks: - resp.append({"name":task.name, "time":task.time}) + resp.append(task.__dict__) return web.Response(text=json.dumps(resp)) async def wtasks(self, request): name = request.query.get("name") @@ -22,6 +22,6 @@ class http_endpoint: return web.Response(status=422, text="400 bad arg") if name == "": name = "unnamed" if tim == 0.0: tim = time.time() - self.parent.tasks.append(alarm.alarm(tim, name)) - self.rtasks(request) - return web.Response(text="done") + new = alarm.alarm(tim, name) + self.parent.tasks.append(new) + return web.Response(text=str(new.__dict__))