From 78cfc6781a508167d818e2f11a15bd3f793b8118 Mon Sep 17 00:00:00 2001 From: Rhinemann Date: Wed, 9 Nov 2022 15:07:58 +0200 Subject: [PATCH] Added f-strings to schedule, better readability, marginally faster. --- modules/auto-schedule/index.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/auto-schedule/index.py b/modules/auto-schedule/index.py index e6c9dc5..677f98a 100644 --- a/modules/auto-schedule/index.py +++ b/modules/auto-schedule/index.py @@ -8,7 +8,7 @@ if self.MESSAGE["text"].lower() == "!пара": current_day = current_time.weekday() current_seconds = current_time.hour * 3600 + current_time.minute * 60 + current_time.second - print("[DEBUG] Current day is {}({})".format(type(current_day), current_day)) + print(f"[DEBUG] Current day is {type(current_day)}({current_day})") if current_day > 4 or current_day < 0: next_week = int(not bool(current_week)) day = -1 @@ -24,19 +24,22 @@ if self.MESSAGE["text"].lower() == "!пара": pair_found = True break - self.RESPONCE = "Сьогодні вихідний, тому пар немає)\nНаступна пара - {} ({}) о {} у {}\nПосилання (якщо воно чомусь треба): {}".format(next_pair["subject"], next_pair["lector"], self.reverse_timetable[int(j)], self.days_rod[day], next_pair["link"]) + self.RESPONCE = f"Сьогодні вихідний, тому пар немає)\n"\ + f"Наступна пара - {next_pair['subject']} ({next_pair['lector']}) о {self.reverse_timetable[int(j)]} у {self.days_rod[day]}\n"\ + f"Посилання (якщо воно чомусь треба): {next_pair['link']}" else: for i in self.timetable: if current_seconds < i: print("[DEBUG] Looking up a relevant pair...") try: relevant_pair = schedule[current_week][current_day][str(self.timetable[i])] - self.RESPONCE = "Актуальна пара: {} ({}), початок о {}\nПосилання: {}".format(relevant_pair["subject"], relevant_pair["lector"], self.reverse_timetable[self.timetable[i]], relevant_pair["link"]) + self.RESPONCE = f"Актуальна пара: {relevant_pair['subject']} ({relevant_pair['lector']}), початок о {self.reverse_timetable[self.timetable[i]]}\n"\ + f"Посилання: {relevant_pair['link']}" break except Exception as e: - print("[WARN] module: auto-schedule: exception {} while looking up the pair".format(e)) + print(f"[WARN] module: auto-schedule: exception {e} while looking up the pair") else: self.RESPONCE = "Сьогодні більше немає пар" except Exception as e: - print("[WARN] module: auto-schedule: failed to process schedule.json ({})".format(e)) + print("[WARN] module: auto-schedule: failed to process schedule.json ({e})")