nemunaire/epaper
1
0
Fork 0
Code Issues Pull requests Releases Activity

Compare commits

base: nemunaire:a5282f51793face92b59b90b62514370be1eba96
Branches Tags
nemunaire:master
..
compare: nemunaire:268f6350d511bcebe592bfd3bfffea33f2125bf9
Branches Tags
nemunaire:master

No commits in common. "a5282f51793face92b59b90b62514370be1eba96" and "268f6350d511bcebe592bfd3bfffea33f2125bf9" have entirely different histories.
a5282f5179 ... 268f6350d5

2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ical.py
View file

@ -15,8 +15,6 @@ class IcalModule:
def __init__(self, config): def __init__(self, config):
self.cals = config.cals self.cals = config.cals
self.delayed_departure = 100
self._cached_file = ".ical-%s.cache" self._cached_file = ".ical-%s.cache"
self.cache_time = 15 self.cache_time = 15
@ -164,7 +162,7 @@ class IcalModule:
def event_coming(self, config): def event_coming(self, config):
now = datetime.now(tz=pytz.timezone('Europe/Paris')) now = datetime.now(tz=pytz.timezone('Europe/Paris'))
coming = datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure) coming = datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=80)
for evt in self.get_events(config): for evt in self.get_events(config):
# Looking only the first event # Looking only the first event

21
modules/ratp.py
View file

@ -92,17 +92,17 @@ class IDFMAPI:
res = json.load(f) res = json.load(f)
# Convert time to hours # Convert time to hours
now = datetime.fromisoformat(res["_metadata"]["date"]) if mode != "rers":
now = datetime.fromisoformat(res["_metadata"]["date"])
for i in range(len(res["result"]["schedules"])): for i in range(len(res["result"]["schedules"])):
if "message" in res["result"]["schedules"][i]: if "message" in res["result"]["schedules"][i]:
if res["result"]["schedules"][i]["message"] == "Train a l'approche" or res["result"]["schedules"][i]["message"] == "Train à l'approche" or res["result"]["schedules"][i]["message"] == "Train à quai" or res["result"]["schedules"][i]["message"] == "Train a quai" or res["result"]["schedules"][i]["message"] == "A l'approche" or res["result"]["schedules"][i]["message"] == "A l'arret": if res["result"]["schedules"][i]["message"] == "A l'approche" or res["result"]["schedules"][i]["message"] == "A l'arret":
res["result"]["schedules"][i]["message"] = now.strftime("%H:%M") res["result"]["schedules"][i]["message"] = now.strftime("%H:%M")
elif res["result"]["schedules"][i]["message"].endswith(" mn"): elif res["result"]["schedules"][i]["message"].endswith(" mn"):
res["result"]["schedules"][i]["message"] = (now + timedelta(minutes=int(res["result"]["schedules"][i]["message"].split(" ")[0]))).strftime("%H:%M") res["result"]["schedules"][i]["message"] = (now + timedelta(minutes=int(res["result"]["schedules"][i]["message"].split(" ")[0]))).strftime("%H:%M")
res["result"]["schedules"][i]["message"] = res["result"]["schedules"][i]["message"].replace(" Retardé", "+").replace("Train retardé", "...")
return [m for m in res["result"]["schedules"] if "message" in m and m["message"] != "Train sans arrêt"] return res["result"]["schedules"]
def get_weather(self): def get_weather(self):
ret = {} ret = {}
@ -278,9 +278,6 @@ class RATPNextStopModule:
max_dest = 64 max_dest = 64
for dest, msgs in prep.items(): for dest, msgs in prep.items():
if len(msgs) == 0:
continue
align_x = line_height * 2 align_x = line_height * 2
sz = fnt_B.getsize(dest)[0] sz = fnt_B.getsize(dest)[0]