From 2a694028defa25405a839c0f1b84f9e8cc1b5e88 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 15 Dec 2020 20:58:26 +0100
Subject: [PATCH] v1.2.3; sort events in IcsService
---
src/logic/service/services/IcsService.py | 6 ++++--
src/logic/tile/tiles/GarbageContainerScheduleTile.py | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/logic/service/services/IcsService.py b/src/logic/service/services/IcsService.py
index 70f42a4..2a45497 100644
--- a/src/logic/service/services/IcsService.py
+++ b/src/logic/service/services/IcsService.py
@@ -55,13 +55,15 @@ class IcsService(MultiCacheKeyService):
event.url = component.get('URL')
events.append(event)
+
+ events = sorted(events, key=lambda event: event.start)
return {'events': events}
if __name__ == '__main__':
s = IcsService()
- events = s.get_data('0815', 5, {'path': 'C:/Users/RobertG/Desktop/abfallkalender_2020_richard-wagner-str.ics'})['events']
+ events = s.get_data('0815', 5, {'path': '../../../../abfallkalender_2021_richard-wagner-str.ics'})['events']
for x in events:
# if 'Papier' in x.summary:
- print(x.summary)
+ print(x.summary, x.start)
diff --git a/src/logic/tile/tiles/GarbageContainerScheduleTile.py b/src/logic/tile/tiles/GarbageContainerScheduleTile.py
index 02b82c1..ceac49f 100644
--- a/src/logic/tile/tiles/GarbageContainerScheduleTile.py
+++ b/src/logic/tile/tiles/GarbageContainerScheduleTile.py
@@ -35,6 +35,7 @@ class GarbageContainerScheduleTile(Tile):
events = icsService.get_data(cacheKey, self._intervalInSeconds, self._settings)['events']
eventsForGarbageType = [x for x in events if self._settings['garbageType'] in x.summary]
+
nextEvent = self.__find_next_date(eventsForGarbageType)
nextEventDate = '--.--.'
--
GitLab