From 3c89689f6bd3d1bcd222e364705c3f58e0c13c19 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Thu, 26 Oct 2017 22:00:43 +0200 Subject: [PATCH] Actually fix the date issue --- workers/conn.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/workers/conn.py b/workers/conn.py index 0f09caf..3d51b32 100644 --- a/workers/conn.py +++ b/workers/conn.py @@ -99,8 +99,29 @@ def getDetails(cid, url, q, via = [], eq = None): for t in threads: t.join() + wdate = None + while not iq.empty(): - conn.addService(iq.get()[1]) + svc = iq.get()[1] + + if not wdate or svc.arrtime > wdate: + wdate = svc.arrtime + elif svc.deptime < wdate: + ttime0 = datetime.datetime(wdate.year, wdate.month, wdate.day) + ttime1 = ttime0 + datetime.timedelta(hours=svc.deptime.hour, minutes=svc.deptime.minute) + ttime2 = ttime0 + datetime.timedelta(hours=svc.arrtime.hour, minutes=svc.arrtime.minute) + + if ttime1 < wdate: + ttime1 += datetime.timedelta(days=1) + ttime2 += datetime.timedelta(days=1) + + if ttime1 > ttime2: + ttime2 += datetime.timedelta(days=1) + + svc.deptime = ttime1 + svc.arrtime = ttime2 + + conn.addService(svc) q.put((cid, conn))