From 12ef5a35e3b22cac49a7cbc706f30497480110da Mon Sep 17 00:00:00 2001 From: mzanella Date: Sat, 9 Dec 2017 19:58:07 +0100 Subject: [PATCH] Fix --- requirements.txt | 2 + .../bot/{ => handlers}/parsing.py | 4 +- .../bot/handlers/room_handler.py | 38 +++++++++---------- 3 files changed, 23 insertions(+), 21 deletions(-) rename torrearchimedebot/bot/{ => handlers}/parsing.py (97%) diff --git a/requirements.txt b/requirements.txt index 7639f07..7425d7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,3 @@ python-telegram-bot==8.1.1 +requests +lxml \ No newline at end of file diff --git a/torrearchimedebot/bot/parsing.py b/torrearchimedebot/bot/handlers/parsing.py similarity index 97% rename from torrearchimedebot/bot/parsing.py rename to torrearchimedebot/bot/handlers/parsing.py index e4a1d61..12e3b6d 100644 --- a/torrearchimedebot/bot/parsing.py +++ b/torrearchimedebot/bot/handlers/parsing.py @@ -84,5 +84,5 @@ def parse(self, room): def parseSchedule(self, room): return Scedule(room, self.parse(room)) -schedule = URLParser().parseSchedule('1A150') -print(schedule) \ No newline at end of file +#schedule = URLParser().parseSchedule('1A150') +#print(schedule) \ No newline at end of file diff --git a/torrearchimedebot/bot/handlers/room_handler.py b/torrearchimedebot/bot/handlers/room_handler.py index 228eaab..03eede7 100644 --- a/torrearchimedebot/bot/handlers/room_handler.py +++ b/torrearchimedebot/bot/handlers/room_handler.py @@ -1,7 +1,7 @@ from .abs_handler import AbsHandler -from ../parsing import * +from .parsing import * -class RoomHandler(AbsHandler): +class RoomHandler: def __init__(self, roomId): self.roomId = roomId @@ -9,20 +9,20 @@ def __init__(self, roomId): def handleMessage(self): return schedulePrettyfier(URLParser().parseSchedule(self.roomId)) - def schedulePrettyfier(scheduleObj): - schedule = scheduleObj.getSchedule() - toReturn = '' - if (not schedule): - toReturn = "The room is always empty today!" - else: - delimiter = " " - for time in schedule: - activity = schedule[time] - stop = 2 - if (activity[2] == '') - stop = 1 - toReturn += time - for i in range(0, stop): - toReturn = delimiter + activity[i] - toReturn += "\n" - return toReturn +def schedulePrettyfier(scheduleObj): + schedule = scheduleObj.getSchedule() + toReturn = '' + if (not schedule): + toReturn = "The room is always empty today!" + else: + delimiter = " " + for time in schedule: + activity = schedule[time] + stop = 2 + if (activity[2] == ''): + stop = 1 + toReturn += time + for i in range(0, stop): + toReturn = delimiter + activity[i] + toReturn += "\n" + return toReturn \ No newline at end of file