Improve performance by reducing retrieved data

RogerSelwyn · Apr 2, 2023 · 822c7ab · 822c7ab
1 parent c2d0a83
commit 822c7ab
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/custom_components/o365/calendar.py b/custom_components/o365/calendar.py
@@ -571,7 +571,21 @@ async def _async_calendar_schedule_get_events(
         self, hass, calendar_schedule, start_date, end_date
     ):
         """Get the events for the calendar."""
-        query = calendar_schedule.new_query("start").greater_equal(start_date)
+        query = calendar_schedule.new_query()
+        query = query.select(
+            "subject",
+            "body",
+            "start",
+            "end",
+            "is_all_day",
+            "location",
+            "categories",
+            "sensitivity",
+            "show_as",
+            "attendees",
+            "series_master_id",
+        )
+        query = query.on_attribute("start").greater_equal(start_date)
         query.chain("and").on_attribute("end").less_equal(end_date)
         if self._search is not None:
             query.chain("and").on_attribute("subject").contains(self._search)

diff --git a/custom_components/o365/classes/mailsensor.py b/custom_components/o365/classes/mailsensor.py
@@ -53,7 +53,23 @@ def __init__(
         self.download_attachments = sensor_conf.get(CONF_DOWNLOAD_ATTACHMENTS)
         self.html_body = sensor_conf.get(CONF_HTML_BODY)
         self.max_items = sensor_conf.get(CONF_MAX_ITEMS, 5)
-        self.query = None
+        self.query = self.mail_folder.new_query()
+        self.query = self.query.select(
+            "sender",
+            "from",
+            "subject",
+            "body",
+            "receivedDateTime",
+            "toRecipients",
+            "ccRecipients",
+            "has_attachments",
+            "importance",
+            "is_read",
+        )
+        if self.download_attachments:
+            self.query = self.query.select(
+                "attachments",
+            )
         self._config = config
 
     @property
@@ -78,7 +94,6 @@ def __init__(
             coordinator, config, sensor_conf, mail_folder, name, entity_id, unique_id
         )
 
-        self.query = self.mail_folder.new_query()
         self.query.order_by("receivedDateTime", ascending=False)
 
         self._build_query(sensor_conf)
@@ -138,9 +153,7 @@ def __init__(
 
         is_unread = sensor_conf.get(CONF_IS_UNREAD)
 
-        self.query = None
         if is_unread is not None:
-            self.query = self.mail_folder.new_query()
             self.query.chain("and").on_attribute("IsRead").equals(not is_unread)