Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

NR: Allow use of Eagle for scheduling data (docs/source will follow\!). Slight regression in use of RIDs (but who uses them anyway?)

Browse source
This commit is contained in:
Evelyn 2017-05-30 22:11:27 +01:00
parent 28425202ce
commit f9e773fc69
2 changed files with 84 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bot.json.example
View file

@ -14,5 +14,7 @@
"bitly-api-key" : "",
"soundcloud-api-key" : "",
"tfl-api-id" : "",
"tfl-api-key" : ""
"tfl-api-key" : "",
"eagle-api-url" : "",
"eagle-api-key" : ""
}

53
modules/nr.py
View file

@ -85,9 +85,16 @@ class Module(object):
d_types = ["etd", "atd", "std"]
for a in a_types + d_types:
if a in service:
if a in service and service[a]:
times[a] = {"orig": service[a]}
if len(service[a]) > 5:
times[a]["datetime"] = datetime.strptime(service[a], "%Y-%m-%dT%H:%M:%S")
else:
times[a]["datetime"] = datetime.strptime(
datetime.now().date().isoformat() + "T" + service[a][:4],
"%Y-%m-%dT%H%M"
)
times[a]["ut"] = times[a]["datetime"].timestamp()
else:
times[a] = {"orig": None, "datetime": None, "ut": 0,
@ -96,7 +103,7 @@ class Module(object):
for k, a in times.items():
if not a["orig"]: continue
a["short"] = a["datetime"].strftime("%H%M")
a["short"] = a["datetime"].strftime("%H%M") if len(a["orig"]) > 5 else a["orig"]
a["prefix"] = k[2] + ("s" if k[0] == "s" else "")
a["estimate"] = k[0] == "e"
a["on_time"] = a["ut"] - times["s"+ k[1:]]["ut"] < 300
@ -234,6 +241,14 @@ class Module(object):
client = self.client
colours = self.COLOURS
SCHEDULE_STATUS = {"B": "perm bus", "F": "freight train", "P": "train",
"S": "ship", "T": "trip", "1": "train", "2": "freight",
"3": "trip", "4": "ship", "5": "bus"}
eagle_key = self.bot.config["eagle-api-key"]
eagle_url = self.bot.config["eagle-api-url"]
schedule = {}
service_id = event["args_split"][0]
filter = self.filter(' '.join(event["args_split"][1:]) if len(event["args_split"]) > 1 else "", {
@ -249,14 +264,26 @@ class Module(object):
if len(service_id) <= 8:
query = client.service.QueryServices(service_id, datetime.utcnow().date().isoformat(),
datetime.utcnow().time().strftime("%H:%M:%S+0000"))
if not query:
if eagle_url:
schedule_query = Utils.get_url("%s/schedule/%s/%s" % (eagle_url, service_id, datetime.now().date().isoformat()), json=True)
schedule = schedule_query["current"]
if not query and not schedule:
return event["stdout"].write("No service information is available for this identifier.")
if len(query["serviceList"][0]) > 1:
if query and len(query["serviceList"][0]) > 1:
return event["stdout"].write("Identifier refers to multiple services: " +
", ".join(["%s (%s->%s)" % (a["uid"], a["originCrs"], a["destinationCrs"]) for a in query["serviceList"][0]]))
rid = query["serviceList"][0][0]["rid"]
if query: rid = query["serviceList"][0][0]["rid"]
if query:
query = client.service.GetServiceDetailsByRID(rid)
if schedule:
for k,v in {
"trainid": schedule["schedule_segment"]["signalling_id"],
"operatorCode": schedule["atoc_code"],
"serviceType": "class " + schedule_query["tops_inferred"] if schedule_query["tops_inferred"] else SCHEDULE_STATUS.get(schedule["train_status"], "?"),
}.items():
query[k] = v
disruptions = []
if "cancelReason" in query:
@ -268,7 +295,8 @@ class Module(object):
else: disruptions = ""
stations = []
for station in query["locations"][0]:
for station in query["locations"][0] if "locations" in query else schedule["schedule_segment"]["schedule_location"]:
if "locations" in query:
parsed = {"name": station["locationName"],
"crs": (station["crs"] if "crs" in station else station["tiploc"]).rstrip(),
"called": "atd" in station,
@ -304,7 +332,18 @@ class Module(object):
divide["originCRS"] if "originCRS" in divide else divide["originTiploc"],
Utils.color(Utils.FONT_RESET)
)
else:
parsed = {"name": station["name"],
"crs": station["crs"] if station["crs"] else station["tiploc_code"],
"called": False,
"passing": station.get("pass", None),
"first": len(stations) == 0,
"last" : False,
"cancelled" : False,
"divide_summary": "",
"length": None,
"times": self.process(station["dolphin_times"])
}
stations.append(parsed)
[a for a in stations if a["called"] or a["first"]][-1]["last"] = True