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

changed tfl.py to show bus stop name.

Browse source
This commit is contained in:
jesopo 2016-07-05 12:16:40 +01:00
parent 6da747981f
commit c02470ddbf
No known key found for this signature in database
GPG key ID: 0BBDEB2AEFCFFCB3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/tfl.py
View file

@ -5,10 +5,13 @@ URL_BUS = "https://api.tfl.gov.uk/StopPoint/%s/Arrivals"
URL_BUS_SEARCH = "https://api.tfl.gov.uk/StopPoint/Search/%s" URL_BUS_SEARCH = "https://api.tfl.gov.uk/StopPoint/Search/%s"
class Module(object): class Module(object):
_name = "TFL"
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
bot.events.on("received").on("command").on("tflbus" bot.events.on("received").on("command").on("tflbus"
).hook(self.bus, min_args=1) ).hook(self.bus, min_args=1,
help="Get bus due times for a TfL bus stop",
usage="<stop_id>")
def bus(self, event): def bus(self, event):
app_id = self.bot.config["tfl-api-id"] app_id = self.bot.config["tfl-api-id"]
@ -20,6 +23,7 @@ class Module(object):
if bus_search["matches"]: if bus_search["matches"]:
bus_stop = bus_search["matches"][0] bus_stop = bus_search["matches"][0]
real_stop_id = bus_stop["id"] real_stop_id = bus_stop["id"]
stop_name = bus_stop["name"]
bus_stop = Utils.get_url(URL_BUS % real_stop_id, get_params={ bus_stop = Utils.get_url(URL_BUS % real_stop_id, get_params={
"app_id": app_id, "app_key": app_key}, json=True) "app_id": app_id, "app_key": app_key}, json=True)
busses = [] busses = []
@ -40,8 +44,9 @@ class Module(object):
bus[-1] = "in 1 minute" bus[-1] = "in 1 minute"
else: else:
bus[-1] = "in %d minutes" % bus[-1] bus[-1] = "in %d minutes" % bus[-1]
event["stdout"].write("%s: %s" % (stop_id, ", ".join( event["stdout"].write("%s (%s): %s" % (stop_name, stop_id,
["%s (%s)" % (number, due) for number, due in busses]))) ", ".join(["%s (%s)" % (number, due) for number, due in busses]
)))
else: else:
event["stderr"].write("%s: No busses due" % stop_id) event["stderr"].write("%s: No busses due" % stop_id)
else: else: